added symbiotic interface

[palacios.git] / palacios / include / palacios / vmm_lowlevel.h

diff --git a/palacios/include/palacios/vmm_lowlevel.h b/palacios/include/palacios/vmm_lowlevel.h
index 7863d19..71af105 100644 (file)
--- a/palacios/include/palacios/vmm_lowlevel.h
+++ b/palacios/include/palacios/vmm_lowlevel.h
@@ -20,16 +20,17 @@
 #include <palacios/vmm_types.h>
 
 
+#define CPUID_FEATURE_IDS 0x00000001
+#define CPUID_EXT_FEATURE_IDS 0x80000001
+
+
 #ifdef __V3_32BIT__
 
 static void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_t * ecx, addr_t * edx) {
     __asm__ __volatile__ (
-                         "pushl %%ebx\n\t"
                          "cpuid\n\t"
-                         "movl %%ebx, %%esi\n\t"
-                         "popl %%ebx\n\t"
                          : "=a" (*eax), "=S" (*ebx), "=c" (*ecx), "=d" (*edx)
-                         : "a" (target)
+                         : "0" (target), "2" (*ecx)
                          );
     return;
 }
@@ -38,12 +39,9 @@ static void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_
 
 static void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_t * ecx, addr_t * edx) {
     __asm__ __volatile__ (
-                         "pushq %%rbx\n\t"
                          "cpuid\n\t"
-                         "movq %%rbx, %%rsi\n\t"
-                         "popq %%rbx\n\t"
-                         : "=a" (*eax), "=S" (*ebx), "=c" (*ecx), "=d" (*edx)
-                         : "a" (target)
+                         : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
+                         : "0" (target), "2" (*ecx)
                          );
     return;
 }
@@ -92,7 +90,7 @@ static addr_t __inline__ v3_irq_save() {
     __asm__ __volatile__ ("pushf \n\t"
                          "popl %0 \n\t"
                          "cli \n\t"
-                         :"=g" (x)
+                         :"=g" (state)
                          : 
                          :"memory"
                          );