X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=1afb255243109f5897cd7f541d2399384a6e0c5b;hb=ef944e47f418cfbf344757e3fbab5e40927966fe;hp=ba6e9c5ebeb42589cca5389988d66f983b328707;hpb=82b8b87c344fcd1eab22e3f3be5ad54cbb3f8f68;p=palacios.git

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index ba6e9c5..1afb255 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -44,9 +44,9 @@ int v3_handle_cr0_write(struct guest_info * info) {
     struct x86_instr dec_instr;
     
     if (info->mem_mode == PHYSICAL_MEM) { 
-	ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gpa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     } else { 
-	ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gva_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     }
     
     if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) {
@@ -141,6 +141,8 @@ static int handle_mov_to_cr0(struct guest_info * info, struct x86_instr * dec_in
 		return -1;
 	    }
 	} else {
+
+	    shadow_cr0->wp = 1;
 	    
 	    if (v3_activate_passthrough_pt(info) == -1) {
 		PrintError("Failed to activate passthrough page tables\n");
@@ -217,9 +219,9 @@ int v3_handle_cr0_read(struct guest_info * info) {
     struct x86_instr dec_instr;
     
     if (info->mem_mode == PHYSICAL_MEM) { 
-	ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gpa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     } else { 
-	ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gva_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     }
     
     
@@ -291,9 +293,9 @@ int v3_handle_cr3_write(struct guest_info * info) {
     struct x86_instr dec_instr;
     
     if (info->mem_mode == PHYSICAL_MEM) { 
-	ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gpa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     } else { 
-	ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gva_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     }
     
     if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) {
@@ -320,14 +322,15 @@ int v3_handle_cr3_write(struct guest_info * info) {
 		struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3);
 		*guest_cr3 = *new_cr3;
 	    }
-	    
+
+
 	    // If Paging is enabled in the guest then we need to change the shadow page tables
 	    if (info->mem_mode == VIRTUAL_MEM) {
 		if (v3_activate_shadow_pt(info) == -1) {
 		    PrintError("Failed to activate 32 bit shadow page table\n");
 		    return -1;
 		}
-	    } 
+	    }
 	    
 	    PrintDebug("New Shadow CR3=%p; New Guest CR3=%p\n", 
 		       (void *)(addr_t)(info->ctrl_regs.cr3), 
@@ -367,9 +370,9 @@ int v3_handle_cr3_read(struct guest_info * info) {
     struct x86_instr dec_instr;
     
     if (info->mem_mode == PHYSICAL_MEM) { 
-	ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gpa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     } else { 
-	ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gva_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     }
     
     if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) {
@@ -434,9 +437,9 @@ int v3_handle_cr4_write(struct guest_info * info) {
     v3_cpu_mode_t cpu_mode = v3_get_vm_cpu_mode(info);
     
     if (info->mem_mode == PHYSICAL_MEM) { 
-	ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gpa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     } else { 
-	ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
+	ret = v3_read_gva_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     }
     
     if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) {
@@ -465,7 +468,7 @@ int v3_handle_cr4_write(struct guest_info * info) {
 	    (cr4->pge != new_cr4->pge) || 
 	    (cr4->pae != new_cr4->pae)) { 
 	    PrintDebug("Handling PSE/PGE/PAE -> TLBFlush case, flag set\n");
-	    flush_tlb=1;
+	    flush_tlb = 1;
 	    
 	}
     }
@@ -539,24 +542,21 @@ int v3_handle_cr4_write(struct guest_info * info) {
 }
 
 
-int v3_handle_efer_read(uint_t msr, struct v3_msr * dst, void * priv_data) {
-    struct guest_info * info = (struct guest_info *)(priv_data);
-    PrintDebug("EFER Read HI=%x LO=%x\n", info->shdw_pg_state.guest_efer.hi, info->shdw_pg_state.guest_efer.lo);
+int v3_handle_efer_read(struct guest_info * core, uint_t msr, struct v3_msr * dst, void * priv_data) {
+    PrintDebug("EFER Read HI=%x LO=%x\n", core->shdw_pg_state.guest_efer.hi, core->shdw_pg_state.guest_efer.lo);
     
-    dst->value = info->shdw_pg_state.guest_efer.value;
+    dst->value = core->shdw_pg_state.guest_efer.value;
     
-    info->rip += 2; // WRMSR/RDMSR are two byte operands
     return 0;
 }
 
 
 
 // TODO: this is a disaster we need to clean this up...
-int v3_handle_efer_write(uint_t msr, struct v3_msr src, void * priv_data) {
-    struct guest_info * info = (struct guest_info *)(priv_data);
+int v3_handle_efer_write(struct guest_info * core, uint_t msr, struct v3_msr src, void * priv_data) {
     //struct efer_64 * new_efer = (struct efer_64 *)&(src.value);
-    struct efer_64 * shadow_efer = (struct efer_64 *)&(info->ctrl_regs.efer);
-    struct v3_msr * guest_efer = &(info->shdw_pg_state.guest_efer);
+    struct efer_64 * shadow_efer = (struct efer_64 *)&(core->ctrl_regs.efer);
+    struct v3_msr * guest_efer = &(core->shdw_pg_state.guest_efer);
     
     PrintDebug("EFER Write\n");
     PrintDebug("EFER Write Values: HI=%x LO=%x\n", src.hi, src.lo);
@@ -569,7 +569,5 @@ int v3_handle_efer_write(uint_t msr, struct v3_msr src, void * priv_data) {
     // Enable/Disable Syscall
     shadow_efer->sce = src.value & 0x1;
     
-    info->rip += 2; // WRMSR/RDMSR are two byte operands
-    
     return 0;
 }