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

diff --git a/palacios/src/palacios/vmm_emulator.c b/palacios/src/palacios/vmm_emulator.c
index f80aade..437e776 100644
--- a/palacios/src/palacios/vmm_emulator.c
+++ b/palacios/src/palacios/vmm_emulator.c
@@ -35,19 +35,23 @@ static int run_op(struct guest_info * info, v3_op_type_t op_type, addr_t src_add
 // We emulate up to the next 4KB page boundry
 static int emulate_string_write_op(struct guest_info * info, struct x86_instr * dec_instr, 
 				   addr_t write_gva, addr_t write_gpa, addr_t dst_addr, 
-				   int (*write_fn)(addr_t guest_addr, void * src, uint_t length, void * priv_data), 
+				   int (*write_fn)(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data), 
 				   void * priv_data) {
     uint_t emulation_length = 0;
     uint_t emulation_iter_cnt = 0;
     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;
 	    }
@@ -126,7 +130,7 @@ static int emulate_string_write_op(struct guest_info * info, struct x86_instr *
 	return -1;
     }
 
-    if (write_fn(write_gpa, (void *)dst_addr, emulation_length, priv_data) != emulation_length) {
+    if (write_fn(info, write_gpa, (void *)dst_addr, emulation_length, priv_data) != emulation_length) {
 	PrintError("Did not fully read hooked data\n");
 	return -1;
     }
@@ -141,7 +145,7 @@ static int emulate_string_write_op(struct guest_info * info, struct x86_instr *
 
 static int emulate_xchg_write_op(struct guest_info * info, struct x86_instr * dec_instr, 
 				 addr_t write_gva, addr_t write_gpa, addr_t dst_addr, 
-				 int (*write_fn)(addr_t guest_addr, void * src, uint_t length, void * priv_data), 
+				 int (*write_fn)(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data), 
 				 void * priv_data) {
     addr_t src_addr = 0;
     addr_t em_dst_addr = 0;
@@ -197,7 +201,7 @@ static int emulate_xchg_write_op(struct guest_info * info, struct x86_instr * de
 	return -1;
     }
     
-    if (write_fn(write_gpa, (void *)dst_addr, dst_op_len, priv_data) != dst_op_len) {
+    if (write_fn(info, write_gpa, (void *)dst_addr, dst_op_len, priv_data) != dst_op_len) {
 	PrintError("Did not fully write hooked data\n");
 	return -1;
     }
@@ -211,8 +215,8 @@ static int emulate_xchg_write_op(struct guest_info * info, struct x86_instr * de
 
 static int emulate_xchg_read_op(struct guest_info * info, struct x86_instr * dec_instr, 
 				addr_t read_gva, addr_t read_gpa, addr_t src_addr, 
-				int (*read_fn)(addr_t guest_addr, void * dst, uint_t length, void * priv_data), 
-				int (*write_fn)(addr_t guest_addr, void * src, uint_t length, void * priv_data), 			
+				int (*read_fn)(struct guest_info * core, addr_t guest_addr, void * dst, uint_t length, void * priv_data), 
+				int (*write_fn)(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data), 			
 				void * priv_data) {
     addr_t em_src_addr = 0;
     addr_t em_dst_addr = 0;
@@ -262,7 +266,7 @@ static int emulate_xchg_read_op(struct guest_info * info, struct x86_instr * dec
 	       (void *)em_dst_addr, (void *)em_src_addr);
 
 
-    if (read_fn(read_gpa, (void *)src_addr, src_op_len, priv_data) != src_op_len) {
+    if (read_fn(info, read_gpa, (void *)src_addr, src_op_len, priv_data) != src_op_len) {
 	PrintError("Did not fully read hooked data\n");
 	return -1;
     }
@@ -272,7 +276,7 @@ static int emulate_xchg_read_op(struct guest_info * info, struct x86_instr * dec
 	return -1;
     }
 
-    if (write_fn(read_gpa, (void *)src_addr, dst_op_len, priv_data) != dst_op_len) {
+    if (write_fn(info, read_gpa, (void *)src_addr, dst_op_len, priv_data) != dst_op_len) {
 	PrintError("Did not fully write hooked data\n");
 	return -1;
     }
@@ -286,7 +290,7 @@ static int emulate_xchg_read_op(struct guest_info * info, struct x86_instr * dec
 
 
 int v3_emulate_write_op(struct guest_info * info, addr_t write_gva, addr_t write_gpa,  addr_t dst_addr, 
-			int (*write_fn)(addr_t guest_addr, void * src, uint_t length, void * priv_data), 
+			int (*write_fn)(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data), 
 			void * priv_data) {
     struct x86_instr dec_instr;
     uchar_t instr[15];
@@ -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;
 	    }
@@ -366,7 +370,7 @@ int v3_emulate_write_op(struct guest_info * info, addr_t write_gva, addr_t write
 	return -1;
     }
 
-    if (write_fn(write_gpa, (void *)dst_addr, dst_op_len, priv_data) != dst_op_len) {
+    if (write_fn(info, write_gpa, (void *)dst_addr, dst_op_len, priv_data) != dst_op_len) {
 	PrintError("Did not fully write hooked data\n");
 	return -1;
     }
@@ -378,8 +382,8 @@ int v3_emulate_write_op(struct guest_info * info, addr_t write_gva, addr_t write
 
 
 int v3_emulate_read_op(struct guest_info * info, addr_t read_gva, addr_t read_gpa, addr_t src_addr,
-		       int (*read_fn)(addr_t guest_addr, void * dst, uint_t length, void * priv_data),
-		       int (*write_fn)(addr_t guest_addr, void * src, uint_t length, void * priv_data),  
+		       int (*read_fn)(struct guest_info * core, addr_t guest_addr, void * dst, uint_t length, void * priv_data),
+		       int (*write_fn)(struct guest_info * core, addr_t guest_addr, void * src, uint_t length, void * priv_data),  
 		       void * priv_data) {
     struct x86_instr dec_instr;
     uchar_t instr[15];
@@ -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;
 	    }
@@ -451,7 +455,7 @@ int v3_emulate_read_op(struct guest_info * info, addr_t read_gva, addr_t read_gp
     PrintDebug("Dst_Addr = %p, SRC Addr = %p\n", 
 	       (void *)dst_addr, (void *)src_addr);
 
-    if (read_fn(read_gpa, (void *)src_addr, src_op_len, priv_data) != src_op_len) {
+    if (read_fn(info, read_gpa, (void *)src_addr, src_op_len, priv_data) != src_op_len) {
 	PrintError("Did not fully read hooked data\n");
 	return -1;
     }