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

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index 049ac50..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,25 +24,35 @@ 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;
+
 };
 
 
 
+struct guest_info;
 
 
 
-struct guest_info;
+int cache_page_tables32(struct guest_info * info, addr_t  pde);
 
+int init_shadow_page_state(struct guest_info * info);
 
-int init_shadow_page_state(struct shadow_page_state * state);
+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_invlpg(struct guest_info * info);
 
-addr_t create_new_shadow_pt32(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);
 
-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 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); 
+
+#endif // ! __V3VEE__
 
 #endif