X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=5406e7a0243c280f739186ba8e958841fc8d2b79;hb=2166b2c5f57341f9674821c4b2af0de607f63c2f;hp=5666fefaebb1f3eb374b9090fa7e0b7148510f8a;hpb=62406cf6b87a27a62921ce09a0aa44780ea25c06;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index 5666fef..5406e7a 100644
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -29,7 +29,7 @@
 v3_vm_cpu_mode_t v3_get_cpu_mode(struct guest_info * info) {
   struct cr0_32 * cr0;
   struct cr4_32 * cr4 = (struct cr4_32 *)&(info->ctrl_regs.cr4);
-  struct efer_64 * efer = (struct efer_64 *)&(info->ctrl_regs.efer);
+  struct efer_64 * efer = (struct efer_64 *)&(info->guest_efer);
   struct v3_segment * cs = &(info->segments.cs);
 
   if (info->shdw_pg_mode == SHADOW_PAGING) {
@@ -56,8 +56,12 @@ v3_vm_cpu_mode_t v3_get_cpu_mode(struct guest_info * info) {
   }
 }
 
-v3_vm_mem_mode_t v3_get_mem_mode(struct guest_info * info) {
+// Get address width in bytes
+uint_t v3_get_addr_width(struct guest_info * info) {
   struct cr0_32 * cr0;
+  struct cr4_32 * cr4 = (struct cr4_32 *)&(info->ctrl_regs.cr4);
+  struct efer_64 * efer = (struct efer_64 *)&(info->guest_efer);
+  struct v3_segment * cs = &(info->segments.cs);
 
   if (info->shdw_pg_mode == SHADOW_PAGING) {
     cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
@@ -69,8 +73,60 @@ v3_vm_mem_mode_t v3_get_mem_mode(struct guest_info * info) {
     return -1;
   }
 
+  if (cr0->pe == 0) {
+    return 2;
+  } else if ((cr4->pae == 0) && (efer->lme == 0)) {
+    return 4;
+  } else if (efer->lme == 0) {
+    return 4;
+  } else if ((efer->lme == 1) && (cs->long_mode == 1)) {
+    return 8;
+  } else {
+    // What about LONG_16_COMPAT???
+    return 4;
+  }
+}
 
 
+static const uchar_t REAL_STR[] = "Real";
+static const uchar_t PROTECTED_STR[] = "Protected";
+static const uchar_t PROTECTED_PAE_STR[] = "Protected+PAE";
+static const uchar_t LONG_STR[] = "Long";
+static const uchar_t LONG_32_COMPAT_STR[] = "32bit Compat";
+static const uchar_t LONG_16_COMPAT_STR[] = "16bit Compat";
+
+const uchar_t * v3_cpu_mode_to_str(v3_vm_cpu_mode_t mode) {
+  switch (mode) {
+  case REAL:
+    return REAL_STR;
+  case PROTECTED:
+    return PROTECTED_STR;
+  case PROTECTED_PAE:
+    return PROTECTED_PAE_STR;
+  case LONG:
+    return LONG_STR;
+  case LONG_32_COMPAT:
+    return LONG_32_COMPAT_STR;
+  case LONG_16_COMPAT:
+    return LONG_16_COMPAT_STR;
+  default:
+    return NULL;
+  }
+}
+
+v3_vm_mem_mode_t v3_get_mem_mode(struct guest_info * info) {
+  struct cr0_32 * cr0;
+
+  if (info->shdw_pg_mode == SHADOW_PAGING) {
+    cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
+  } else if (info->shdw_pg_mode == NESTED_PAGING) {
+    cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
+  } else {
+    PrintError("Invalid Paging Mode...\n");
+    V3_ASSERT(0);
+    return -1;
+  }
+
   if (cr0->pg == 0) {
     return PHYSICAL_MEM;
   } else {
@@ -78,6 +134,20 @@ v3_vm_mem_mode_t v3_get_mem_mode(struct guest_info * info) {
   }
 }
 
+static const uchar_t PHYS_MEM_STR[] = "Physical Memory";
+static const uchar_t VIRT_MEM_STR[] = "Virtual Memory";
+
+const uchar_t * v3_mem_mode_to_str(v3_vm_mem_mode_t mode) {
+  switch (mode) {
+  case PHYSICAL_MEM:
+    return PHYS_MEM_STR;
+  case VIRTUAL_MEM:
+    return VIRT_MEM_STR;
+  default:
+    return NULL;
+  }
+}
+
 
 void v3_print_segments(struct guest_info * info) {
   struct v3_segments * segs = &(info->segments);
@@ -91,8 +161,9 @@ void v3_print_segments(struct guest_info * info) {
 
   for (i = 0; seg_names[i] != NULL; i++) {
 
-    PrintDebug("\t%s: Sel=%x, base=%p, limit=%x\n", seg_names[i], seg_ptr[i].selector, 
-	       (void *)(addr_t)seg_ptr[i].base, seg_ptr[i].limit);
+    PrintDebug("\t%s: Sel=%x, base=%p, limit=%x (long_mode=%d, db=%d)\n", seg_names[i], seg_ptr[i].selector, 
+	       (void *)(addr_t)seg_ptr[i].base, seg_ptr[i].limit,
+	       seg_ptr[i].long_mode, seg_ptr[i].db);
 
   }
 
@@ -119,6 +190,7 @@ void v3_print_ctrl_regs(struct guest_info * info) {
 }
 
 
+#ifdef __V3_32BIT__
 void v3_print_GPRs(struct guest_info * info) {
   struct v3_gprs * regs = &(info->vm_regs);
   int i = 0;
@@ -133,3 +205,23 @@ void v3_print_GPRs(struct guest_info * info) {
     PrintDebug("\t%s=0x%p\n", reg_names[i], (void *)(addr_t)reg_ptr[i]);  
   }
 }
+#elif __V3_64BIT__
+void v3_print_GPRs(struct guest_info * info) {
+  struct v3_gprs * regs = &(info->vm_regs);
+  int i = 0;
+  v3_reg_t * reg_ptr;
+  char * reg_names[] = { "RDI", "RSI", "RBP", "RSP", "RBX", "RDX", "RCX", "RAX", \
+			 "R8", "R9", "R10", "R11", "R12", "R13", "R14", "R15", NULL};
+
+  reg_ptr= (v3_reg_t *)regs;
+
+  PrintDebug("64 bit GPRs:\n");
+
+  for (i = 0; reg_names[i] != NULL; i++) {
+    PrintDebug("\t%s=0x%p\n", reg_names[i], (void *)(addr_t)reg_ptr[i]);  
+  }
+}
+
+
+
+#endif