Changes some llvm_asm to asm macro

mythril-hypervisor · Jan 15, 2021 · f385de6 · f385de6
1 parent dc53135
commit f385de6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/mythril/src/registers.rs b/mythril/src/registers.rs
@@ -13,11 +13,10 @@ impl IdtrBase {
                 limit: 0,
                 base_addr: 0,
             };
-            llvm_asm!("sidt ($0)"
-                        :
-                        : "r"(&mut info)
-                        : "memory"
-                        : "volatile");
+            asm!(
+                "sidt fword ptr [{0}]",
+                in(reg) &mut info
+            );
             info.base_addr
         }
     }
@@ -35,11 +34,10 @@ impl GdtrBase {
     pub fn read() -> u64 {
         unsafe {
             let mut info = GdtInfo { size: 0, offset: 0 };
-            llvm_asm!("sgdtq ($0)"
-                      :
-                      : "r"(&mut info)
-                      : "memory"
-                      : "volatile");
+            asm!(
+                "sgdt fword ptr [{0}]",
+                in(reg) &mut info
+            );
             info.offset
         }
     }

diff --git a/mythril/src/time.rs b/mythril/src/time.rs
@@ -384,7 +384,8 @@ pub fn busy_wait(duration: core::time::Duration) {
     while now() < start + duration {
         unsafe {
             // Relax the cpu
-            llvm_asm!("rep; nop" ::: "memory");
+            //llvm_asm!("rep; nop" ::: "memory");
+            asm!("rep", "nop");
         }
     }
 }