X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=0322c073008c34e55e4adcb9c1210b639365f035;hb=bf091be03d4a623fa1a9b3151698a4564a8339ba;hp=4dba7372f4d6c8584ef318bfa20a9b97917e676e;hpb=b07ca7a7edd31d34a8dc613e3d208bbeedd44661;p=palacios.git

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 4dba737..0322c07 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);
@@ -280,8 +287,8 @@ int handle_cr0_write(struct guest_info * info) {
 		 (instr[index + 1] == 0x06)) { 
 	// CLTS instruction
 	PrintDebug("CLTS instruction - clearing TS flag of real and shadow CR0\n");
-	shadow_cr0->ts=0;
-	real_cr0->ts=0;
+	shadow_cr0->ts = 0;
+	real_cr0->ts = 0;
 	
 	index+=2;
 	
@@ -483,6 +490,11 @@ 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->mem_mode == PHYSICAL_MEM) {
+	    virt_cr0->pg = 0; // clear the pg bit because guest doesn't think it's on
+	  }
+	  
 	} else {
 	  *virt_cr0 = *real_cr0;
 	}
@@ -526,10 +538,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 +555,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;
@@ -575,6 +590,11 @@ int handle_cr3_write(struct guest_info * info) {
 	struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3);
 
 
+	  if (CR3_TO_PDE32(*(uint_t*)shadow_cr3) != 0) {
+	    PrintDebug("Shadow Page Table\n");
+	    PrintDebugPageTables((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3));
+	  }
+
 	/* Delete the current Page Tables */
 	delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3));
 
@@ -593,6 +613,14 @@ int handle_cr3_write(struct guest_info * info) {
 	/* Copy Various flags */
 	*shadow_cr3 = *new_cr3;
 
+	{
+	  addr_t tmp_addr;
+	  guest_pa_to_host_va(info, ((*(uint_t*)guest_cr3) & 0xfffff000), &tmp_addr);
+	  PrintDebug("Guest PD\n");
+	  PrintPD32((pde32_t *)tmp_addr);
+
+	}
+	
 
 	
 	shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt);
@@ -612,10 +640,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;
   }
 
@@ -679,10 +708,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;
   }