X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_shadow_paging.h;h=46b60ef47f19b73f92dd105d056de8cd7d400b18;hb=62406cf6b87a27a62921ce09a0aa44780ea25c06;hp=40182e53b62d94db28b6c36e13e32f5fdb56bca3;hpb=639fdba00d36b2a60fad3d28703459354cf8744f;p=palacios.git

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index 40182e5..46b60ef 100644
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -1,63 +1,76 @@
-#ifndef __VMM_SHADOW_PAGING_H
-#define __VMM_SHADOW_PAGING_H
-
-
+/*
+ * 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".
+ */
+
+#ifndef __VMM_SHADOW_PAGING_H__
+#define __VMM_SHADOW_PAGING_H__
+
+
+#ifdef __V3VEE__
 
 #include <palacios/vmm_util.h>
 #include <palacios/vmm_paging.h>
+#include <palacios/vmm_hashtable.h>
+
 
 struct shadow_page_state {
 
   // these two reflect the top-level page directory
   // of the guest page table
-  paging_mode_t           guest_mode;
-  ullong_t                guest_cr3;         // points to guest's current page table
+  v3_reg_t                guest_cr3;         // points to guest's current page table
 
   // Should this be here??
-  reg_ex_t                guest_cr0;
+  v3_reg_t guest_cr0;
 
   // these two reflect the top-level page directory 
   // of the shadow page table
-  paging_mode_t           shadow_mode;
-  ullong_t                shadow_cr3;
-
-
-};
+  v3_reg_t                shadow_cr3;
 
 
+  // Hash table that ties a CR3 value to a hash table pointer for the PT entries
+  struct hashtable *  cr3_cache;
+  // Hash table that contains a mapping of guest pte addresses to host pte addresses
+  struct hashtable *  cached_ptes;
+  addr_t cached_cr3;
 
+};
 
 
 
 struct guest_info;
 
 
-int init_shadow_page_state(struct shadow_page_state * state);
-
 
-addr_t create_new_shadow_pt32(struct guest_info * info);
+int v3_cache_page_tables32(struct guest_info * info, addr_t  pde);
 
-addr_t setup_shadow_pt32(struct guest_info * info, addr_t virt_cr3);
-addr_t setup_shadow_pte32(struct guest_info * info, addr_t pt_host_addr);
+int v3_init_shadow_page_state(struct guest_info * info);
 
-int handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
-int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
+addr_t v3_create_new_shadow_pt();
 
-int handle_shadow_pde32_fault(struct guest_info * info, 
-			      addr_t fault_addr, 
-			      pf_error_t error_code, 
-			      pde32_t * shadow_pde, 
-			      pde32_t * guest_pde);
+int v3_handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
+int v3_handle_shadow_invlpg(struct guest_info * info);
 
 
-int handle_shadow_pte32_fault(struct guest_info* info, 
-			      addr_t fault_addr, 
-			      pf_error_t error_code,
-			      pte32_t * shadow_pte, 
-			      pte32_t * guest_pte);
 
 
+int v3_replace_shdw_page(struct guest_info * info, addr_t location, void * new_page, void * old_page);
+int v3_replace_shdw_page32(struct guest_info * info, addr_t location, pte32_t * new_page, pte32_t * old_page); 
 
-int handle_shadow_invlpg(struct guest_info * info);
+#endif // ! __V3VEE__
 
 #endif