X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=9bbcf5bdb65a2a0b9f430847cf09372d4e235b5e;hb=5abf9894e3137a7ee0b704c121c1b1ec98860862;hp=8966ee7cbe3abfa332f1e1566f4b01ff645f6db4;hpb=990ef457de6998f79947c81a16c8e7f843e784c0;p=palacios.git

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 8966ee7..9bbcf5b 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -23,7 +23,7 @@
 #include <palacios/vmm_decoder.h>
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vmm_ctrl_regs.h>
-
+#include <palacios/vmm_direct_paging.h>
 
 #ifndef DEBUG_CTRL_REGS
 #undef PrintDebug
@@ -229,20 +229,35 @@ int v3_handle_cr0_read(struct guest_info * info) {
     }
     
     if (dec_instr.op_type == V3_OP_MOVCR2) {
-	struct cr0_32 * dst_reg = (struct cr0_32 *)(dec_instr.dst_operand.operand);
-	struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
-	
 	PrintDebug("MOVCR2 (mode=%s)\n", v3_cpu_mode_to_str(info->cpu_mode));
+
+	if ((v3_get_cpu_mode(info) == LONG) || 
+	    (v3_get_cpu_mode(info) == LONG_32_COMPAT)) {
+	    struct cr0_64 * dst_reg = (struct cr0_64 *)(dec_instr.dst_operand.operand);
 	
-	if (info->shdw_pg_mode == SHADOW_PAGING) {
-	    struct cr0_32 * guest_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
-	    *dst_reg = *guest_cr0;
+	    if (info->shdw_pg_mode == SHADOW_PAGING) {
+		struct cr0_64 * guest_cr0 = (struct cr0_64 *)&(info->shdw_pg_state.guest_cr0);
+		*dst_reg = *guest_cr0;
+	    } else {
+		struct cr0_64 * shadow_cr0 = (struct cr0_64 *)&(info->ctrl_regs.cr0);
+		*dst_reg = *shadow_cr0;
+	    }
+
+	    PrintDebug("returned CR0: %p\n", (void *)*(addr_t *)dst_reg);
 	} else {
-	    *dst_reg = *shadow_cr0;
-	}
+	    struct cr0_32 * dst_reg = (struct cr0_32 *)(dec_instr.dst_operand.operand);
 	
-	PrintDebug("Shadow CR0: %x\n", *(uint_t*)shadow_cr0);    
-	PrintDebug("returned CR0: %x\n", *(uint_t*)dst_reg);
+	    if (info->shdw_pg_mode == SHADOW_PAGING) {
+		struct cr0_32 * guest_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
+		*dst_reg = *guest_cr0;
+	    } else {
+		struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
+		*dst_reg = *shadow_cr0;
+	    }
+
+	    PrintDebug("returned CR0: %x\n", *(uint_t*)dst_reg);
+	}
+
     } else if (dec_instr.op_type == V3_OP_SMSW) {
 	struct cr0_real * shadow_cr0 = (struct cr0_real *)&(info->ctrl_regs.cr0);
 	struct cr0_real * dst_reg = (struct cr0_real *)(dec_instr.dst_operand.operand);
@@ -473,7 +488,7 @@ int v3_handle_cr4_write(struct guest_info * info) {
 		    delete_page_tables_32((pde32_t *)V3_VAddr((void *)(info->direct_map_pt)));
 		    
 		    // create 32 bit PAE direct map page table
-		    info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_32PAE(info));
+		    info->direct_map_pt = (addr_t)V3_PAddr((void *)v3_create_direct_passthrough_pts(info));
 		    
 		    // reset cr3 to new page tables
 		    info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt);