X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_paging.c;h=d8900df6bd465396853f7abd8c339ca7fc2e9355;hb=6fa12b728fed57e76c4a4df5c87d989915c7d6c2;hp=2c6a07862d427f7d6ef9bed5fab55dd2a0103edf;hpb=639fdba00d36b2a60fad3d28703459354cf8744f;p=palacios.git

diff --git a/palacios/src/palacios/vmm_paging.c b/palacios/src/palacios/vmm_paging.c
index 2c6a078..d8900df 100644
--- a/palacios/src/palacios/vmm_paging.c
+++ b/palacios/src/palacios/vmm_paging.c
@@ -8,7 +8,7 @@
 extern struct vmm_os_hooks * os_hooks;
 
 void delete_page_tables_pde32(pde32_t * pde) {
-  int i, j;
+  int i;//, j;
 
   if (pde == NULL) { 
     return;
@@ -17,17 +17,20 @@ void delete_page_tables_pde32(pde32_t * pde) {
   for (i = 0; (i < MAX_PDE32_ENTRIES); i++) {
     if (pde[i].present) {
       pte32_t * pte = (pte32_t *)(pde[i].pt_base_addr << PAGE_POWER);
-      
-      for (j = 0; (j < MAX_PTE32_ENTRIES); j++) {
+
+      /*
+	for (j = 0; (j < MAX_PTE32_ENTRIES); j++) {
 	if ((pte[j].present)) {
-	  os_hooks->free_page((void *)(pte[j].page_base_addr << PAGE_POWER));
+	os_hooks->free_page((void *)(pte[j].page_base_addr << PAGE_POWER));
 	}
-      }
-      
+	}
+      */
+      //PrintDebug("Deleting PTE %d (%x)\n", i, pte);
       os_hooks->free_page(pte);
     }
   }
 
+  //  PrintDebug("Deleting PDE (%x)\n", pde);
   os_hooks->free_page(pde);
 }
 
@@ -35,6 +38,26 @@ void delete_page_tables_pde32(pde32_t * pde) {
 
 
 
+int pt32_lookup(pde32_t * pd, addr_t vaddr, addr_t * paddr) {
+  addr_t pde_entry;
+  pde32_entry_type_t pde_entry_type;
+
+  if (pd == 0) {
+    return -1;
+  }
+
+  pde_entry_type = pde32_lookup(pd, vaddr, &pde_entry);
+
+  if (pde_entry_type == PDE32_ENTRY_PTE32) {
+    return pte32_lookup((pte32_t *)pde_entry, vaddr, paddr);
+  } else if (pde_entry_type == PDE32_ENTRY_LARGE_PAGE) {
+    *paddr = pde_entry;
+    return 0;
+  }
+
+  return -1;
+}
+
 
 
 /* We can't do a full lookup because we don't know what context the page tables are in...
@@ -48,10 +71,12 @@ pde32_entry_type_t pde32_lookup(pde32_t * pd, addr_t addr, addr_t * entry) {
     *entry = 0;
     return PDE32_ENTRY_NOT_PRESENT;
   } else  {
-    *entry = PAGE_ADDR(pde_entry->pt_base_addr);
-    
+
     if (pde_entry->large_page) {
-      *entry += PAGE_OFFSET(addr);
+      pde32_4MB_t * large_pde = (pde32_4MB_t *)pde_entry;
+
+      *entry = PDE32_4MB_T_ADDR(*large_pde);
+      *entry += PD32_4MB_PAGE_OFFSET(addr);
       return PDE32_ENTRY_LARGE_PAGE;
     } else {
       *entry = PDE32_T_ADDR(*pde_entry);
@@ -90,7 +115,7 @@ pt_access_status_t can_access_pde32(pde32_t * pde, addr_t addr, pf_error_t acces
   } else if ((entry->writable == 0) && (access_type.write == 1)) {
     return PT_WRITE_ERROR;
   } else if ((entry->user_page == 0) && (access_type.user == 1)) {
-    // Check CR0.WP
+    // Check CR0.WP?
     return PT_USER_ERROR;
   }
 
@@ -106,7 +131,7 @@ pt_access_status_t can_access_pte32(pte32_t * pte, addr_t addr, pf_error_t acces
   } else if ((entry->writable == 0) && (access_type.write == 1)) {
     return PT_WRITE_ERROR;
   } else if ((entry->user_page == 0) && (access_type.user == 1)) {
-    // Check CR0.WP
+    // Check CR0.WP?
     return PT_USER_ERROR;
   }
 
@@ -133,10 +158,10 @@ pde32_t * create_passthrough_pde32_pts(struct guest_info * guest_info) {
     
 
     for (j = 0; j < MAX_PTE32_ENTRIES; j++) {
-      shadow_region_t * region = get_shadow_region_by_addr(map, current_page_addr);
+      struct shadow_region * region = get_shadow_region_by_addr(map, current_page_addr);
 
       if (!region || 
-	  (region->host_type == HOST_REGION_NOTHING) || 
+	  (region->host_type == HOST_REGION_HOOK) || 
 	  (region->host_type == HOST_REGION_UNALLOCATED) || 
 	  (region->host_type == HOST_REGION_MEMORY_MAPPED_DEVICE) || 
 	  (region->host_type == HOST_REGION_REMOTE) ||