cpuid fixed

ableos/src/experiments/info.rs

@@ -18,6 +18,7 @@
 //! }
 //! ```
 
+use core::arch::asm;
 use core::ops::Deref;
 use core::{fmt, slice, str};
 
@@ -39,28 +40,27 @@ pub enum RequestType {
 }
 
 pub fn cpuid(code: RequestType) -> (u32, u32, u32, u32) {
-    let res1;
+    let eax;
-    let res2;
+    let ebx;
-    let res3;
+    let ecx;
-    let res4;
+    let edx;
 
     unsafe {
-        llvm_asm!("cpuid"
+        asm!(
-        : // output operands
+            "movq %rbx, {0:r}",
-        "={eax}"(res1),
+            "cpuid",
-        "={ebx}"(res2),
+            "xchgq %rbx, {0:r}",
-        "={ecx}"(res3),
+            lateout(reg) ebx,
-        "={edx}"(res4)
+            inlateout("eax") code as u32 => eax,
-        : // input operands
+            inlateout("ecx") 0 => ecx,
-        "{eax}"(code as u32),
+            lateout("edx") edx,
-        "{ecx}"(0 as u32)
+            options(nostack, preserves_flags, att_syntax),
-        : // clobbers
-        : // options
         );
     }
 
-    (res1, res2, res3, res4)
+    (eax, ebx, ecx, edx)
 }
+
 /// The main entrypoint to the CPU information
 #[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
 pub fn master() -> Option<Master> {

ableos/src/lib.rs

@@ -6,17 +6,14 @@
 #![no_std]
 #![feature(
     abi_x86_interrupt,
-    // asm,
     asm_sym,
     alloc_error_handler,
     core_intrinsics,
-    // global_asm,
+    exclusive_range_pattern,
     lang_items,
-    llvm_asm,
+    naked_functions,
-    naked_functions
+    slice_pattern,
 )]
-#![feature(exclusive_range_pattern)]
-#![feature(slice_pattern)]
 
 /// Contains architecture specific code for aarch64.
 #[cfg(target_arch = "aarch64")]