X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_emulator.c;h=437e77616edd76953ba4a8bf1d3878956fed12f5;hb=eb5eb0f70b84003972a96060c76bd7efad340be4;hp=83d6d1a01db62874fdbf7a743afa3c565eb50da4;hpb=fd5d916136c80b7c3f873f51a26b88c2149e622b;p=palacios.git

diff --git a/palacios/src/palacios/vmm_emulator.c b/palacios/src/palacios/vmm_emulator.c
index 83d6d1a..437e776 100644
--- a/palacios/src/palacios/vmm_emulator.c
+++ b/palacios/src/palacios/vmm_emulator.c
@@ -42,12 +42,16 @@ static int emulate_string_write_op(struct guest_info * info, struct x86_instr *
     addr_t tmp_rcx = 0;
     addr_t src_addr = 0;
 
-    if (dec_instr->dst_operand.operand != write_gva) {
-	PrintError("Inconsistency between Pagefault and Instruction Decode XED_ADDR=%p, PF_ADDR=%p\n",
-		   (void *)dec_instr->dst_operand.operand, (void *)write_gva);
-	return -1;
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+	if (dec_instr->dst_operand.operand != write_gva) {
+	    PrintError("Inconsistency between Pagefault and Instruction Decode XED_ADDR=%p, PF_ADDR=%p\n",
+		       (void *)dec_instr->dst_operand.operand, (void *)write_gva);
+	    return -1;
+	}
+    } else {
+	// Nested paging (Need check??) 
     }
-  
+
     /*emulation_length = ( (dec_instr->str_op_length  < (0x1000 - PAGE_OFFSET_4KB(write_gva))) ? 
 			 dec_instr->str_op_length :
 			 (0x1000 - PAGE_OFFSET_4KB(write_gva)));*/
@@ -63,12 +67,12 @@ static int emulate_string_write_op(struct guest_info * info, struct x86_instr *
 
 	// figure out addresses here....
 	if (info->mem_mode == PHYSICAL_MEM) {
-	    if (guest_pa_to_host_va(info, dec_instr->src_operand.operand, &src_addr) == -1) {
+	    if (v3_gpa_to_hva(info, dec_instr->src_operand.operand, &src_addr) == -1) {
 		PrintError("Could not translate write Source (Physical) to host VA\n");
 		return -1;
 	    }
 	} else {
-	    if (guest_va_to_host_va(info, dec_instr->src_operand.operand, &src_addr) == -1) {
+	    if (v3_gva_to_hva(info, dec_instr->src_operand.operand, &src_addr) == -1) {
 		PrintError("Could not translate write Source (Virtual) to host VA\n");
 		return -1;
 	    }
@@ -299,9 +303,9 @@ int v3_emulate_write_op(struct guest_info * info, addr_t write_gva, addr_t write
     PrintDebug("GVA=%p Dst_Addr=%p\n", (void *)write_gva, (void *)dst_addr);
 
     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 (ret == -1) {
@@ -338,12 +342,12 @@ int v3_emulate_write_op(struct guest_info * info, addr_t write_gva, addr_t write
 
     if (dec_instr.src_operand.type == MEM_OPERAND) {
 	if (info->mem_mode == PHYSICAL_MEM) {
-	    if (guest_pa_to_host_va(info, dec_instr.src_operand.operand, &src_addr) == -1) {
+	    if (v3_gpa_to_hva(info, dec_instr.src_operand.operand, &src_addr) == -1) {
 		PrintError("Could not translate write Source (Physical) to host VA\n");
 		return -1;
 	    }
 	} else {
-	    if (guest_va_to_host_va(info, dec_instr.src_operand.operand, &src_addr) == -1) {
+	    if (v3_gva_to_hva(info, dec_instr.src_operand.operand, &src_addr) == -1) {
 		PrintError("Could not translate write Source (Virtual) to host VA\n");
 		return -1;
 	    }
@@ -392,9 +396,9 @@ int v3_emulate_read_op(struct guest_info * info, addr_t read_gva, addr_t read_gp
     PrintDebug("GVA=%p\n", (void *)read_gva);
 
     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 (ret == -1) {
@@ -429,12 +433,12 @@ int v3_emulate_read_op(struct guest_info * info, addr_t read_gva, addr_t read_gp
 
     if (dec_instr.dst_operand.type == MEM_OPERAND) {
 	if (info->mem_mode == PHYSICAL_MEM) {
-	    if (guest_pa_to_host_va(info, dec_instr.dst_operand.operand, &dst_addr) == -1) {
+	    if (v3_gpa_to_hva(info, dec_instr.dst_operand.operand, &dst_addr) == -1) {
 		PrintError("Could not translate Read Destination (Physical) to host VA\n");
 		return -1;
 	    }
 	} else {
-	    if (guest_va_to_host_va(info, dec_instr.dst_operand.operand, &dst_addr) == -1) {
+	    if (v3_gva_to_hva(info, dec_instr.dst_operand.operand, &dst_addr) == -1) {
 		PrintError("Could not translate Read Destination (Virtual) to host VA\n");
 		return -1;
 	    }