X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=91b0fc2bd161fce1ab963683b2f9773e5bd180b6;hb=e9bfcdfa725b34d81c48d713adf9d173f3168951;hp=82853bcfdc46e08b9adcbc971d773917707f2426;hpb=41d6dcb0a638ebdc01b89a9edf427c75975b2003;p=palacios.git

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 82853bc..91b0fc2 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -146,6 +146,12 @@ int handle_cr0_write(struct guest_info * info) {
 	  info->cpu_mode = PROTECTED;
 	}
 
+	if (new_cr0->pe == 0) { 
+	  PrintDebug("Entering Real Mode\n");
+	  info->cpu_mode = REAL;
+	}
+	  
+
 	if (new_cr0->pg == 1) {
 	  PrintDebug("Paging is already turned on in switch to protected mode in CR0 write\n");
 
@@ -201,6 +207,7 @@ int handle_cr0_write(struct guest_info * info) {
 	ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
       }
 	
+
       if (ret != 15) {
 	// I think we should inject a GPF into the guest
 	PrintDebug("Could not read instruction (ret=%d)\n", ret);
@@ -483,6 +490,9 @@ int handle_cr0_read(struct guest_info * info) {
 
 	if (info->shdw_pg_mode == SHADOW_PAGING) {
 	  *virt_cr0 = *(struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
+	  if (info->cpu_mode==PROTECTED) {
+	    virt_cr0->pg=0; // clear the pg bit because guest doesn't think it's on
+	  }
 	} else {
 	  *virt_cr0 = *real_cr0;
 	}
@@ -526,10 +536,14 @@ int handle_cr3_write(struct guest_info * info) {
     int ret;
     char instr[15];
 
+    PrintDebug("Protected %s mode write to CR3 at %s 0x%x\n",
+	       info->cpu_mode==PROTECTED ? "" : "Paged", 
+	       info->cpu_mode==PROTECTED ? "guest physical" : "guest virtual",
+	       get_addr_linear(info,info->rip,&(info->segments.cs)));
 
     // We need to read the instruction, which is at CS:IP, but that 
     // linear address is guest physical without PG and guest virtual with PG
-    if (info->cpu_mode == PHYSICAL_MEM) { 
+    if (info->mem_mode == PHYSICAL_MEM) { 
       // The real rip address is actually a combination of the rip + CS base 
       PrintDebug("Writing Guest CR3 Write (Physical Address)\n");
       ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
@@ -539,7 +553,6 @@ int handle_cr3_write(struct guest_info * info) {
       ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     }
 
-
     if (ret != 15) {
       PrintDebug("Could not read instruction (ret=%d)\n", ret);
       return -1;
@@ -578,19 +591,30 @@ int handle_cr3_write(struct guest_info * info) {
 	/* Delete the current Page Tables */
 	delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3));
 
+	PrintDebug("Old Shadow CR3=%x; Old Guest CR3=%x\n", 
+		   *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3);
+
 
 	*guest_cr3 = *new_cr3;
 
+
+
 	// Something like this
 	shadow_pt =  create_new_shadow_pt32(info);
 	//shadow_pt = setup_shadow_pt32(info, CR3_TO_PDE32(*(addr_t *)new_cr3));
 
-
 	/* Copy Various flags */
 	*shadow_cr3 = *new_cr3;
+
+
 	
 	shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt);
 
+	PrintDebug("New Shadow CR3=%x; New Guest CR3=%x\n", 
+		   *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3);
+
+
+
 	if (info->mem_mode == VIRTUAL_MEM) {
 	  // If we aren't in paged mode then we have to preserve the identity mapped CR3
 	  info->ctrl_regs.cr3 = *(addr_t*)shadow_cr3;
@@ -601,10 +625,11 @@ int handle_cr3_write(struct guest_info * info) {
 
     } else {
       PrintDebug("Unknown Instruction\n");
+      SerialMemDump(instr,15);
       return -1;
     }
   } else {
-    PrintDebug("Invalid operating Mode\n");
+    PrintDebug("Invalid operating Mode (0x%x)\n", info->cpu_mode);
     return -1;
   }
 
@@ -668,10 +693,11 @@ int handle_cr3_read(struct guest_info * info) {
       info->rip += index;
     } else {
       PrintDebug("Unknown Instruction\n");
+      SerialMemDump(instr,15);
       return -1;
     }
   } else {
-    PrintDebug("Invalid operating Mode\n");
+    PrintDebug("Invalid operating Mode (0x%x)\n", info->cpu_mode);
     return -1;
   }