Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


fixed a ton of compile errors...
[palacios.git] / palacios / src / palacios / vmm_paging.c
index 22e0311..8c5d369 100644 (file)
 
 
 
-
-  
+#define USE_VMM_PAGING_DEBUG
+// All of the debug functions defined in vmm_paging.h are implemented in this file
+#include "vmm_paging_debug.h"
+#undef USE_VMM_PAGING_DEBUG
 
 
 void delete_page_tables_32(pde32_t * pde) {
@@ -60,104 +62,871 @@ void delete_page_tables_64(pml4e64_t * pml4) {
 }
 
 
+int v3_translate_guest_pt_32(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, addr_t * paddr) {
+  addr_t guest_pde_pa = CR3_TO_PDE32_PA(guest_cr3);
+  pde32_t * guest_pde = 0;
+  addr_t guest_pte_pa = 0;
+
+  if (guest_pa_to_host_va(info, guest_pde_pa, (addr_t*)&guest_pde) == -1) {
+    PrintError("Could not get virtual address of Guest PDE32 (PA=%p)\n", 
+              (void *)guest_pde_pa);
+    return -1;
+  }
+  
+  switch (pde32_lookup(guest_pde, vaddr, &guest_pte_pa)) {
+  case PT_ENTRY_NOT_PRESENT:
+    *paddr = 0;  
+    return -1;
+  case PT_ENTRY_LARGE_PAGE:
+    *paddr = guest_pte_pa;
+    return 0;
+  case PT_ENTRY_PAGE:
+    {
+      pte32_t * guest_pte = NULL;
+
+      if (guest_pa_to_host_va(info, guest_pte_pa, (addr_t*)&guest_pte) == -1) {
+       PrintError("Could not get virtual address of Guest PTE32 (PA=%p)\n", 
+                  (void *)guest_pte_pa);
+       return -1;
+      }
+
+      if (pte32_lookup(guest_pte, vaddr, paddr) == PT_ENTRY_NOT_PRESENT) {
+       return -1;
+      }
+
+      return 0;
+    }
+  }
+
+  // should never get here
+  return -1;
+}
+
+
+int v3_translate_guest_pt_32pae(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, addr_t * paddr) {
+  addr_t guest_pdpe_pa = CR3_TO_PDPE32PAE_PA(guest_cr3);
+  pdpe32pae_t * guest_pdpe = 0;
+  addr_t guest_pde_pa = 0;
+
+  if (guest_pa_to_host_va(info, guest_pdpe_pa, (addr_t*)&guest_pdpe) == -1) {
+    PrintError("Could not get virtual address of Guest PDPE32PAE (PA=%p)\n",
+              (void *)guest_pdpe_pa);
+    return -1;
+  }
+
+  switch (pdpe32pae_lookup(guest_pdpe, vaddr, &guest_pde_pa)) 
+    {
+    case PT_ENTRY_NOT_PRESENT:
+      *paddr = 0;
+      return -1;
+    case PT_ENTRY_PAGE:
+      {
+       pde32pae_t * guest_pde = NULL;
+       addr_t guest_pte_pa = 0;
+       
+       if (guest_pa_to_host_va(info, guest_pde_pa, (addr_t *)&guest_pde) == -1) {
+         PrintError("Could not get virtual Address of Guest PDE32PAE (PA=%p)\n", 
+                    (void *)guest_pde_pa);
+         return -1;
+       }
+       
+       switch (pde32pae_lookup(guest_pde, vaddr, &guest_pte_pa)) 
+         {
+         case PT_ENTRY_NOT_PRESENT:
+           *paddr = 0;
+           return -1;
+         case PT_ENTRY_LARGE_PAGE:
+           *paddr = guest_pte_pa;
+           return 0;
+         case PT_ENTRY_PAGE:
+           {
+             pte32pae_t * guest_pte = NULL;
+             
+             if (guest_pa_to_host_va(info, guest_pte_pa, (addr_t *)&guest_pte) == -1) {
+               PrintError("Could not get virtual Address of Guest PTE32PAE (PA=%p)\n", 
+                          (void *)guest_pte_pa);
+               return -1;
+             }
+
+             if (pte32pae_lookup(guest_pte, vaddr, paddr) == PT_ENTRY_NOT_PRESENT) {
+               return -1;
+             }
+
+             return 0;
+           }
+         }
+      }
+    default:
+      return -1;
+    }
+
+  // should never get here
+  return -1;
+}
 
+int v3_translate_guest_pt_64(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, addr_t * paddr) {
+  addr_t guest_pml4_pa = CR3_TO_PML4E64_PA(guest_cr3);
+  pml4e64_t * guest_pmle = 0;
+  addr_t guest_pdpe_pa = 0;
 
+  if (guest_pa_to_host_va(info, guest_pml4_pa, (addr_t*)&guest_pmle) == -1) {
+    PrintError("Could not get virtual address of Guest PML4E64 (PA=%p)\n", 
+              (void *)guest_pml4_pa);
+    return -1;
+  }
+  
+  switch (pml4e64_lookup(guest_pmle, vaddr, &guest_pdpe_pa)) {
+  case PT_ENTRY_NOT_PRESENT:
+    *paddr = 0;
+    return -1;
+  case PT_ENTRY_PAGE:
+    {
+      pdpe64_t * guest_pdp = NULL;
+      addr_t guest_pde_pa = 0;
+
+      if (guest_pa_to_host_va(info, guest_pdpe_pa, (addr_t *)&guest_pdp) == -1) {
+       PrintError("Could not get virtual address of Guest PDPE64 (PA=%p)\n", 
+                  (void *)guest_pdpe_pa);
+       return -1;
+      }
 
-int pt32_lookup(pde32_t * pd, addr_t vaddr, addr_t * paddr) {
-  addr_t pde_entry;
-  pde32_entry_type_t pde_entry_type;
+      switch (pdpe64_lookup(guest_pdp, vaddr, &guest_pde_pa)) {
+      case PT_ENTRY_NOT_PRESENT:
+       *paddr = 0;
+       return -1;
+      case PT_ENTRY_LARGE_PAGE:
+       *paddr = 0;
+       PrintError("1 Gigabyte Pages not supported\n");
+       return -1;
+      case PT_ENTRY_PAGE:
+       {
+         pde64_t * guest_pde = NULL;
+         addr_t guest_pte_pa = 0;
+
+         if (guest_pa_to_host_va(info, guest_pde_pa, (addr_t *)&guest_pde) == -1) {
+           PrintError("Could not get virtual address of guest PDE64 (PA=%p)\n", 
+                      (void *)guest_pde_pa);
+           return -1;
+         }
 
-  if (pd == 0) {
+         switch (pde64_lookup(guest_pde, vaddr, &guest_pte_pa)) {
+         case PT_ENTRY_NOT_PRESENT:
+           *paddr = 0;
+           return -1;
+         case PT_ENTRY_LARGE_PAGE:
+           *paddr = guest_pte_pa;
+           return 0;
+         case PT_ENTRY_PAGE:
+           {
+             pte64_t * guest_pte = NULL;
+             
+             if (guest_pa_to_host_va(info, guest_pte_pa, (addr_t *)&guest_pte) == -1) {
+               PrintError("Could not get virtual address of guest PTE64 (PA=%p)\n", 
+                          (void *)guest_pte_pa);
+               return -1;
+             }
+               
+             if (pte64_lookup(guest_pte, vaddr, paddr) == PT_ENTRY_NOT_PRESENT) {
+               return -1;
+             }
+
+             return 0;
+           }
+         }
+       }
+      }
+    }
+  default:
     return -1;
   }
 
-  pde_entry_type = pde32_lookup(pd, vaddr, &pde_entry);
+  // should never get here
+  return -1;
+}
+
 
-  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;
+
+int v3_translate_host_pt_32(v3_reg_t host_cr3, addr_t vaddr, addr_t * paddr) {
+  pde32_t * host_pde = (pde32_t *)CR3_TO_PDE32_VA(host_cr3);
+  pte32_t * host_pte = 0;
+    
+  switch (pde32_lookup(host_pde, vaddr, (addr_t *)&host_pte)) {
+  case PT_ENTRY_NOT_PRESENT:
+    *paddr = 0;
+    return -1;
+  case PT_ENTRY_LARGE_PAGE:
+    *paddr = (addr_t)host_pte;
+    return 0;
+  case PT_ENTRY_PAGE:
+    if (pte32_lookup(V3_VAddr(host_pte), vaddr, paddr) == PT_ENTRY_NOT_PRESENT) {
+      return -1;
+    }
     return 0;
   }
+  
+  // should never get here
+  return -1;
+}
+
+
+int v3_translate_host_pt_32pae(v3_reg_t host_cr3, addr_t vaddr, addr_t * paddr) {
+  pdpe32pae_t * host_pdpe = (pdpe32pae_t *)CR3_TO_PDPE32PAE_VA(host_cr3);
+  pde32pae_t * host_pde = NULL;
+  pte32pae_t * host_pte = NULL;
 
+  switch (pdpe32pae_lookup(host_pdpe, vaddr, (addr_t *)&host_pde)) {
+  case PT_ENTRY_NOT_PRESENT:
+    *paddr = 0;
+    return -1;
+  case PT_ENTRY_PAGE:
+    switch (pde32pae_lookup(V3_VAddr(host_pde), vaddr, (addr_t *)&host_pte)) {
+    case PT_ENTRY_NOT_PRESENT:
+      *paddr = 0;
+      return -1;
+    case PT_ENTRY_LARGE_PAGE:
+      *paddr = (addr_t)host_pte;
+      return 0;
+    case PT_ENTRY_PAGE:
+      if (pte32pae_lookup(V3_VAddr(host_pte), vaddr, paddr) == PT_ENTRY_NOT_PRESENT) {
+       return -1;
+      }
+      return 0;
+    }
+  default:
+    return -1;
+  }
+
+  // should never get here
   return -1;
 }
 
 
+int v3_translate_host_pt_64(v3_reg_t host_cr3, addr_t vaddr, addr_t * paddr) {
+  pml4e64_t * host_pmle = (pml4e64_t *)CR3_TO_PML4E64_VA(host_cr3);
+  pdpe64_t * host_pdpe = NULL;
+  pde64_t * host_pde = NULL;
+  pte64_t * host_pte = NULL;
+
+  switch(pml4e64_lookup(host_pmle, vaddr, (addr_t *)&host_pdpe)) {
+  case PT_ENTRY_NOT_PRESENT:
+    *paddr = 0;
+    return -1;
+  case PT_ENTRY_PAGE:
+    switch(pdpe64_lookup(V3_VAddr(host_pdpe), vaddr, (addr_t *)&host_pde)) {
+    case PT_ENTRY_NOT_PRESENT:
+      *paddr = 0;
+      return -1;
+    case PT_ENTRY_LARGE_PAGE:
+      *paddr = 0;
+      PrintError("1 Gigabyte Pages not supported\n");
+      return -1;
+    case PT_ENTRY_PAGE:
+      switch (pde64_lookup(V3_VAddr(host_pde), vaddr, (addr_t *)&host_pte)) {
+      case PT_ENTRY_NOT_PRESENT:
+       *paddr = 0;
+       return -1;
+      case PT_ENTRY_LARGE_PAGE:
+       *paddr = (addr_t)host_pte;
+       return 0;
+      case PT_ENTRY_PAGE:
+       if (pte64_lookup(V3_VAddr(host_pte), vaddr, paddr) == PT_ENTRY_NOT_PRESENT) {
+         return -1;
+       }
+       return 0;
+      }
+    }
+  default:
+    return -1;
+  }
 
-/* We can't do a full lookup because we don't know what context the page tables are in...
- * The entry addresses could be pointing to either guest physical memory or host physical memory
- * Instead we just return the entry address, and a flag to show if it points to a pte or a large page...
+  // should never get here
+  return -1;
+}
+
+
+
+
+
+/*
+ * PAGE TABLE LOOKUP FUNCTIONS
+ *
+ *
+ * The value of entry is a return type:
+ * Page not present: *entry = 0
+ * Large Page: *entry = translated physical address (byte granularity)
+ * PTE entry: *entry is the address of the PTE Page
  */
-pde32_entry_type_t pde32_lookup(pde32_t * pd, addr_t addr, addr_t * entry) {
+
+/**
+ * 
+ *  32 bit Page Table lookup functions
+ *
+ **/
+
+pt_entry_type_t pde32_lookup(pde32_t * pd, addr_t addr, addr_t * entry) {
   pde32_t * pde_entry = &(pd[PDE32_INDEX(addr)]);
 
   if (!pde_entry->present) {
     *entry = 0;
-    return PDE32_ENTRY_NOT_PRESENT;
-  } else  {
+    return PT_ENTRY_NOT_PRESENT;
+  } else if (pde_entry->large_page) {
+    pde32_4MB_t * large_pde = (pde32_4MB_t *)pde_entry;
 
-    if (pde_entry->large_page) {
-      pde32_4MB_t * large_pde = (pde32_4MB_t *)pde_entry;
+    *entry = BASE_TO_PAGE_ADDR_4MB(large_pde->page_base_addr);
+    *entry += PAGE_OFFSET_4MB(addr);
 
-      *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);
-      return PDE32_ENTRY_PTE32;
-    }
-  }  
-  return PDE32_ENTRY_NOT_PRESENT;
+    return PT_ENTRY_LARGE_PAGE;
+  } else {
+    *entry = BASE_TO_PAGE_ADDR(pde_entry->pt_base_addr);
+    return PT_ENTRY_PAGE;
+  }
 }
 
 
 
 /* Takes a virtual addr (addr) and returns the physical addr (entry) as defined in the page table
  */
-int pte32_lookup(pte32_t * pt, addr_t addr, addr_t * entry) {
+pt_entry_type_t pte32_lookup(pte32_t * pt, addr_t addr, addr_t * entry) {
   pte32_t * pte_entry = &(pt[PTE32_INDEX(addr)]);
 
   if (!pte_entry->present) {
     *entry = 0;
-    PrintDebug("Lookup at non present page (index=%d)\n", PTE32_INDEX(addr));
+    //    PrintDebug("Lookup at non present page (index=%d)\n", PTE32_INDEX(addr));
+    return PT_ENTRY_NOT_PRESENT;
+  } else {
+    *entry = BASE_TO_PAGE_ADDR(pte_entry->page_base_addr) + PAGE_OFFSET(addr);
+    return PT_ENTRY_PAGE;
+  }
+
+}
+
+
+
+/**
+ * 
+ *  32 bit PAE Page Table lookup functions
+ *
+ **/
+pt_entry_type_t pdpe32pae_lookup(pdpe32pae_t * pdp, addr_t addr, addr_t * entry) {
+  pdpe32pae_t * pdpe_entry = &(pdp[PDPE32PAE_INDEX(addr)]);
+  
+  if (!pdpe_entry->present) {
+    *entry = 0;
+    return PT_ENTRY_NOT_PRESENT;
+  } else {
+    *entry = BASE_TO_PAGE_ADDR(pdpe_entry->pd_base_addr);
+    return PT_ENTRY_PAGE;
+  }
+}
+
+pt_entry_type_t pde32pae_lookup(pde32pae_t * pd, addr_t addr, addr_t * entry) {
+  pde32pae_t * pde_entry = &(pd[PDE32PAE_INDEX(addr)]);
+
+  if (!pde_entry->present) {
+    *entry = 0;
+    return PT_ENTRY_NOT_PRESENT;
+  } else if (pde_entry->large_page) {
+    pde32pae_2MB_t * large_pde = (pde32pae_2MB_t *)pde_entry;
+
+    *entry = BASE_TO_PAGE_ADDR_2MB(large_pde->page_base_addr);
+    *entry += PAGE_OFFSET_2MB(addr);
+
+    return PT_ENTRY_LARGE_PAGE;
+  } else {
+    *entry = BASE_TO_PAGE_ADDR(pde_entry->pt_base_addr);
+    return PT_ENTRY_PAGE;
+  }
+}
+
+pt_entry_type_t pte32pae_lookup(pte32pae_t * pt, addr_t addr, addr_t * entry) {
+  pte32pae_t * pte_entry = &(pt[PTE32PAE_INDEX(addr)]);
+
+  if (!pte_entry->present) {
+    *entry = 0;
+    return PT_ENTRY_NOT_PRESENT;
+  } else {
+    *entry = BASE_TO_PAGE_ADDR(pte_entry->page_base_addr) + PAGE_OFFSET(addr);
+    return PT_ENTRY_PAGE;
+  }
+}
+
+
+
+/**
+ * 
+ *  64 bit Page Table lookup functions
+ *
+ **/
+pt_entry_type_t pml4e64_lookup(pml4e64_t * pml, addr_t addr, addr_t * entry) {
+  pml4e64_t * pml_entry = &(pml[PML4E64_INDEX(addr)]);
+
+  if (!pml_entry->present) {
+    *entry = 0;
+    return PT_ENTRY_NOT_PRESENT;
+  } else {
+    *entry = BASE_TO_PAGE_ADDR(pml_entry->pdp_base_addr);
+    return PT_ENTRY_PAGE;
+  }
+}
+
+pt_entry_type_t pdpe64_lookup(pdpe64_t * pdp, addr_t addr, addr_t * entry) {
+  pdpe64_t * pdpe_entry = &(pdp[PDPE64_INDEX(addr)]);
+  
+  if (!pdpe_entry->present) {
+    *entry = 0;
+    return PT_ENTRY_NOT_PRESENT;
+  } else if (pdpe_entry->large_page) {
+    PrintError("1 Gigabyte pages not supported\n");
+    V3_ASSERT(0);
     return -1;
   } else {
-    *entry = PTE32_T_ADDR(*pte_entry) + PT32_PAGE_OFFSET(addr);
+    *entry = BASE_TO_PAGE_ADDR(pdpe_entry->pd_base_addr);
+    return PT_ENTRY_PAGE;
+  }
+}
+
+pt_entry_type_t pde64_lookup(pde64_t * pd, addr_t addr, addr_t * entry) {
+  pde64_t * pde_entry = &(pd[PDE64_INDEX(addr)]);
+
+  if (!pde_entry->present) {
+    *entry = 0;
+    return PT_ENTRY_NOT_PRESENT;
+  } else if (pde_entry->large_page) {
+    pde64_2MB_t * large_pde = (pde64_2MB_t *)pde_entry;
+
+    *entry = BASE_TO_PAGE_ADDR_2MB(large_pde->page_base_addr);
+    *entry += PAGE_OFFSET_2MB(addr);
+
+    return PT_ENTRY_LARGE_PAGE;
+  } else {
+    *entry = BASE_TO_PAGE_ADDR(pde_entry->pt_base_addr);
+    return PT_ENTRY_PAGE;
+  }
+}
+
+pt_entry_type_t pte64_lookup(pte64_t * pt, addr_t addr, addr_t * entry) {
+  pte64_t * pte_entry = &(pt[PTE64_INDEX(addr)]);
+
+  if (!pte_entry->present) {
+    *entry = 0;
+    return PT_ENTRY_NOT_PRESENT;
+  } else {
+    *entry = BASE_TO_PAGE_ADDR(pte_entry->page_base_addr) + PAGE_OFFSET(addr);
+    return PT_ENTRY_PAGE;
+  }
+}
+
+
+
+
+
+
+
+
+/* 
+ *
+ * Page Table Access Checks
+ *
+ */
+
+
+
+
+
+
+int v3_check_host_pt_32(v3_reg_t host_cr3, addr_t vaddr, pf_error_t access_type, pt_access_status_t * access_status) {
+  pde32_t * host_pde = (pde32_t *)CR3_TO_PDE32_VA(host_cr3);
+  pte32_t * host_pte = 0;
+
+  int pt_level = 2;
+
+  // Check accessibility of PDE
+  *access_status = v3_can_access_pde32(host_pde, vaddr, access_type);
+  
+  if (*access_status != PT_ACCESS_OK) {
+    return pt_level;
+  } 
+
+  pt_level--;
+  
+  switch (pde32_lookup(host_pde, vaddr, (addr_t *)&host_pte)) {
+  case PT_ENTRY_LARGE_PAGE:
     return 0;
+  case PT_ENTRY_PAGE:
+    *access_status = v3_can_access_pte32(V3_VAddr(host_pte), vaddr, access_type);
+    
+    if (*access_status != PT_ACCESS_OK) {
+      return pt_level;
+    }
+
+    return 0;
+  default: 
+    return -1;
   }
+  
+  // should never get here
+  return -1;
+}
+
+int v3_check_host_pt_32pae(v3_reg_t host_cr3, addr_t vaddr, pf_error_t access_type, pt_access_status_t * access_status) {
+  pdpe32pae_t * host_pdpe = (pdpe32pae_t *)CR3_TO_PDPE32PAE_VA(host_cr3);
+  pde32pae_t * host_pde = NULL;
+  pte32pae_t * host_pte = NULL;
+  int pt_level = 3;
+
+  *access_status = v3_can_access_pdpe32pae(host_pdpe, vaddr, access_type);
+
+  if (*access_status != PT_ACCESS_OK) {
+    return pt_level;
+  }
+
+  pt_level--;
+
+  switch (pdpe32pae_lookup(host_pdpe, vaddr, (addr_t *)&host_pde)) {
+  case PT_ENTRY_PAGE:
+    *access_status = v3_can_access_pde32pae(V3_VAddr(host_pde), vaddr, access_type);
 
+    if (*access_status != PT_ACCESS_OK) {
+      return pt_level;
+    }
+
+    pt_level--;
+
+    switch (pde32pae_lookup(V3_VAddr(host_pde), vaddr, (addr_t *)&host_pte)) {
+    case PT_ENTRY_LARGE_PAGE:
+      return 0;
+    case PT_ENTRY_PAGE:
+      *access_status = v3_can_access_pte32pae(V3_VAddr(host_pte), vaddr, access_type);
+
+      if (*access_status != PT_ACCESS_OK) {
+       return pt_level;
+      }
+
+      return 0;
+    default:
+      return -1;
+    }
+  default:
+    return -1;
+  }
+
+  // should never get here
   return -1;
 }
 
 
 
-pt_access_status_t can_access_pde32(pde32_t * pde, addr_t addr, pf_error_t access_type) {
-  pde32_t * entry = &pde[PDE32_INDEX(addr)];
+int v3_check_host_pt_64(v3_reg_t host_cr3, addr_t vaddr, pf_error_t access_type, pt_access_status_t * access_status) {
+  pml4e64_t * host_pmle = (pml4e64_t *)CR3_TO_PML4E64_VA(host_cr3);
+  pdpe64_t * host_pdpe = NULL;
+  pde64_t * host_pde = NULL;
+  pte64_t * host_pte = NULL;
+  int pt_level = 4;
 
-  if (entry->present == 0) {
-    return PT_ENTRY_NOT_PRESENT;
-  } 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?
-    return PT_USER_ERROR;
+
+  *access_status = v3_can_access_pml4e64(host_pmle, vaddr, access_type);
+
+  if (*access_status != PT_ACCESS_OK) {
+    return pt_level;
   }
 
-  return PT_ACCESS_OK;
+  pt_level--;
+
+  switch(pml4e64_lookup(host_pmle, vaddr, (addr_t *)&host_pdpe)) {
+  case PT_ENTRY_PAGE:
+    *access_status = v3_can_access_pdpe64(V3_VAddr(host_pdpe), vaddr, access_type);
+
+    if (*access_status != PT_ACCESS_OK) {
+      return pt_level;
+    }
+
+    pt_level--;
+
+    switch(pdpe64_lookup(V3_VAddr(host_pdpe), vaddr, (addr_t *)&host_pde)) {
+    case PT_ENTRY_LARGE_PAGE:
+      return 0;
+    case PT_ENTRY_PAGE:
+      *access_status = v3_can_access_pde64(V3_VAddr(host_pde), vaddr, access_type);
+
+      if (*access_status != PT_ACCESS_OK) {
+       return pt_level;
+      }
+
+      pt_level--;
+
+      switch (pde64_lookup(V3_VAddr(host_pde), vaddr, (addr_t *)&host_pte)) {
+      case PT_ENTRY_LARGE_PAGE:
+       return 0;
+      case PT_ENTRY_PAGE:
+       *access_status = v3_can_access_pte64(V3_VAddr(host_pte), vaddr, access_type);
+
+       if (*access_status != PT_ACCESS_OK) {
+         return pt_level;
+       }
+
+       return 0;
+      default:
+       return -1;
+      }
+    default:
+      return -1;
+    }
+  default:
+    return -1;
+  }
+
+  // should never get here
+  return -1;
 }
 
 
-pt_access_status_t can_access_pte32(pte32_t * pte, addr_t addr, pf_error_t access_type) {
-  pte32_t * entry = &pte[PTE32_INDEX(addr)];
 
-  if (entry->present == 0) {
-    return PT_ENTRY_NOT_PRESENT;
-  } else if ((entry->writable == 0) && (access_type.write == 1)) {
-    return PT_WRITE_ERROR;
-  } else if ((entry->user_page == 0) && (access_type.user == 1)) {
+
+
+int v3_check_guest_pt_32(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, 
+                        pf_error_t access_type, pt_access_status_t * access_status) {
+  addr_t guest_pde_pa = CR3_TO_PDE32_PA(guest_cr3);
+  pde32_t * guest_pde = NULL;
+  addr_t guest_pte_pa = 0;
+  int pt_level = 2;
+
+  if (guest_pa_to_host_va(info, guest_pde_pa, (addr_t*)&guest_pde) == -1) {
+    PrintError("Could not get virtual address of Guest PDE32 (PA=%p)\n", 
+              (void *)guest_pde_pa);
+    return -1;
+  }
+  
+
+  // Check accessibility of PDE
+  *access_status = v3_can_access_pde32(guest_pde, vaddr, access_type);
+  
+  if (*access_status != PT_ACCESS_OK) {
+    return pt_level;
+  } 
+
+  pt_level--;
+  
+  switch (pde32_lookup(guest_pde, vaddr, &guest_pte_pa)) {
+  case PT_ENTRY_LARGE_PAGE:
+    return 0;
+  case PT_ENTRY_PAGE:
+    {
+      pte32_t * guest_pte = NULL;
+
+      if (guest_pa_to_host_va(info, guest_pte_pa, (addr_t*)&guest_pte) == -1) {
+       PrintError("Could not get virtual address of Guest PTE32 (PA=%p)\n", 
+                  (void *)guest_pte_pa);
+       return -1;
+      }
+
+      *access_status = v3_can_access_pte32(guest_pte, vaddr, access_type);
+      
+      if (*access_status != PT_ACCESS_OK) {
+       return pt_level;
+      }
+      return 0;
+    }
+  default: 
+    return -1;
+  }
+  
+  // should never get here
+  return -1;
+}
+
+
+
+
+
+int v3_check_guest_pt_32pae(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, 
+                           pf_error_t access_type, pt_access_status_t * access_status) {
+  addr_t guest_pdpe_pa = CR3_TO_PDPE32PAE_PA(guest_cr3);
+  pdpe32pae_t * guest_pdpe = NULL;
+  addr_t guest_pde_pa = 0;
+  int pt_level = 3;
+
+  if (guest_pa_to_host_va(info, guest_pdpe_pa, (addr_t*)&guest_pdpe) == -1) {
+    PrintError("Could not get virtual address of Guest PDPE32PAE (PA=%p)\n",
+              (void *)guest_pdpe_pa);
+    return -1;
+  }
+
+  *access_status = v3_can_access_pdpe32pae(guest_pdpe, vaddr, access_type);
+
+  if (*access_status != PT_ACCESS_OK) {
+    return pt_level;
+  }
+
+  pt_level--;
+
+  switch (pdpe32pae_lookup(guest_pdpe, vaddr, &guest_pde_pa)) {
+  case PT_ENTRY_PAGE:
+    {
+      pde32pae_t * guest_pde = NULL;
+      addr_t guest_pte_pa = 0;
+       
+      if (guest_pa_to_host_va(info, guest_pde_pa, (addr_t *)&guest_pde) == -1) {
+       PrintError("Could not get virtual Address of Guest PDE32PAE (PA=%p)\n", 
+                  (void *)guest_pde_pa);
+       return -1;
+      }
+      
+      *access_status = v3_can_access_pde32pae(guest_pde, vaddr, access_type);
+      
+      if (*access_status != PT_ACCESS_OK) {
+       return pt_level;
+      }
+      
+      pt_level--;
+      
+      switch (pde32pae_lookup(guest_pde, vaddr, &guest_pte_pa)) {
+      case PT_ENTRY_LARGE_PAGE:
+       return 0;
+      case PT_ENTRY_PAGE:
+       {
+         pte32pae_t * guest_pte = NULL;
+
+         if (guest_pa_to_host_va(info, guest_pte_pa, (addr_t *)&guest_pte) == -1) {
+           PrintError("Could not get virtual Address of Guest PTE32PAE (PA=%p)\n", 
+                      (void *)guest_pte_pa);
+           return -1;
+         }
+
+         *access_status = v3_can_access_pte32pae(guest_pte, vaddr, access_type);
+       
+         if (*access_status != PT_ACCESS_OK) {
+           return pt_level;
+         }
+       
+         return 0;
+       }
+      default:
+       return -1;
+      }
+    }
+  default:
+    return -1;
+  }
+
+  // should never get here
+  return -1;
+}
+
+
+  pte64_t * guest_pte = NULL;
+
+int v3_check_guest_pt_64(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, 
+                        pf_error_t access_type, pt_access_status_t * access_status) {
+  addr_t guest_pml4_pa = CR3_TO_PML4E64_PA(guest_cr3);
+  pml4e64_t * guest_pmle = NULL; 
+  addr_t guest_pdpe_pa = 0;
+  int pt_level = 4;
+
+  if (guest_pa_to_host_va(info, guest_pml4_pa, (addr_t*)&guest_pmle) == -1) {
+    PrintError("Could not get virtual address of Guest PML4E64 (PA=%p)\n", 
+              (void *)guest_pml4_pa);
+    return -1;
+  }
+
+  *access_status = v3_can_access_pml4e64(guest_pmle, vaddr, access_type);
+
+  if (*access_status != PT_ACCESS_OK) {
+    return pt_level;
+  }
+
+  pt_level--;
+
+  switch(pml4e64_lookup(guest_pmle, vaddr, &guest_pdpe_pa)) {
+  case PT_ENTRY_PAGE:
+    {
+      pdpe64_t * guest_pdp = NULL;
+      addr_t guest_pde_pa = 0;
+
+      if (guest_pa_to_host_va(info, guest_pdpe_pa, (addr_t *)&guest_pdp) == -1) {
+       PrintError("Could not get virtual address of Guest PDPE64 (PA=%p)\n", 
+                  (void *)guest_pdpe_pa);
+       return -1;
+      }
+
+      *access_status = v3_can_access_pdpe64(guest_pdp, vaddr, access_type);
+      
+      if (*access_status != PT_ACCESS_OK) {
+       return pt_level;
+      }
+      
+      pt_level--;
+      
+      switch(pdpe64_lookup(guest_pdp, vaddr, &guest_pde_pa)) {
+      case PT_ENTRY_LARGE_PAGE:
+       return 0;
+      case PT_ENTRY_PAGE:
+       {
+         pde64_t * guest_pde = NULL;
+         addr_t guest_pte_pa = 0;
+         
+         if (guest_pa_to_host_va(info, guest_pde_pa, (addr_t *)&guest_pde) == -1) {
+           PrintError("Could not get virtual address of guest PDE64 (PA=%p)\n", 
+                      (void *)guest_pde_pa);
+           return -1;
+         }
+
+         *access_status = v3_can_access_pde64(guest_pde, vaddr, access_type);
+         
+         if (*access_status != PT_ACCESS_OK) {
+           return pt_level;
+         }
+         
+         pt_level--;
+         
+         switch (pde64_lookup(guest_pde, vaddr, &guest_pte_pa)) {
+         case PT_ENTRY_LARGE_PAGE:
+           return 0;
+         case PT_ENTRY_PAGE:
+           {
+             pte64_t * guest_pte = NULL;
+             
+             if (guest_pa_to_host_va(info, guest_pte_pa, (addr_t *)&guest_pte) == -1) {
+               PrintError("Could not get virtual address of guest PTE64 (PA=%p)\n", 
+                          (void *)guest_pte_pa);
+               return -1;
+             }
+
+             *access_status = v3_can_access_pte64(guest_pte, vaddr, access_type);
+             
+             if (*access_status != PT_ACCESS_OK) {
+               return pt_level;
+             }
+             
+             return 0;
+           }
+         default:
+           return -1;
+         }
+       }
+      default:
+       return -1;
+      }
+    }
+  default:
+    return -1;
+  }
+
+  // should never get here
+  return -1;
+}
+
+
+
+
+
+static pt_access_status_t can_access_pt_entry(gen_pt_t * pt, pf_error_t access_type) {
+  if (pt->present == 0) {
+    return PT_ACCESS_NOT_PRESENT;
+  } else if ((pt->writable == 0) && (access_type.write == 1)) {
+    return PT_ACCESS_WRITE_ERROR;
+  } else if ((pt->user_page == 0) && (access_type.user == 1)) {
     // Check CR0.WP?
-    return PT_USER_ERROR;
+    return PT_ACCESS_USER_ERROR;
   }
 
   return PT_ACCESS_OK;
@@ -165,6 +934,69 @@ pt_access_status_t can_access_pte32(pte32_t * pte, addr_t addr, pf_error_t acces
 
 
 
+/*
+ *   32 bit access checks
+ */
+pt_access_status_t inline v3_can_access_pde32(pde32_t * pde, addr_t addr, pf_error_t access_type) {
+  gen_pt_t * entry = (gen_pt_t *)&pde[PDE32_INDEX(addr)];
+  return can_access_pt_entry(entry, access_type);
+}
+
+pt_access_status_t inline v3_can_access_pte32(pte32_t * pte, addr_t addr, pf_error_t access_type) {
+  gen_pt_t * entry = (gen_pt_t *)&pte[PTE32_INDEX(addr)];
+  return can_access_pt_entry(entry, access_type);
+}
+
+
+/*
+ *  32 bit PAE access checks
+ */
+pt_access_status_t inline v3_can_access_pdpe32pae(pdpe32pae_t * pdpe, addr_t addr, pf_error_t access_type) {
+  gen_pt_t * entry = (gen_pt_t *)&pdpe[PDPE32PAE_INDEX(addr)];
+  return can_access_pt_entry(entry, access_type);
+}
+
+pt_access_status_t inline v3_can_access_pde32pae(pde32pae_t * pde, addr_t addr, pf_error_t access_type) {
+  gen_pt_t * entry = (gen_pt_t *)&pde[PDE32PAE_INDEX(addr)];
+  return can_access_pt_entry(entry, access_type);
+}
+
+pt_access_status_t inline v3_can_access_pte32pae(pte32pae_t * pte, addr_t addr, pf_error_t access_type) {
+  gen_pt_t * entry = (gen_pt_t *)&pte[PTE32PAE_INDEX(addr)];
+  return can_access_pt_entry(entry, access_type);
+}
+
+/*
+ *   64 Bit access checks
+ */
+pt_access_status_t inline v3_can_access_pml4e64(pml4e64_t * pmle, addr_t addr, pf_error_t access_type) {
+  gen_pt_t * entry = (gen_pt_t *)&pmle[PML4E64_INDEX(addr)];
+  return can_access_pt_entry(entry, access_type);
+}
+
+pt_access_status_t inline v3_can_access_pdpe64(pdpe64_t * pdpe, addr_t addr, pf_error_t access_type) {
+  gen_pt_t * entry = (gen_pt_t *)&pdpe[PDPE64_INDEX(addr)];
+  return can_access_pt_entry(entry, access_type);
+}
+
+pt_access_status_t inline v3_can_access_pde64(pde64_t * pde, addr_t addr, pf_error_t access_type) {
+  gen_pt_t * entry = (gen_pt_t *)&pde[PDE32_INDEX(addr)];
+  return can_access_pt_entry(entry, access_type);
+}
+
+pt_access_status_t inline v3_can_access_pte64(pte64_t * pte, addr_t addr, pf_error_t access_type) {
+  gen_pt_t * entry = (gen_pt_t *)&pte[PTE64_INDEX(addr)];
+  return can_access_pt_entry(entry, access_type);
+}
+
+
+
+
+
+
+
+
+
 
 /* We generate a page table to correspond to a given memory layout
  * pulling pages from the mem_list when necessary
@@ -254,7 +1086,7 @@ pde32_t * create_passthrough_pts_32(struct guest_info * guest_info) {
       pde[i].large_page = 0;
       pde[i].global_page = 0;
       pde[i].vmm_info = 0;
-      pde[i].pt_base_addr = PAGE_ALIGNED_ADDR((addr_t)V3_PAddr(pte));
+      pde[i].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte));
     }
 
   }
@@ -361,7 +1193,7 @@ pdpe32pae_t * create_passthrough_pts_32PAE(struct guest_info * guest_info) {
        pde[j].large_page = 0;
        pde[j].global_page = 0;
        pde[j].vmm_info = 0;
-       pde[j].pt_base_addr = PAGE_ALIGNED_ADDR((addr_t)V3_PAddr(pte));
+       pde[j].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte));
        pde[j].rsvd = 0;
 
        pde_present = 1;
@@ -391,7 +1223,7 @@ pdpe32pae_t * create_passthrough_pts_32PAE(struct guest_info * guest_info) {
       pdpe[i].avail = 0;
       pdpe[i].rsvd2 = 0;
       pdpe[i].vmm_info = 0;
-      pdpe[i].pd_base_addr = PAGE_ALIGNED_ADDR((addr_t)V3_PAddr(pde));
+      pdpe[i].pd_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pde));
       pdpe[i].rsvd3 = 0;
     }
     
@@ -467,7 +1299,7 @@ pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
              return NULL;
            }
 
-           pte[m].page_base_addr = PTE64_BASE_ADDR(host_addr);
+           pte[m].page_base_addr = PAGE_BASE_ADDR(host_addr);
 
            //PrintPTE64(current_page_addr, &(pte[m]));
 
@@ -489,7 +1321,7 @@ pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
          pde[k].write_through = 0;
          pde[k].cache_disable = 0;
          pde[k].accessed = 0;
-         pde[k].reserved = 0;
+         pde[k].avail = 0;
          pde[k].large_page = 0;
          //pde[k].global_page = 0;
          pde[k].vmm_info = 0;
@@ -501,11 +1333,11 @@ pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
          pde[k].write_through = 0;
          pde[k].cache_disable = 0;
          pde[k].accessed = 0;
-         pde[k].reserved = 0;
+         pde[k].avail = 0;
          pde[k].large_page = 0;
          //pde[k].global_page = 0;
          pde[k].vmm_info = 0;
-         pde[k].pt_base_addr = PAGE_ALIGNED_ADDR((addr_t)V3_PAddr(pte));
+         pde[k].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte));
 
          pde_present = 1;
        }
@@ -520,7 +1352,7 @@ pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
        pdpe[j].write_through = 0;
        pdpe[j].cache_disable = 0;
        pdpe[j].accessed = 0;
-       pdpe[j].reserved = 0;
+       pdpe[j].avail = 0;
        pdpe[j].large_page = 0;
        //pdpe[j].global_page = 0;
        pdpe[j].vmm_info = 0;
@@ -532,11 +1364,11 @@ pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
        pdpe[j].write_through = 0;
        pdpe[j].cache_disable = 0;
        pdpe[j].accessed = 0;
-       pdpe[j].reserved = 0;
+       pdpe[j].avail = 0;
        pdpe[j].large_page = 0;
        //pdpe[j].global_page = 0;
        pdpe[j].vmm_info = 0;
-       pdpe[j].pd_base_addr = PAGE_ALIGNED_ADDR((addr_t)V3_PAddr(pde));
+       pdpe[j].pd_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pde));
 
 
        pdpe_present = 1;
@@ -571,319 +1403,198 @@ pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
       //pml[i].large_page = 0;
       //pml[i].global_page = 0;
       pml[i].vmm_info = 0;
-      pml[i].pdp_base_addr = PAGE_ALIGNED_ADDR((addr_t)V3_PAddr(pdpe));
+      pml[i].pdp_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pdpe));
     }
   }
 
   return pml;
 }
 
+/*
+int v3_walk_guest_pt_32(struct guest_info * info,  v3_reg_t guest_cr3,
+                       int (*callback)(int level, addr_t page_va, addr_t page_pa, void private_data),
+                       void * private_data) {
+  addr_t guest_pde_pa = CR3_TO_PDE32_PA(guest_cr3);
+  pde32_t * guest_pde = NULL;
+  int i, j;
 
+  if (!callback) {
+    PrintError("Call back was not specified\n");
+    return -1;
+  }
 
+  if (guest_pa_to_host_va(info, guest_pde_pa, (addr_t *)&guest_pde) == -1) {
+    PrintError("Could not get virtual address of Guest PDE32 (PA=%p)\n", 
+              (void *)guest_pde_pa);
+    return -1;
+  }
 
+  callback(PAGE_PD32, guest_pde, guest_pde_pa, private_data);
 
+  for (i = 0; i < MAX_PDE32_ENTRIES; i++) {
+    if (guet_pde[i].present) {
+      if (guest_pde[i].large_page) {
 
 
 
-void PrintPDE32(addr_t virtual_address, pde32_t * pde)
-{
-  PrintDebug("PDE %p -> %p : present=%x, writable=%x, user=%x, wt=%x, cd=%x, accessed=%x, reserved=%x, largePages=%x, globalPage=%x, kernelInfo=%x\n",
-            (void *)virtual_address,
-            (void *)(addr_t) (pde->pt_base_addr << PAGE_POWER),
-            pde->present,
-            pde->writable,
-            pde->user_page, 
-            pde->write_through,
-            pde->cache_disable,
-            pde->accessed,
-            pde->reserved,
-            pde->large_page,
-            pde->global_page,
-            pde->vmm_info);
-}
-
-  
-void PrintPTE32(addr_t virtual_address, pte32_t * pte)
-{
-  PrintDebug("PTE %p -> %p : present=%x, writable=%x, user=%x, wt=%x, cd=%x, accessed=%x, dirty=%x, pteAttribute=%x, globalPage=%x, vmm_info=%x\n",
-            (void *)virtual_address,
-            (void*)(addr_t)(pte->page_base_addr << PAGE_POWER),
-            pte->present,
-            pte->writable,
-            pte->user_page,
-            pte->write_through,
-            pte->cache_disable,
-            pte->accessed,
-            pte->dirty,
-            pte->pte_attr,
-            pte->global_page,
-            pte->vmm_info);
 }
+*/
 
 
 
+int v3_walk_host_pt_32(v3_reg_t host_cr3,
+                      int (*callback)(int level, addr_t page_va, addr_t page_pa, void * private_data),
+                      void * private_data) {
+  pde32_t * host_pde = (pde32_t *)CR3_TO_PDE32_VA(host_cr3);
+  addr_t pde_pa = CR3_TO_PDE32_PA(host_cr3);
+  int i, j;
 
+  if (!callback) {
+    PrintError("Call back was not specified\n");
+    return -1;
+  }
 
+  callback(PAGE_PD32, (addr_t)host_pde, pde_pa, private_data);
 
+  for (i = 0; i < MAX_PDE32_ENTRIES; i++) {
+    if (host_pde[i].present) {
+      if (host_pde[i].large_page) {
+       pde32_4MB_t * large_pde = (pde32_4MB_t *)&(host_pde[i]);
+       addr_t large_page_pa = BASE_TO_PAGE_ADDR_4MB(large_pde->page_base_addr);
 
+       callback(PAGE_4MB, (addr_t)V3_VAddr((void *)large_page_pa), large_page_pa, private_data);
+      } else {
+       addr_t pte_pa = BASE_TO_PAGE_ADDR(host_pde[i].pt_base_addr);
+       pte32_t * tmp_pte = (pte32_t *)V3_VAddr((void *)pte_pa);
 
+       callback(PAGE_PT32, (addr_t)tmp_pte, pte_pa, private_data);
 
-
-void PrintPD32(pde32_t * pde)
-{
-  int i;
-
-  PrintDebug("Page Directory at %p:\n", pde);
-  for (i = 0; (i < MAX_PDE32_ENTRIES); i++) { 
-    if ( pde[i].present) {
-      PrintPDE32((addr_t)(PAGE_SIZE * MAX_PTE32_ENTRIES * i), &(pde[i]));
-    }
-  }
-}
-
-void PrintPT32(addr_t starting_address, pte32_t * pte) 
-{
-  int i;
-
-  PrintDebug("Page Table at %p:\n", pte);
-  for (i = 0; (i < MAX_PTE32_ENTRIES) ; i++) { 
-    if (pte[i].present) {
-      PrintPTE32(starting_address + (PAGE_SIZE * i), &(pte[i]));
+       for (j = 0; j < MAX_PTE32_ENTRIES; j++) {
+         if (tmp_pte[j].present) {
+           addr_t page_pa = BASE_TO_PAGE_ADDR(tmp_pte[j].page_base_addr);
+           callback(PAGE_4KB, (addr_t)V3_VAddr((void *)page_pa), page_pa, private_data);
+         }
+       }
+      }
     }
   }
+  return 0;
 }
+       
 
 
 
 
-
-
-
-void PrintDebugPageTables(pde32_t * pde)
-{
-  int i;
+int v3_walk_host_pt_32pae(v3_reg_t host_cr3,
+                         void (*callback)(page_type_t type, addr_t page_va, addr_t page_pa, void * private_data),
+                         void * private_data) {
+  pdpe32pae_t * host_pdpe = (pdpe32pae_t *)CR3_TO_PDPE32PAE_VA(host_cr3);
+  addr_t pdpe_pa = CR3_TO_PDPE32PAE_PA(host_cr3);
+  int i, j, k;
   
-  PrintDebug("Dumping the pages starting with the pde page at %p\n", pde);
-
-  for (i = 0; (i < MAX_PDE32_ENTRIES); i++) { 
-    if (pde[i].present) {
-      PrintPDE32((addr_t)(PAGE_SIZE * MAX_PTE32_ENTRIES * i), &(pde[i]));
-      PrintPT32((addr_t)(PAGE_SIZE * MAX_PTE32_ENTRIES * i), (pte32_t *)V3_VAddr((void *)(addr_t)(pde[i].pt_base_addr << PAGE_POWER)));
-    }
+  if (!callback) {
+    PrintError("Callback was not specified\n");
+    return -1;
   }
-}
-    
-
-
-
-
-
-
-
-void PrintPDPE32PAE(addr_t virtual_address, pdpe32pae_t * pdpe)
-{
-  PrintDebug("PDPE %p -> %p : present=%x, wt=%x, cd=%x, accessed=%x, kernelInfo=%x\n",
-            (void *)virtual_address,
-            (void *)(addr_t) (pdpe->pd_base_addr << PAGE_POWER),
-            pdpe->present,
-            pdpe->write_through,
-            pdpe->cache_disable,
-            pdpe->accessed,
-            pdpe->vmm_info);
-}
-
-void PrintPDE32PAE(addr_t virtual_address, pde32pae_t * pde)
-{
-  PrintDebug("PDE %p -> %p : present=%x, writable=%x, user=%x, wt=%x, cd=%x, accessed=%x, largePages=%x, globalPage=%x, kernelInfo=%x\n",
-            (void *)virtual_address,
-            (void *)(addr_t) (pde->pt_base_addr << PAGE_POWER),
-            pde->present,
-            pde->writable,
-            pde->user_page, 
-            pde->write_through,
-            pde->cache_disable,
-            pde->accessed,
-            pde->large_page,
-            pde->global_page,
-            pde->vmm_info);
-}
-
   
-void PrintPTE32PAE(addr_t virtual_address, pte32pae_t * pte)
-{
-  PrintDebug("PTE %p -> %p : present=%x, writable=%x, user=%x, wt=%x, cd=%x, accessed=%x, dirty=%x, pteAttribute=%x, globalPage=%x, vmm_info=%x\n",
-            (void *)virtual_address,
-            (void*)(addr_t)(pte->page_base_addr << PAGE_POWER),
-            pte->present,
-            pte->writable,
-            pte->user_page,
-            pte->write_through,
-            pte->cache_disable,
-            pte->accessed,
-            pte->dirty,
-            pte->pte_attr,
-            pte->global_page,
-            pte->vmm_info);
-}
-
-
-
-
-
-
-void PrintDebugPageTables32PAE(pdpe32pae_t * pdpe)
-{
-  int i, j, k;
-  pde32pae_t * pde;
-  pte32pae_t * pte;
-  addr_t virtual_addr = 0;
-
-  PrintDebug("Dumping the pages starting with the pde page at %p\n", pdpe);
-
-  for (i = 0; (i < MAX_PDPE32PAE_ENTRIES); i++) { 
-
-    if (pdpe[i].present) {
-      pde = (pde32pae_t *)V3_VAddr((void *)(addr_t)BASE_TO_PAGE_ADDR(pdpe[i].pd_base_addr));
-
-      PrintPDPE32PAE(virtual_addr, &(pdpe[i]));
-
+  callback(PAGE_PDP32PAE, (addr_t)host_pdpe, pdpe_pa, private_data);
+  
+  for (i = 0; i < MAX_PDPE32PAE_ENTRIES; i++) {
+    if (host_pdpe[i].present) {        
+      addr_t pde_pa = BASE_TO_PAGE_ADDR(host_pdpe[i].pd_base_addr);
+      pde32pae_t * tmp_pde = (pde32pae_t *)V3_VAddr((void *)pde_pa);
+      
+      callback(PAGE_PD32PAE, (addr_t)tmp_pde, pde_pa, private_data);
+      
       for (j = 0; j < MAX_PDE32PAE_ENTRIES; j++) {
+       if (tmp_pde[j].present) {
+         
+         if (tmp_pde[j].large_page) {
+           pde32pae_2MB_t * large_pde = (pde32pae_2MB_t *)&(tmp_pde[j]);
+           addr_t large_page_pa = BASE_TO_PAGE_ADDR_2MB(large_pde->page_base_addr);
 
-       if (pde[j].present) {
-         pte = (pte32pae_t *)V3_VAddr((void *)(addr_t)BASE_TO_PAGE_ADDR(pde[j].pt_base_addr));
-
-         PrintPDE32PAE(virtual_addr, &(pde[j]));
-
-         for (k = 0; k < MAX_PTE32PAE_ENTRIES; k++) {
-           if (pte[k].present) {
-             PrintPTE32PAE(virtual_addr, &(pte[k]));
+           callback(PAGE_2MB, (addr_t)V3_VAddr((void *)large_page_pa), large_page_pa, private_data);
+         } else {
+           addr_t pte_pa = BASE_TO_PAGE_ADDR(tmp_pde[j].pt_base_addr);
+           pte32pae_t * tmp_pte = (pte32pae_t *)V3_VAddr((void *)pte_pa);
+           
+           callback(PAGE_PT32PAE, (addr_t)tmp_pte, pte_pa, private_data);
+           
+           for (k = 0; k < MAX_PTE32PAE_ENTRIES; k++) {
+             if (tmp_pte[k].present) {
+               addr_t page_pa = BASE_TO_PAGE_ADDR(tmp_pte[k].page_base_addr);
+               callback(PAGE_4KB, (addr_t)V3_VAddr((void *)page_pa), page_pa, private_data);
+             }
            }
-
-           virtual_addr += PAGE_SIZE;
-         }
-       } else {
-         virtual_addr += PAGE_SIZE * MAX_PTE32PAE_ENTRIES;
+         }         
        }
       }
-    } else {
-      virtual_addr += PAGE_SIZE * MAX_PDE32PAE_ENTRIES * MAX_PTE32PAE_ENTRIES;
     }
   }
+  return 0;
 }
-    
-
-
-void PrintPML4e64(addr_t virtual_address, pml4e64_t * pml)
-{
-  PrintDebug("PML4e64 %p -> %p : present=%x, writable=%x, user=%x, wt=%x, cd=%x, accessed=%x, reserved=%x, kernelInfo=%x\n",
-            (void *)virtual_address,
-            (void *)(addr_t) (BASE_TO_PAGE_ADDR(pml->pdp_base_addr)),
-            pml->present,
-            pml->writable,
-            pml->user_page, 
-            pml->write_through,
-            pml->cache_disable,
-            pml->accessed,
-            pml->reserved,
-            pml->vmm_info);
-}
-
-void PrintPDPE64(addr_t virtual_address, pdpe64_t * pdpe)
-{
-  PrintDebug("PDPE64 %p -> %p : present=%x, writable=%x, user=%x, wt=%x, cd=%x, accessed=%x, reserved=%x, largePages=%x, globalPage=%x, kernelInfo=%x\n",
-            (void *)virtual_address,
-            (void *)(addr_t) (BASE_TO_PAGE_ADDR(pdpe->pd_base_addr)),
-            pdpe->present,
-            pdpe->writable,
-            pdpe->user_page, 
-            pdpe->write_through,
-            pdpe->cache_disable,
-            pdpe->accessed,
-            pdpe->reserved,
-            pdpe->large_page,
-            0,//pdpe->global_page,
-            pdpe->vmm_info);
-}
-
-
-
-void PrintPDE64(addr_t virtual_address, pde64_t * pde)
-{
-  PrintDebug("PDE64 %p -> %p : present=%x, writable=%x, user=%x, wt=%x, cd=%x, accessed=%x, reserved=%x, largePages=%x, globalPage=%x, kernelInfo=%x\n",
-            (void *)virtual_address,
-            (void *)(addr_t) (BASE_TO_PAGE_ADDR(pde->pt_base_addr)),
-            pde->present,
-            pde->writable,
-            pde->user_page, 
-            pde->write_through,
-            pde->cache_disable,
-            pde->accessed,
-            pde->reserved,
-            pde->large_page,
-            0,//pde->global_page,
-            pde->vmm_info);
-}
+                       
 
-  
-void PrintPTE64(addr_t virtual_address, pte64_t * pte)
-{
-  PrintDebug("PTE64 %p -> %p : present=%x, writable=%x, user=%x, wt=%x, cd=%x, accessed=%x, dirty=%x, pteAttribute=%x, globalPage=%x, vmm_info=%x\n",
-            (void *)virtual_address,
-            (void*)(addr_t)(BASE_TO_PAGE_ADDR(pte->page_base_addr)),
-            pte->present,
-            pte->writable,
-            pte->user_page,
-            pte->write_through,
-            pte->cache_disable,
-            pte->accessed,
-            pte->dirty,
-            pte->pte_attr,
-            pte->global_page,
-            pte->vmm_info);
-}
+int v3_walk_host_pt_64(v3_reg_t host_cr3,
+                      void (*callback)(page_type_t type, addr_t page_va, addr_t page_pa, void * private_data),
+                      void * private_data) {
+  pml4e64_t * host_pml = (pml4e64_t *)CR3_TO_PML4E64_VA(host_cr3);
+  addr_t pml_pa = CR3_TO_PML4E64_PA(host_cr3);
+  int i, j, k, m;
 
-  
+  if (!callback) {
+    PrintError("Callback was not specified\n");
+    return -1;
+  }
 
+  callback(PAGE_PML464, (addr_t)host_pml, pml_pa, private_data);
 
+  for (i = 0; i < MAX_PML4E64_ENTRIES; i++) {
+    if (host_pml[i].present) {
+      addr_t pdpe_pa = BASE_TO_PAGE_ADDR(host_pml[i].pdp_base_addr);
+      pdpe64_t * tmp_pdpe = (pdpe64_t *)V3_VAddr((void *)pdpe_pa);
 
-void PrintPageTree_64(addr_t virtual_addr, pml4e64_t * pml) {
-  uint_t pml4_index = PML4E64_INDEX(virtual_addr);
-  uint_t pdpe_index = PDPE64_INDEX(virtual_addr);
-  uint_t pde_index = PDE64_INDEX(virtual_addr);
-  uint_t pte_index = PTE64_INDEX(virtual_addr);
+      callback(PAGE_PDP64, (addr_t)tmp_pdpe, pdpe_pa, private_data);
 
-  PrintPML4e64(virtual_addr, &(pml[pml4_index]));
-  if (pml[pml4_index].present) {
-    pdpe64_t * pdpe = (pdpe64_t *)V3_VAddr((void *)(addr_t)BASE_TO_PAGE_ADDR(pml[pml4_index].pdp_base_addr));
-    PrintPDPE64(virtual_addr, &(pdpe[pdpe_index]));
+      for (j = 0; j < MAX_PDPE64_ENTRIES; j++) {
+       if (tmp_pdpe[j].present) {
+         if (tmp_pdpe[j].large_page) {
+           pdpe64_1GB_t * large_pdp = (pdpe64_1GB_t *)&(tmp_pdpe[j]);
+           addr_t large_page_pa = BASE_TO_PAGE_ADDR_1GB(large_pdp->page_base_addr);
 
-    if (pdpe[pdpe_index].present) {
-      pde64_t * pde = (pde64_t *)V3_VAddr((void *)(addr_t)BASE_TO_PAGE_ADDR(pdpe[pdpe_index].pd_base_addr));
-      PrintPDE64(virtual_addr, &(pde[pde_index]));
-      
-      if (pde[pde_index].present) {
-       pte64_t * pte = (pte64_t *)V3_VAddr((void *)(addr_t)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr));
-       PrintPTE64(virtual_addr, &(pte[pte_index]));
+           callback(PAGE_1GB, (addr_t)V3_VAddr((void *)large_page_pa), large_page_pa, private_data);       
+         } else {
+           addr_t pde_pa = BASE_TO_PAGE_ADDR(tmp_pdpe[j].pd_base_addr);
+           pde64_t * tmp_pde = (pde64_t *)V3_VAddr((void *)pde_pa);
+
+           callback(PAGE_PD64, (addr_t)tmp_pde, pde_pa, private_data);
+
+           for (k = 0; k < MAX_PDE64_ENTRIES; k++) {
+             if (tmp_pde[k].present) {
+               if (tmp_pde[k].large_page) {
+                 pde64_2MB_t * large_pde = (pde64_2MB_t *)&(tmp_pde[k]);
+                 addr_t large_page_pa = BASE_TO_PAGE_ADDR_2MB(large_pde->page_base_addr);
+                 
+                 callback(PAGE_2MB, (addr_t)V3_VAddr((void *)large_page_pa), large_page_pa, private_data);
+               } else {
+                 addr_t pte_pa = BASE_TO_PAGE_ADDR(tmp_pde[k].pt_base_addr);
+                 pte64_t * tmp_pte = (pte64_t *)V3_VAddr((void *)pte_pa);
+
+                 callback(PAGE_PT64, (addr_t)tmp_pte, pte_pa, private_data);
+
+                 for (m = 0; m < MAX_PTE64_ENTRIES; m++) {
+                   if (tmp_pte[m].present) {
+                     addr_t page_pa = BASE_TO_PAGE_ADDR(tmp_pte[m].page_base_addr);
+                     callback(PAGE_4KB, (addr_t)V3_VAddr((void *)page_pa), page_pa, private_data);
+                   }
+                 }
+               }
+             }
+           }
+         }
+       }
       }
-
     }
-
-  }
-
-}
-
-
-
-
-void PrintPageTree(v3_vm_cpu_mode_t cpu_mode, addr_t virtual_addr, addr_t cr3) {
-  switch (cpu_mode) {
-  case LONG:
-  case LONG_32_COMPAT:
-  case LONG_16_COMPAT:
-    PrintPageTree_64(virtual_addr, CR3_TO_PML4E64(cr3));
-    break;
-  default:
-    PrintError("Unsupported CPU MODE %d\n", cpu_mode);
-    break;
   }
+  return 0;
 }