Merge pull request #188 from andjo403/new_at_and_t

counters: use AT&T inline asm syntax for older LLVM.
rust-lang · Oct 6, 2021 · 6320316 · 6320316
2 parents 1d904b7 + 98afa6e
commit 6320316
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/measureme/src/counters.rs b/measureme/src/counters.rs
@@ -805,10 +805,18 @@ mod hw {
                             let mut _tmp: u64 = 0;
                             unsafe {
                                 asm!(
-                                    "lock xadd qword ptr [{atomic}], {tmp}",
+                                    // Intel syntax: "lock xadd [{atomic}], {tmp}"
+                                    "lock xadd {tmp}, ({atomic})",
 
                                     atomic = in(reg) &mut atomic,
                                     tmp = inout(reg) _tmp,
+
+                                    // Older versions of LLVM do not support modifiers in
+                                    // Intel syntax inline asm; whenever Rust minimum LLVM
+                                    // version supports Intel syntax inline asm, remove
+                                    // and replace above instructions with Intel syntax
+                                    // version (from comments).
+                                    options(att_syntax),
                                 );
                             }