X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_lowlevel.h;h=331a3076b48df57445e223ab0de312e981c9ba73;hb=ed8feff1d5dd6bf028cd5ba0960ec125505d7597;hp=71af1051247b400ae923ac43cc9d9c63c92a165f;hpb=cfcceed5890430afedcc544bd7dbb69e29dfd65a;p=palacios.git

diff --git a/palacios/include/palacios/vmm_lowlevel.h b/palacios/include/palacios/vmm_lowlevel.h
index 71af105..331a307 100644
--- a/palacios/include/palacios/vmm_lowlevel.h
+++ b/palacios/include/palacios/vmm_lowlevel.h
@@ -23,21 +23,52 @@
 #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__ (
-			  "cpuid\n\t"
-			  : "=a" (*eax), "=S" (*ebx), "=c" (*ecx), "=d" (*edx)
-			  : "0" (target), "2" (*ecx)
-			  );
-    return;
-}
-
-#elif __V3_64BIT__
-
-static void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_t * ecx, addr_t * edx) {
+struct seg_selector {
+    union {
+	uint16_t value;
+	struct {
+	    uint8_t rpl     : 2;
+	    uint8_t ti      : 1;
+	    uint16_t si     : 13;
+	} __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+struct gen_segment {
+    uint16_t limit_lo;
+    uint32_t base_lo     : 24;
+    uint8_t type         : 4;
+    uint8_t system       : 1;
+    uint8_t dpl          : 2;
+    uint8_t present      : 1;
+    uint8_t limit_hi     : 4;
+    uint8_t avail        : 1;
+    uint8_t long_mode    : 1;
+    uint8_t db           : 1;
+    uint8_t granularity  : 1;
+    uint8_t base_hi      : 8;
+} __attribute__((packed));
+
+struct sys_segment64 {
+    uint16_t limit_lo;
+    uint32_t base_lo     : 24;
+    uint8_t type         : 4;
+    uint8_t rsvd0        : 1;
+    uint8_t dpl          : 2;
+    uint8_t present      : 1;
+    uint8_t limit_hi     : 4;
+    uint8_t avail        : 1;
+    uint8_t rsvd1        : 3;
+    uint8_t granularity  : 1;
+    uint64_t base_hi     : 40;
+    uint32_t rsvd2;
+} __attribute__((packed));
+
+
+
+static void __inline__ v3_cpuid(uint32_t target, 
+				uint32_t * eax, uint32_t * ebx, 
+				uint32_t * ecx, uint32_t * edx) {
     __asm__ __volatile__ (
 			  "cpuid\n\t"
 			  : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
@@ -46,8 +77,6 @@ static void __inline__ v3_cpuid(uint_t target, addr_t * eax, addr_t * ebx, addr_
     return;
 }
 
-#endif
-
 
 static void __inline__ v3_set_msr(uint_t msr, uint_t high_byte, uint_t low_byte) {
     __asm__ __volatile__ (