started the emulation framework

[palacios.git] / palacios / src / palacios / vmm_ctrl_regs.c

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 4439355..2e566ef 100644 (file)
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -20,6 +20,13 @@
 #endif
 
 
+// Set to 1 if CR3 reload with same value shall not
+// force a shadow page table flush
+// It makes windows loading MUCH faster. 
+// Note that this optimization appears to fail with a 2.6 linux kernel
+#define CR3_RELOAD_OPTIMIZATION 0
+
+
 
 
 
@@ -85,7 +92,7 @@ int handle_cr0_write(struct guest_info * info) {
        struct cr0_32 *real_cr0 = (struct cr0_32*)&(info->ctrl_regs.cr0);
        struct cr0_32 *new_cr0= (struct cr0_32 *)(dec_instr.src_operand.operand);
 
-       PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.dst_operand.size);
+       PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr_src_operand.size);
 
 
        PrintDebug("Old CR0=%x\n", *real_cr0);
@@ -238,7 +245,7 @@ int handle_cr3_write(struct guest_info * info) {
       PrintDebug("Old Shadow CR3=%x; Old Guest CR3=%x\n", 
                 *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3);
       
-      if (1 || !CR3_32_SAME_BASE(new_cr3, guest_cr3)) { 
+      if (!CR3_RELOAD_OPTIMIZATION || !CR3_32_SAME_BASE(new_cr3, guest_cr3)) { 
        addr_t shadow_pt;
 
        
@@ -246,7 +253,7 @@ int handle_cr3_write(struct guest_info * info) {
        
        delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3));
        
-       shadow_pt =  create_new_shadow_pt32(info);
+       shadow_pt =  create_new_shadow_pt32();
        
        shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt);    
       }