X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_shadow_paging.h;h=1bc2838a4c876b8ed71244c1aef00dcb1c56a581;hb=a95b3ca85c794d201a3a25cbfb09bbc236a0524e;hp=bdf01140425c611476dca5b4f9f0fe969b0733ac;hpb=41d6dcb0a638ebdc01b89a9edf427c75975b2003;p=palacios.git

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index bdf0114..1bc2838 100644
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -2,9 +2,11 @@
 #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 {
 
@@ -14,7 +16,7 @@ struct shadow_page_state {
   ullong_t                guest_cr3;         // points to guest's current page table
 
   // Should this be here??
-  reg_ex_t                guest_cr0;
+  ullong_t guest_cr0;
 
   // these two reflect the top-level page directory 
   // of the shadow page table
@@ -22,6 +24,12 @@ struct shadow_page_state {
   ullong_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;
+
 };
 
 
@@ -29,32 +37,22 @@ struct shadow_page_state {
 struct guest_info;
 
 
-int init_shadow_page_state(struct shadow_page_state * state);
 
+int cache_page_tables32(struct guest_info * info, addr_t  pde);
 
-addr_t create_new_shadow_pt32(struct guest_info * info);
+int init_shadow_page_state(struct guest_info * info);
 
-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);
+addr_t create_new_shadow_pt32();
 
 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);
-
-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 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