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

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 838ce98..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) {
@@ -219,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);
     }
     
     
@@ -293,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) {
@@ -324,19 +324,13 @@ int v3_handle_cr3_write(struct guest_info * info) {
 	    }
 
 
-
-	    
 	    // If Paging is enabled in the guest then we need to change the shadow page tables
 	    if (info->mem_mode == VIRTUAL_MEM) {
-		if (info->shdw_pg_state.prev_guest_cr3 != info->shdw_pg_state.guest_cr3) {
-		    if (v3_activate_shadow_pt(info) == -1) {
-			PrintError("Failed to activate 32 bit shadow page table\n");
-			return -1;
-		    }
+		if (v3_activate_shadow_pt(info) == -1) {
+		    PrintError("Failed to activate 32 bit shadow page table\n");
+		    return -1;
 		}
 	    }
-
-	    info->shdw_pg_state.prev_guest_cr3 = info->shdw_pg_state.guest_cr3;
 	    
 	    PrintDebug("New Shadow CR3=%p; New Guest CR3=%p\n", 
 		       (void *)(addr_t)(info->ctrl_regs.cr3), 
@@ -376,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) {
@@ -443,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) {
@@ -474,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;
 	    
 	}
     }
@@ -548,11 +542,10 @@ 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;
     
     return 0;
 }
@@ -560,11 +553,10 @@ int v3_handle_efer_read(uint_t msr, struct v3_msr * dst, void * priv_data) {
 
 
 // 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);