X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=c10f446b97acd4a3c8005402330ff040d4649e90;hb=fc14d48378cdc90085786bccf4a5230261a0d315;hp=c4747ee986b2a217701a6099ae195e8413545107;hpb=b527f44a71d32952d7b129a7ce5dbeb3969fb8d2;p=palacios.git

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index c4747ee..c10f446 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -1,7 +1,26 @@
+/* 
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_util.h>
-#include <palacios/vmm_emulate.h>
+#include <palacios/vmm_decoder.h>
 
 
 
@@ -70,32 +89,42 @@ struct vmm_mem_hook * get_mem_hook(struct guest_info * info, addr_t guest_addr)
 }
 
 
-int mem_hook_dispatch(struct guest_info * info, addr_t mem_addr, pf_error_t access_info, struct vmm_mem_hook * hook) {
+/* mem_addr is the guest physical memory address */
+static int mem_hook_dispatch(struct guest_info * info, 
+			     addr_t fault_gva, addr_t fault_gpa,  
+			     pf_error_t access_info, struct vmm_mem_hook * hook) 
+{
 
-  if (access_info.write == 1) {
-    void * src = NULL;
-    uint_t length = 0;
-    PrintDebug("Memory hook write\n");
-    return -1;
+  // emulate and then dispatch 
+  // or dispatch and emulate
 
-    if (hook->write(mem_addr, src, length, hook->priv_data) != length) {
+
+  if (access_info.write == 1) {
+    if (v3_emulate_memory_write(info, fault_gva, hook->write, fault_gpa, hook->priv_data) == -1) {
+      PrintError("Memory write emulation failed\n");
       return -1;
     }
+    
   } else {
-    PrintDebug("Memory hook read\n");
-    return -1;
+    if (v3_emulate_memory_read(info, fault_gva, hook->read, fault_gpa, hook->priv_data) == -1) {
+      PrintError("Memory read emulation failed\n");
+      return -1;
+    }
   }    
 
-  return -1;
+  return 0;
 }
 
 
-int handle_special_page_fault(struct guest_info * info, addr_t mem_addr, pf_error_t access_info) {
-  struct shadow_region * reg = get_shadow_region_by_addr(&(info->mem_map), mem_addr);
+int handle_special_page_fault(struct guest_info * info, 
+			      addr_t fault_gva, addr_t fault_gpa, 
+			      pf_error_t access_info) 
+{
+  struct shadow_region * reg = get_shadow_region_by_addr(&(info->mem_map), fault_gpa);
 
   switch (reg->host_type) {
   case HOST_REGION_HOOK:
-    return mem_hook_dispatch(info, mem_addr, access_info, (struct vmm_mem_hook *)(reg->host_addr));
+    return mem_hook_dispatch(info, fault_gva, fault_gpa, access_info, (struct vmm_mem_hook *)(reg->host_addr));
   default:
     return -1;
   }
@@ -106,7 +135,9 @@ int handle_special_page_fault(struct guest_info * info, addr_t mem_addr, pf_erro
 
 
 
-void init_shadow_map(struct shadow_map * map) {
+void init_shadow_map(struct guest_info * info) {
+  struct shadow_map * map = &(info->mem_map);
+
   map->num_regions = 0;
 
   map->head = NULL;
@@ -172,7 +203,6 @@ int add_shadow_region(struct shadow_map * map,
     } else if (cursor->next->guest_end <= region->guest_start) {
       cursor = cursor->next;
     } else {
-      PrintDebug("WTF?\n");
       // This cannot happen!
       // we should panic here
       return -1;
@@ -194,7 +224,7 @@ int delete_shadow_region(struct shadow_map * map,
 
 
 struct shadow_region *get_shadow_region_by_index(struct shadow_map *  map,
-					       uint_t index) {
+						 uint_t index) {
   struct shadow_region * reg = map->head;
   uint_t i = 0;
 
@@ -210,7 +240,7 @@ struct shadow_region *get_shadow_region_by_index(struct shadow_map *  map,
 
 
 struct shadow_region * get_shadow_region_by_addr(struct shadow_map * map,
-					       addr_t addr) {
+						 addr_t addr) {
   struct shadow_region * reg = map->head;
 
   while (reg) {