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.


Cleanup and sanity-checking of before/after null-check and copy+paste errors (Coverit...
[palacios.git] / palacios / src / palacios / vmm_paging.c
index f63ddf1..85c0874 100644 (file)
 #include <palacios/vm_guest_mem.h>
 
 
+static pt_entry_type_t pde32_lookup(pde32_t * pd, addr_t addr, addr_t * entry);
+static pt_entry_type_t pte32_lookup(pte32_t * pt, addr_t addr, addr_t * entry);
 
-#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
+static pt_entry_type_t pdpe32pae_lookup(pdpe32pae_t * pdp, addr_t addr, addr_t * entry);
+static pt_entry_type_t pde32pae_lookup(pde32pae_t * pd, addr_t addr, addr_t * entry);
+static pt_entry_type_t pte32pae_lookup(pte32pae_t * pt, addr_t addr, addr_t * entry);
 
+static pt_entry_type_t pml4e64_lookup(pml4e64_t * pml, addr_t addr, addr_t * entry);
+static pt_entry_type_t pdpe64_lookup(pdpe64_t * pdp, addr_t addr, addr_t * entry);
+static pt_entry_type_t pde64_lookup(pde64_t * pd, addr_t addr, addr_t * entry);
+static pt_entry_type_t pte64_lookup(pte64_t * pt, addr_t addr, addr_t * entry);
 
-void delete_page_tables_32(pde32_t * pde) {
-  int i;
 
-  if (pde == NULL) { 
-    return;
-  }
 
-  for (i = 0; (i < MAX_PDE32_ENTRIES); i++) {
-    if (pde[i].present) {
-      // We double cast, first to an addr_t to handle 64 bit issues, then to the pointer
-      PrintDebug("PTE base addr %x \n", pde[i].pt_base_addr);
-      pte32_t * pte = (pte32_t *)((addr_t)(uint_t)(pde[i].pt_base_addr << PAGE_POWER));
 
-      PrintDebug("Deleting PTE %d (%p)\n", i, pte);
-      V3_FreePage(pte);
-    }
-  }
+#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
 
-  PrintDebug("Deleting PDE (%p)\n", pde);
-  V3_FreePage(V3_PAddr(pde));
-}
 
-void delete_page_tables_32PAE(pdpe32pae_t * pdpe) { 
-  PrintError("Unimplemented function\n");
-}
 
-void delete_page_tables_64(pml4e64_t * pml4) {
-  PrintError("Unimplemented function\n");
-}
+#ifndef V3_CONFIG_DEBUG_SHADOW_PAGING
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
 
 
-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;
+void delete_page_tables_32(pde32_t * pde) {
+    int i;
 
-      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 (pde == NULL) { 
+       return;
+    }
 
-      if (pte32_lookup(guest_pte, vaddr, paddr) == PT_ENTRY_NOT_PRESENT) {
-       return -1;
-      }
+    PrintDebug(VM_NONE, VCORE_NONE, "Deleting Page Tables (32) -- PDE (%p)\n", pde);
 
-      return 0;
+    for (i = 0; i < MAX_PDE32_ENTRIES; i++) {
+       if ((pde[i].present == 1) && (pde[i].large_page == 0)) {
+           // We double cast, first to an addr_t to handle 64 bit issues, then to the pointer
+      
+           PrintDebug(VM_NONE, VCORE_NONE, "Deleting PT Page %d (%p)\n", i, (void *)(addr_t)BASE_TO_PAGE_ADDR_4KB(pde[i].pt_base_addr));
+           V3_FreePages((void *)(addr_t)BASE_TO_PAGE_ADDR_4KB(pde[i].pt_base_addr), 1);
+       }
     }
-  }
 
-  // should never get here
-  return -1;
+    V3_FreePages(V3_PAddr(pde), 1);
 }
 
+void delete_page_tables_32pae(pdpe32pae_t * pdpe) {
+    int i, j;
 
-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 (pdpe == NULL) {
+       return;
+    }
 
-  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;
+    PrintDebug(VM_NONE, VCORE_NONE, "Deleting Page Tables (32 PAE) -- PDPE (%p)\n", pdpe);
+    
+    for (i = 0; i < MAX_PDPE32PAE_ENTRIES; i++) {
+       if (pdpe[i].present == 0) {
+           continue;
        }
-       
-       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;
-             }
+       pde32pae_t * pde = (pde32pae_t *)V3_VAddr((void *)(addr_t)BASE_TO_PAGE_ADDR_4KB(pdpe[i].pd_base_addr));
 
-             return 0;
+       for (j = 0; j < MAX_PDE32PAE_ENTRIES; j++) {
+
+           if ((pde[j].present == 0) || (pde[j].large_page == 1)) {
+               continue;
            }
-         }
-      }
-    default:
-      return -1;
+
+           V3_FreePages((void *)(addr_t)BASE_TO_PAGE_ADDR_4KB(pde[j].pt_base_addr), 1);
+       }
+
+       V3_FreePages(V3_PAddr(pde), 1);
     }
 
-  // should never get here
-  return -1;
+    V3_FreePages(V3_PAddr(pdpe), 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;
+void delete_page_tables_64(pml4e64_t * pml4) {
+    int i, j, k;
 
-  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 (pml4 == NULL) {
+       return;
+    }
 
-      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;
-      }
+    PrintDebug(VM_NONE, VCORE_NONE,"Deleting Page Tables (64) -- PML4 (%p)\n", pml4);
 
-      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;
+    for (i = 0; i < MAX_PML4E64_ENTRIES; i++) {
+       if (pml4[i].present == 0) {
+           continue;
+       }
 
-         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;
-         }
+       pdpe64_t * pdpe = (pdpe64_t *)V3_VAddr((void *)(addr_t)BASE_TO_PAGE_ADDR_4KB(pml4[i].pdp_base_addr));
 
-         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;
-             }
+       for (j = 0; j < MAX_PDPE64_ENTRIES; j++) {
+           if ((pdpe[j].present == 0) || (pdpe[j].large_page == 1)) {
+               continue;
+           }
+
+           pde64_t * pde = (pde64_t *)V3_VAddr((void *)(addr_t)BASE_TO_PAGE_ADDR_4KB(pdpe[j].pd_base_addr));
+
+           for (k = 0; k < MAX_PDE64_ENTRIES; k++) {
+               if ((pde[k].present == 0) || (pde[k].large_page == 1)) {
+                   continue;
+               }
 
-             return 0;
+               V3_FreePages((void *)(addr_t)BASE_TO_PAGE_ADDR_4KB(pde[k].pt_base_addr), 1);
            }
-         }
+           
+           V3_FreePages(V3_PAddr(pde), 1);
        }
-      }
+
+       V3_FreePages(V3_PAddr(pdpe), 1);
     }
-  default:
-    return -1;
-  }
 
-  // should never get here
-  return -1;
+    V3_FreePages(V3_PAddr(pml4), 1);
 }
 
 
 
-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;
-}
 
+static int translate_pt_32_cb(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data) {
+    addr_t * paddr = (addr_t *)private_data;
 
-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;
+    switch (type) {
+       case PAGE_PD32:
+       case PAGE_PT32:
+           return 0;
+       case PAGE_4MB:
+           *paddr = page_pa + PAGE_OFFSET_4MB(vaddr);
+           return 0;
+       case PAGE_4KB:
+           *paddr = page_pa + PAGE_OFFSET_4KB(vaddr);
+           return 0;
+       default: 
+           PrintError(info->vm_info, info, "Inavlid page type (%s) in tranlate pt 32 callback\n", v3_page_type_to_str(type));
+           return -1;
     }
-  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;
-      }
+static int translate_pt_32pae_cb(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data) {
+    addr_t * paddr = (addr_t *)private_data;
+  
+    switch (type) {
+       case PAGE_PDP32PAE:
+       case PAGE_PD32PAE:
+       case PAGE_PT32PAE:
+           return 0;
+       case PAGE_2MB:
+           *paddr = page_pa + PAGE_OFFSET_2MB(vaddr);
+           return 0;
+       case PAGE_4KB:
+           *paddr = page_pa + PAGE_OFFSET_4KB(vaddr);
+           return 0;
+       default:
+           PrintError(info->vm_info, info, "Inavlid page type (%s) in translate pt 32pae callback\n", v3_page_type_to_str(type));
+           return -1;
     }
-  default:
-    return -1;
-  }
-
-  // should never get here
-  return -1;
 }
 
+static int translate_pt_64_cb(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data) {
+    addr_t * paddr = (addr_t *)private_data;
 
+    switch (type) {
+       case PAGE_PML464:
+       case PAGE_PDP64:
+       case PAGE_PD64:
+       case PAGE_PT64:
+           return 0;
+       case PAGE_1GB:
+           *paddr = page_pa + PAGE_OFFSET_1GB(vaddr);
+           return 0;
+       case PAGE_2MB:
+           *paddr = page_pa + PAGE_OFFSET_2MB(vaddr);
+           return 0;
+       case PAGE_4KB:
+           *paddr = page_pa + PAGE_OFFSET_4KB(vaddr);
+           return 0;
+       default:
+           PrintError(info->vm_info, info, "Inavlid page type (%s) in translate pt 64 callback\n", v3_page_type_to_str(type));
+           return -1;
+    }
+}
 
 
+int v3_translate_host_pt_32(struct guest_info * info, v3_reg_t host_cr3, addr_t vaddr, addr_t * paddr) {
+    return v3_drill_host_pt_32(info, host_cr3, vaddr, translate_pt_32_cb, paddr);
+}
+int v3_translate_guest_pt_32(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, addr_t * paddr) {
+    return v3_drill_guest_pt_32(info, guest_cr3, vaddr, translate_pt_32_cb, paddr);
+}
 
-/*
- * 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
- */
 
-/**
- * 
- *  32 bit Page Table lookup functions
- *
- **/
+int v3_translate_host_pt_32pae(struct guest_info * info, v3_reg_t host_cr3, addr_t vaddr, addr_t * paddr) {
+    return v3_drill_host_pt_32pae(info, host_cr3, vaddr, translate_pt_32pae_cb, paddr);
+}
+int v3_translate_guest_pt_32pae(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, addr_t * paddr) {
+    return v3_drill_guest_pt_32pae(info, guest_cr3, vaddr, translate_pt_32pae_cb, paddr);
+}
 
-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 PT_ENTRY_NOT_PRESENT;
-  } else if (pde_entry->large_page) {
-    pde32_4MB_t * large_pde = (pde32_4MB_t *)pde_entry;
+int v3_translate_host_pt_64(struct guest_info * info, v3_reg_t host_cr3, addr_t vaddr, addr_t * paddr) {
+    return v3_drill_host_pt_64(info, host_cr3, vaddr, translate_pt_64_cb, paddr);
+}
+int v3_translate_guest_pt_64(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, addr_t * paddr) {
+    return v3_drill_guest_pt_64(info, guest_cr3, vaddr, translate_pt_64_cb, paddr);
+}
 
-    *entry = BASE_TO_PAGE_ADDR_4MB(large_pde->page_base_addr);
-    *entry += PAGE_OFFSET_4MB(addr);
 
-    return PT_ENTRY_LARGE_PAGE;
-  } else {
-    *entry = BASE_TO_PAGE_ADDR(pde_entry->pt_base_addr);
-    return PT_ENTRY_PAGE;
-  }
-}
 
+struct pt_find_data {
+    page_type_t type;
+    addr_t * pt_page_ptr;
+    addr_t * pt_page_pa;
+};
 
+static int find_pt_cb(struct guest_info * info, page_type_t type, addr_t vaddr, 
+                     addr_t page_ptr, addr_t page_pa, void * private_data) {
+    struct pt_find_data * pt_data = (struct pt_find_data *)private_data;
 
-/* Takes a virtual addr (addr) and returns the physical addr (entry) as defined in the page table
- */
-pt_entry_type_t pte32_lookup(pte32_t * pt, addr_t addr, addr_t * entry) {
-  pte32_t * pte_entry = &(pt[PTE32_INDEX(addr)]);
+    PrintDebug(info->vm_info, info, "FIND_PT Type=%s, page_pa = %p\n",              
+              v3_page_type_to_str(type),
+              (void *)page_pa);
 
-  if (!pte_entry->present) {
-    *entry = 0;
-    //    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;
-  }
+    if (type == pt_data->type) {
+       *(pt_data->pt_page_ptr) = page_ptr;
+       *(pt_data->pt_page_pa) = page_pa;
+       return 1;
+    }
 
+    return 0;
 }
 
 
+int v3_find_host_pt_32_page(struct guest_info * info, v3_reg_t host_cr3, page_type_t type, addr_t vaddr, 
+                           addr_t * page_ptr, addr_t * page_pa) {
+    struct pt_find_data data;
 
-/**
- * 
- *  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)]);
+    data.type = type;
+    data.pt_page_ptr = page_ptr;
+    data.pt_page_pa = page_pa;
   
-  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;
-  }
+    return v3_drill_host_pt_32(info, host_cr3, vaddr, find_pt_cb, &data);
 }
 
-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;
+int v3_find_host_pt_32pae_page(struct guest_info * info, v3_reg_t host_cr3, page_type_t type, addr_t vaddr, 
+                              addr_t * page_ptr, addr_t * page_pa) {
+    struct pt_find_data data;
 
-    *entry = BASE_TO_PAGE_ADDR_2MB(large_pde->page_base_addr);
-    *entry += PAGE_OFFSET_2MB(addr);
+    data.type = type;
+    data.pt_page_ptr = page_ptr;
+    data.pt_page_pa = page_pa;  
 
-    return PT_ENTRY_LARGE_PAGE;
-  } else {
-    *entry = BASE_TO_PAGE_ADDR(pde_entry->pt_base_addr);
-    return PT_ENTRY_PAGE;
-  }
+    return v3_drill_host_pt_32pae(info, host_cr3, vaddr, find_pt_cb, &data);
 }
 
-pt_entry_type_t pte32pae_lookup(pte32pae_t * pt, addr_t addr, addr_t * entry) {
-  pte32pae_t * pte_entry = &(pt[PTE32PAE_INDEX(addr)]);
+int v3_find_host_pt_64_page(struct guest_info * info, v3_reg_t host_cr3, page_type_t type, addr_t vaddr, 
+                           addr_t * page_ptr, addr_t * page_pa) {
+    struct pt_find_data data;
 
-  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)]);
+    data.type = type;
+    data.pt_page_ptr = page_ptr;
+    data.pt_page_pa = page_pa;
 
-  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;
-  }
+    return v3_drill_host_pt_64(info, host_cr3, vaddr, find_pt_cb, &data);
 }
+int v3_find_guest_pt_32_page(struct guest_info * info, v3_reg_t guest_cr3, page_type_t type, addr_t vaddr, 
+                            addr_t * page_ptr, addr_t * page_pa) {
+    struct pt_find_data data;
 
-pt_entry_type_t pdpe64_lookup(pdpe64_t * pdp, addr_t addr, addr_t * entry) {
-  pdpe64_t * pdpe_entry = &(pdp[PDPE64_INDEX(addr)]);
+    data.type = type;
+    data.pt_page_ptr = page_ptr;
+    data.pt_page_pa = page_pa;
   
-  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 = BASE_TO_PAGE_ADDR(pdpe_entry->pd_base_addr);
-    return PT_ENTRY_PAGE;
-  }
+    return v3_drill_guest_pt_32(info, guest_cr3, vaddr, find_pt_cb, &data);
 }
 
-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);
+int v3_find_guest_pt_32pae_page(struct guest_info * info, v3_reg_t guest_cr3, page_type_t type, addr_t vaddr, 
+                               addr_t * page_ptr, addr_t * page_pa) {
+    struct pt_find_data data;
 
-    return PT_ENTRY_LARGE_PAGE;
-  } else {
-    *entry = BASE_TO_PAGE_ADDR(pde_entry->pt_base_addr);
-    return PT_ENTRY_PAGE;
-  }
+    data.type = type;
+    data.pt_page_ptr = page_ptr;
+    data.pt_page_pa = page_pa;
+  
+    return v3_drill_guest_pt_32pae(info, guest_cr3, vaddr, find_pt_cb, &data);
 }
 
-pt_entry_type_t pte64_lookup(pte64_t * pt, addr_t addr, addr_t * entry) {
-  pte64_t * pte_entry = &(pt[PTE64_INDEX(addr)]);
+int v3_find_guest_pt_64_page(struct guest_info * info, v3_reg_t guest_cr3, page_type_t type, addr_t vaddr, 
+                            addr_t * page_ptr, addr_t * page_pa) {
+    struct pt_find_data data;
 
-  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;
-  }
+    data.type = type;
+    data.pt_page_ptr = page_ptr;
+    data.pt_page_pa = page_pa;
+  
+    return v3_drill_guest_pt_64(info, guest_cr3, vaddr, find_pt_cb, &data);
 }
 
 
-
-
-
-
-
-
 /* 
  *
  * Page Table Access Checks
@@ -530,406 +334,383 @@ pt_entry_type_t pte64_lookup(pte64_t * pt, addr_t addr, addr_t * entry) {
  */
 
 
+struct pt_check_data {
+    pf_error_t access_type;
+    pt_access_status_t * access_status;
+};
 
+static int check_pt_32_cb(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data) {
+    struct pt_check_data * chk_data = (struct pt_check_data *)private_data;
 
+    switch (type) {
+       case PAGE_PD32:
+           *(chk_data->access_status) = v3_can_access_pde32((pde32_t *)page_ptr, vaddr, chk_data->access_type);
+           break;
+       case PAGE_PT32:
+           *(chk_data->access_status) = v3_can_access_pte32((pte32_t *)page_ptr, vaddr, chk_data->access_type);
+           break;
+       case PAGE_4MB:
+       case PAGE_4KB:
+           return 0;
+       default: 
+           PrintError(info->vm_info, info, "Inavlid page type (%s) in check pt 32 callback\n", v3_page_type_to_str(type));
+           return -1;
+    }
 
+    if (*(chk_data->access_status) != PT_ACCESS_OK) {
+       return 1;
+    }
 
-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;
+    return 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;
-  } 
+static int check_pt_32pae_cb(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data) {
+    struct pt_check_data * chk_data = (struct pt_check_data *)private_data;
+
+    switch (type) {
+       case PAGE_PDP32PAE:
+           *(chk_data->access_status) = v3_can_access_pdpe32pae((pdpe32pae_t *)page_ptr, vaddr, chk_data->access_type);
+           break;
+       case PAGE_PD32PAE:
+           *(chk_data->access_status) = v3_can_access_pde32pae((pde32pae_t *)page_ptr, vaddr, chk_data->access_type);
+           break;
+       case PAGE_PT32PAE:
+           *(chk_data->access_status) = v3_can_access_pte32pae((pte32pae_t *)page_ptr, vaddr, chk_data->access_type);
+           break;
+       case PAGE_2MB:
+       case PAGE_4KB:
+           return 0;
+       default: 
+           PrintError(info->vm_info, info, "Inavlid page type (%s) in check pt 32pae callback\n", v3_page_type_to_str(type));
+           return -1;
+    }
+
+    if (*(chk_data->access_status) != PT_ACCESS_OK) {
+       return 1;
+    }
 
-  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;
+}
+
+
+static int check_pt_64_cb(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data) {
+    struct pt_check_data * chk_data = (struct pt_check_data *)private_data;
+
+    switch (type) {
+       case PAGE_PML464:
+           *(chk_data->access_status) = v3_can_access_pml4e64((pml4e64_t *)page_ptr, vaddr, chk_data->access_type);
+           break;
+       case PAGE_PDP64:
+           *(chk_data->access_status) = v3_can_access_pdpe64((pdpe64_t *)page_ptr, vaddr, chk_data->access_type);
+           break;
+       case PAGE_PD64:
+           *(chk_data->access_status) = v3_can_access_pde64((pde64_t *)page_ptr, vaddr, chk_data->access_type);
+           break;
+       case PAGE_PT64:
+           *(chk_data->access_status) = v3_can_access_pte64((pte64_t *)page_ptr, vaddr, chk_data->access_type);
+           break;
+       case PAGE_1GB:
+       case PAGE_2MB:
+       case PAGE_4KB:
+           return 0;
+       default: 
+           PrintError(info->vm_info, info, "Inavlid page type (%s) in check pt 64 callback\n", v3_page_type_to_str(type));
+           return -1;
+    }
+
+    if (*(chk_data->access_status) != PT_ACCESS_OK) {
+       return 1;
     }
 
     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;
-  }
+int v3_check_host_pt_32(struct guest_info * info, v3_reg_t host_cr3, addr_t vaddr, pf_error_t access_type, pt_access_status_t * access_status) {
+    struct pt_check_data access_data;
 
-  pt_level--;
+    access_data.access_type = access_type;
+    access_data.access_status = access_status;
 
-  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);
+    return v3_drill_host_pt_32(info, host_cr3, vaddr, check_pt_32_cb, &access_data);
+}
 
-    if (*access_status != PT_ACCESS_OK) {
-      return pt_level;
-    }
+int v3_check_host_pt_32pae(struct guest_info * info, v3_reg_t host_cr3, addr_t vaddr, pf_error_t access_type, pt_access_status_t * access_status) {
+    struct pt_check_data access_data;
 
-    pt_level--;
+    access_data.access_type = access_type;
+    access_data.access_status = access_status;
 
-    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);
+    return v3_drill_host_pt_32pae(info, host_cr3, vaddr, check_pt_32pae_cb, &access_data);
+}
 
-      if (*access_status != PT_ACCESS_OK) {
-       return pt_level;
-      }
 
-      return 0;
-    default:
-      return -1;
-    }
-  default:
-    return -1;
-  }
 
-  // should never get here
-  return -1;
+int v3_check_host_pt_64(struct guest_info * info, v3_reg_t host_cr3, addr_t vaddr, pf_error_t access_type, pt_access_status_t * access_status) {
+    struct pt_check_data access_data;
+
+    access_data.access_type = access_type;
+    access_data.access_status = access_status;
+
+    return v3_drill_host_pt_64(info, host_cr3, vaddr, check_pt_64_cb, &access_data);
 }
 
 
 
-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;
+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) {
+    struct pt_check_data access_data;
 
+    access_data.access_type = access_type;
+    access_data.access_status = access_status;
 
-  *access_status = v3_can_access_pml4e64(host_pmle, vaddr, access_type);
+    return v3_drill_guest_pt_32(info, guest_cr3, vaddr, check_pt_32_cb, &access_data);
+}
 
-  if (*access_status != PT_ACCESS_OK) {
-    return pt_level;
-  }
 
-  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--;
+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) {
+    struct pt_check_data access_data;
 
-    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);
+    access_data.access_type = access_type;
+    access_data.access_status = access_status;
 
-      if (*access_status != PT_ACCESS_OK) {
-       return pt_level;
-      }
+    return v3_drill_guest_pt_32pae(info, guest_cr3, vaddr, check_pt_32pae_cb, &access_data);
+}
 
-      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;
-       }
+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) {
+    struct pt_check_data access_data;
 
-       return 0;
-      default:
-       return -1;
-      }
-    default:
-      return -1;
-    }
-  default:
-    return -1;
-  }
+    access_data.access_type = access_type;
+    access_data.access_status = access_status;
 
-  // should never get here
-  return -1;
+    return v3_drill_guest_pt_64(info, guest_cr3, vaddr, check_pt_64_cb, &access_data);
 }
 
 
+static int get_data_page_type_cb(struct guest_info * info, page_type_t type, 
+                                addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data) {
+    switch (type) {
+       case PAGE_4KB:
+       case PAGE_2MB:
+       case PAGE_4MB:
+       case PAGE_1GB:
+           return 1;
+       default:
+           return 0;
+    }
+}
 
 
 
-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;
-  }
-  
+page_type_t v3_get_guest_data_page_type_32(struct guest_info * info, v3_reg_t cr3, addr_t vaddr) {
+    return v3_drill_guest_pt_32(info, cr3, vaddr, get_data_page_type_cb, NULL);
+}
+page_type_t v3_get_guest_data_page_type_32pae(struct guest_info * info, v3_reg_t cr3, addr_t vaddr) {
+    return v3_drill_guest_pt_32pae(info, cr3, vaddr, get_data_page_type_cb, NULL);
+}
+page_type_t v3_get_guest_data_page_type_64(struct guest_info * info, v3_reg_t cr3, addr_t vaddr) {
+    return v3_drill_guest_pt_64(info, cr3, vaddr, get_data_page_type_cb, NULL);
+}
+page_type_t v3_get_host_data_page_type_32(struct guest_info * info, v3_reg_t cr3, addr_t vaddr) {
+    return v3_drill_host_pt_32(info, cr3, vaddr, get_data_page_type_cb, NULL);
+}
+page_type_t v3_get_host_data_page_type_32pae(struct guest_info * info, v3_reg_t cr3, addr_t vaddr) {
+    return v3_drill_host_pt_32pae(info, cr3, vaddr, get_data_page_type_cb, NULL);
+}
+page_type_t v3_get_host_data_page_type_64(struct guest_info * info, v3_reg_t cr3, addr_t vaddr) {
+    return v3_drill_host_pt_64(info, cr3, vaddr, get_data_page_type_cb, NULL);
+}
 
-  // 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;
+/*
+ * PAGE TABLE LOOKUP FUNCTIONS
+ *
+ * The value of entry is a return type:
+ * Page not present: *entry = 0
+ */
 
-      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;
-      }
+/**
+ * 
+ *  32 bit Page Table lookup functions
+ *
+ **/
 
-      *access_status = v3_can_access_pte32(guest_pte, vaddr, access_type);
-      
-      if (*access_status != PT_ACCESS_OK) {
-       return pt_level;
-      }
-      return 0;
+static 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 PT_ENTRY_NOT_PRESENT;
+    } else 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);
+
+       return PT_ENTRY_LARGE_PAGE;
+    } else {
+       *entry = BASE_TO_PAGE_ADDR(pde_entry->pt_base_addr);
+       return PT_ENTRY_PAGE;
     }
-  default: 
-    return -1;
-  }
-  
-  // should never get here
-  return -1;
 }
 
 
 
+/* Takes a virtual addr (addr) and returns the physical addr (entry) as defined in the page table
+ */
+static 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(VM_NONE, VCORE_NONE, "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);
 
-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;
-  }
+       return PT_ENTRY_PAGE;
+    }
 
-  *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;
+/**
+ * 
+ *  32 bit PAE Page Table lookup functions
+ *
+ **/
+static 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;
+    }
+}
 
-         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;
-         }
+static pt_entry_type_t pde32pae_lookup(pde32pae_t * pd, addr_t addr, addr_t * entry) {
+    pde32pae_t * pde_entry = &(pd[PDE32PAE_INDEX(addr)]);
 
-         *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;
-      }
+    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);
+
+       return PT_ENTRY_LARGE_PAGE;
+    } else {
+       *entry = BASE_TO_PAGE_ADDR(pde_entry->pt_base_addr);
+       return PT_ENTRY_PAGE;
     }
-  default:
-    return -1;
-  }
+}
 
-  // should never get here
-  return -1;
+static 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);
+       return PT_ENTRY_PAGE;
+    }
 }
 
 
-  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;
-  }
+/**
+ * 
+ *  64 bit Page Table lookup functions
+ *
+ **/
+static pt_entry_type_t pml4e64_lookup(pml4e64_t * pml, addr_t addr, addr_t * entry) {
+    pml4e64_t * pml_entry = &(pml[PML4E64_INDEX(addr)]);
 
-  *access_status = v3_can_access_pml4e64(guest_pmle, vaddr, access_type);
+    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;
+    }
+}
 
-  if (*access_status != PT_ACCESS_OK) {
-    return pt_level;
-  }
+static 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) {
+       pdpe64_1GB_t * large_pdp = (pdpe64_1GB_t *)pdpe_entry;
 
-  pt_level--;
+       *entry = BASE_TO_PAGE_ADDR_1GB(large_pdp->page_base_addr);
 
-  switch(pml4e64_lookup(guest_pmle, vaddr, &guest_pdpe_pa)) {
-  case PT_ENTRY_PAGE:
-    {
-      pdpe64_t * guest_pdp = NULL;
-      addr_t guest_pde_pa = 0;
+       return PT_ENTRY_LARGE_PAGE;
+    } else {
+       *entry = BASE_TO_PAGE_ADDR(pdpe_entry->pd_base_addr);
+       return PT_ENTRY_PAGE;
+    }
+}
 
-      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;
-      }
+static pt_entry_type_t pde64_lookup(pde64_t * pd, addr_t addr, addr_t * entry) {
+    pde64_t * pde_entry = &(pd[PDE64_INDEX(addr)]);
 
-      *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;
-         }
+    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;
 
-         *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;
-             }
+       *entry = BASE_TO_PAGE_ADDR_2MB(large_pde->page_base_addr);
 
-             *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;
-      }
+       return PT_ENTRY_LARGE_PAGE;
+    } else {
+       *entry = BASE_TO_PAGE_ADDR(pde_entry->pt_base_addr);
+       return PT_ENTRY_PAGE;
     }
-  default:
-    return -1;
-  }
-
-  // should never get here
-  return -1;
 }
 
+static 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);
+       return PT_ENTRY_PAGE;
+    }
+}
 
 
 
 
 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_ACCESS_USER_ERROR;
-  }
+    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_ACCESS_USER_ERROR;
+    }
 
-  return PT_ACCESS_OK;
+    return PT_ACCESS_OK;
 }
 
 
@@ -938,13 +719,13 @@ static pt_access_status_t can_access_pt_entry(gen_pt_t * pt, pf_error_t access_t
  *   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);
+    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);
+    gen_pt_t * entry = (gen_pt_t *)&pte[PTE32_INDEX(addr)];
+    return can_access_pt_entry(entry, access_type);
 }
 
 
@@ -952,41 +733,41 @@ pt_access_status_t inline v3_can_access_pte32(pte32_t * pte, addr_t addr, pf_err
  *  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);
+    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);
+    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);
+    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);
+    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);
+    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);
+    gen_pt_t * entry = (gen_pt_t *)&pde[PDE64_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);
+    gen_pt_t * entry = (gen_pt_t *)&pte[PTE64_INDEX(addr)];
+    return can_access_pt_entry(entry, access_type);
 }
 
 
@@ -994,844 +775,1035 @@ pt_access_status_t inline v3_can_access_pte64(pte64_t * pte, addr_t addr, pf_err
 
 
 
+int v3_drill_host_pt_32(struct guest_info * info, v3_reg_t host_cr3, addr_t vaddr, 
+                       int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data),
+                       void * private_data) {
+    pde32_t * host_pde = (pde32_t *)CR3_TO_PDE32_VA(host_cr3);
+    addr_t host_pde_pa = CR3_TO_PDE32_PA(host_cr3);
+    addr_t host_pte_pa = 0;
+    addr_t page_pa = 0;
+    int ret;
+
+    if ((ret = callback(info, PAGE_PD32, vaddr, (addr_t)host_pde, host_pde_pa, private_data)) != 0) {
+       return (ret == -1) ? -1 : PAGE_PD32;
+    }
 
+    switch (pde32_lookup(host_pde, vaddr, &host_pte_pa)) {
+       case PT_ENTRY_NOT_PRESENT:
+           return -1;
+       case PT_ENTRY_LARGE_PAGE:
+           if ((ret == callback(info, PAGE_4MB, vaddr, (addr_t)V3_VAddr((void *)host_pte_pa), host_pte_pa, private_data)) != 0) {
+               return (ret == -1) ? -1 : PAGE_4MB;
+           }
+           return 0;
+       case PT_ENTRY_PAGE:
+           if ((ret = callback(info, PAGE_PT32, vaddr, (addr_t)V3_VAddr((void *)host_pte_pa), host_pte_pa, private_data)) != 0) {
+               return (ret == -1) ? -1 : PAGE_PT32;
+           }
+    
+           if (pte32_lookup(V3_VAddr((void *)host_pte_pa), vaddr, &page_pa) == PT_ENTRY_NOT_PRESENT) {
+               return -1;
+           } else {
+               if ((ret = callback(info, PAGE_4KB, vaddr, (addr_t)V3_VAddr((void *)PAGE_BASE_ADDR(page_pa)), page_pa, private_data)) != 0) {
+                   return (ret == -1) ? -1 : PAGE_4KB;
+               }
+               return 0;
+           }
+    }
+    return -1;
+}
 
 
 
-/* We generate a page table to correspond to a given memory layout
- * pulling pages from the mem_list when necessary
- * If there are any gaps in the layout, we add them as unmapped pages
- */
-pde32_t * create_passthrough_pts_32(struct guest_info * guest_info) {
-  addr_t current_page_addr = 0;
-  int i, j;
-  struct shadow_map * map = &(guest_info->mem_map);
-
-  pde32_t * pde = V3_VAddr(V3_AllocPages(1));
-
-  for (i = 0; i < MAX_PDE32_ENTRIES; i++) {
-    int pte_present = 0;
-    pte32_t * pte = V3_VAddr(V3_AllocPages(1));
-    
+int v3_drill_host_pt_32pae(struct guest_info * info, v3_reg_t host_cr3, addr_t vaddr,
+                          int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data),
+                          void * private_data) {
+    pdpe32pae_t * host_pdpe = (pdpe32pae_t *)CR3_TO_PDPE32PAE_VA(host_cr3);
+    addr_t host_pdpe_pa = CR3_TO_PDPE32PAE_PA(host_cr3);
+    addr_t host_pde_pa = 0;
+    addr_t host_pte_pa = 0;
+    addr_t page_pa = 0;
+    int ret;
+
+    if ((ret = callback(info, PAGE_PDP32PAE, vaddr, (addr_t)host_pdpe, host_pdpe_pa, private_data)) != 0) {
+       return (ret == -1) ? -1 : PAGE_PDP32PAE;
+    }
 
-    for (j = 0; j < MAX_PTE32_ENTRIES; j++) {
-      struct shadow_region * region = get_shadow_region_by_addr(map, current_page_addr);
-
-      if (!region || 
-         (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) ||
-         (region->host_type == HOST_REGION_SWAPPED)) {
-       pte[j].present = 0;
-       pte[j].writable = 0;
-       pte[j].user_page = 0;
-       pte[j].write_through = 0;
-       pte[j].cache_disable = 0;
-       pte[j].accessed = 0;
-       pte[j].dirty = 0;
-       pte[j].pte_attr = 0;
-       pte[j].global_page = 0;
-       pte[j].vmm_info = 0;
-       pte[j].page_base_addr = 0;
-      } else {
-       addr_t host_addr;
-       pte[j].present = 1;
-       pte[j].writable = 1;
-       pte[j].user_page = 1;
-       pte[j].write_through = 0;
-       pte[j].cache_disable = 0;
-       pte[j].accessed = 0;
-       pte[j].dirty = 0;
-       pte[j].pte_attr = 0;
-       pte[j].global_page = 0;
-       pte[j].vmm_info = 0;
-
-       if (guest_pa_to_host_pa(guest_info, current_page_addr, &host_addr) == -1) {
-         // BIG ERROR
-         // PANIC
-         return NULL;
-       }
-       
-       pte[j].page_base_addr = host_addr >> 12;
-       
-       pte_present = 1;
-      }
+    switch (pdpe32pae_lookup(host_pdpe, vaddr, &host_pde_pa)) {
+       case PT_ENTRY_NOT_PRESENT:
+           return -1;
+       case PT_ENTRY_PAGE:
 
-      current_page_addr += PAGE_SIZE;
-    }
+           if ((ret = callback(info, PAGE_PD32PAE, vaddr, (addr_t)V3_VAddr((void *)host_pde_pa), host_pde_pa, private_data)) != 0) {
+               return (ret == -1) ? -1 : PAGE_PD32PAE;
+           }
+      
+           switch (pde32pae_lookup(V3_VAddr((void *)host_pde_pa), vaddr, &host_pte_pa)) {
+               case PT_ENTRY_NOT_PRESENT:
+                   return -1;
+               case PT_ENTRY_LARGE_PAGE:
+                   if ((ret == callback(info, PAGE_2MB, vaddr, (addr_t)V3_VAddr((void *)host_pte_pa), host_pte_pa, private_data)) != 0) {
+                       return (ret == -1) ? -1 : PAGE_2MB;
+                   }
+                   return 0;
+               case PT_ENTRY_PAGE:
+                   if ((ret = callback(info, PAGE_PT32PAE, vaddr, (addr_t)V3_VAddr((void *)host_pte_pa), host_pte_pa, private_data)) != 0) {
+                       return (ret == -1) ? -1 : PAGE_PT32PAE;
+                   }
 
-    if (pte_present == 0) { 
-      V3_FreePage(V3_PAddr(pte));
-
-      pde[i].present = 0;
-      pde[i].writable = 0;
-      pde[i].user_page = 0;
-      pde[i].write_through = 0;
-      pde[i].cache_disable = 0;
-      pde[i].accessed = 0;
-      pde[i].reserved = 0;
-      pde[i].large_page = 0;
-      pde[i].global_page = 0;
-      pde[i].vmm_info = 0;
-      pde[i].pt_base_addr = 0;
-    } else {
-      pde[i].present = 1;
-      pde[i].writable = 1;
-      pde[i].user_page = 1;
-      pde[i].write_through = 0;
-      pde[i].cache_disable = 0;
-      pde[i].accessed = 0;
-      pde[i].reserved = 0;
-      pde[i].large_page = 0;
-      pde[i].global_page = 0;
-      pde[i].vmm_info = 0;
-      pde[i].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte));
+                   if (pte32pae_lookup(V3_VAddr((void *)host_pte_pa), vaddr, &page_pa) == PT_ENTRY_NOT_PRESENT) {
+                       return -1;
+                   } else {
+                       if ((ret = callback(info, PAGE_4KB, vaddr, (addr_t)V3_VAddr((void *)PAGE_BASE_ADDR(page_pa)), page_pa, private_data)) != 0) {
+                           return (ret == -1) ? -1 : PAGE_4KB;
+                       }
+                       return 0;
+                   } 
+           }
+       default:
+           return -1;
     }
 
-  }
-
-  return pde;
+    // should never get here
+    return -1;
 }
 
 
-/* We generate a page table to correspond to a given memory layout
- * pulling pages from the mem_list when necessary
- * If there are any gaps in the layout, we add them as unmapped pages
- */
-pdpe32pae_t * create_passthrough_pts_32PAE(struct guest_info * guest_info) {
-  addr_t current_page_addr = 0;
-  int i, j, k;
-  struct shadow_map * map = &(guest_info->mem_map);
-
-  pdpe32pae_t * pdpe = V3_VAddr(V3_AllocPages(1));
-  memset(pdpe, 0, PAGE_SIZE);
+int v3_drill_host_pt_64(struct guest_info * info, v3_reg_t host_cr3, addr_t vaddr,
+                       int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data),
+                       void * private_data) {
+    pml4e64_t * host_pmle = (pml4e64_t *)CR3_TO_PML4E64_VA(host_cr3);
+    addr_t host_pmle_pa = CR3_TO_PML4E64_PA(host_cr3);
+    addr_t host_pdpe_pa = 0;
+    addr_t host_pde_pa = 0;
+    addr_t host_pte_pa = 0;
+    addr_t page_pa = 0;
+    int ret;
+
+    if ((ret = callback(info, PAGE_PML464, vaddr, (addr_t)host_pmle, host_pmle_pa, private_data)) != 0) {
+       return (ret == -1) ? -1 : PAGE_PML464;
+    }
 
-  for (i = 0; i < MAX_PDPE32PAE_ENTRIES; i++) {
-    int pde_present = 0;
-    pde32pae_t * pde = V3_VAddr(V3_AllocPages(1));
+    switch(pml4e64_lookup(host_pmle, vaddr, &host_pdpe_pa)) {
+       case PT_ENTRY_NOT_PRESENT:
+           return -1;
+       case PT_ENTRY_PAGE:
 
-    for (j = 0; j < MAX_PDE32PAE_ENTRIES; j++) {
+           if ((ret = callback(info, PAGE_PDP64, vaddr, (addr_t)V3_VAddr((void *)host_pdpe_pa), host_pdpe_pa, private_data)) != 0) {
+               return (ret == -1) ? -1 : PAGE_PDP64;
+           }
 
+           switch(pdpe64_lookup(V3_VAddr((void *)host_pdpe_pa), vaddr, &host_pde_pa)) {
+               case PT_ENTRY_NOT_PRESENT:
+                   return -1;
+               case PT_ENTRY_LARGE_PAGE:
+                   if ((ret == callback(info, PAGE_1GB, vaddr, (addr_t)V3_VAddr((void *)host_pde_pa), host_pde_pa, private_data)) != 0) {
+                       return (ret == -1) ? -1 : PAGE_1GB;
+                   }
+                   PrintError(info->vm_info, info, "1 Gigabyte Pages not supported\n");
+                   return 0;
+               case PT_ENTRY_PAGE:
 
-      int pte_present = 0;
-      pte32pae_t * pte = V3_VAddr(V3_AllocPages(1));
-      
-      
-      for (k = 0; k < MAX_PTE32PAE_ENTRIES; k++) {
-       struct shadow_region * region = get_shadow_region_by_addr(map, current_page_addr);
-       
-       if (!region || 
-           (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) ||
-           (region->host_type == HOST_REGION_SWAPPED)) {
-         pte[k].present = 0;
-         pte[k].writable = 0;
-         pte[k].user_page = 0;
-         pte[k].write_through = 0;
-         pte[k].cache_disable = 0;
-         pte[k].accessed = 0;
-         pte[k].dirty = 0;
-         pte[k].pte_attr = 0;
-         pte[k].global_page = 0;
-         pte[k].vmm_info = 0;
-         pte[k].page_base_addr = 0;
-         pte[k].rsvd = 0;
-       } else {
-         addr_t host_addr;
-         pte[k].present = 1;
-         pte[k].writable = 1;
-         pte[k].user_page = 1;
-         pte[k].write_through = 0;
-         pte[k].cache_disable = 0;
-         pte[k].accessed = 0;
-         pte[k].dirty = 0;
-         pte[k].pte_attr = 0;
-         pte[k].global_page = 0;
-         pte[k].vmm_info = 0;
-         
-         if (guest_pa_to_host_pa(guest_info, current_page_addr, &host_addr) == -1) {
-           // BIG ERROR
-           // PANIC
-           return NULL;
-         }
-         
-         pte[k].page_base_addr = host_addr >> 12;
-         pte[k].rsvd = 0;
+                   if ((ret = callback(info, PAGE_PD64, vaddr, (addr_t)V3_VAddr((void *)host_pde_pa), host_pde_pa, private_data)) != 0) {
+                       return (ret == -1) ? -1 : PAGE_PD64;
+                   }
 
-         pte_present = 1;
-       }
-       
-       current_page_addr += PAGE_SIZE;
-      }
-      
-      if (pte_present == 0) { 
-       V3_FreePage(V3_PAddr(pte));
-       
-       pde[j].present = 0;
-       pde[j].writable = 0;
-       pde[j].user_page = 0;
-       pde[j].write_through = 0;
-       pde[j].cache_disable = 0;
-       pde[j].accessed = 0;
-       pde[j].avail = 0;
-       pde[j].large_page = 0;
-       pde[j].global_page = 0;
-       pde[j].vmm_info = 0;
-       pde[j].pt_base_addr = 0;
-       pde[j].rsvd = 0;
-      } else {
-       pde[j].present = 1;
-       pde[j].writable = 1;
-       pde[j].user_page = 1;
-       pde[j].write_through = 0;
-       pde[j].cache_disable = 0;
-       pde[j].accessed = 0;
-       pde[j].avail = 0;
-       pde[j].large_page = 0;
-       pde[j].global_page = 0;
-       pde[j].vmm_info = 0;
-       pde[j].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte));
-       pde[j].rsvd = 0;
-
-       pde_present = 1;
-      }
-      
-    }
-    
-    if (pde_present == 0) { 
-      V3_FreePage(V3_PAddr(pde));
-      
-      pdpe[i].present = 0;
-      pdpe[i].rsvd = 0;
-      pdpe[i].write_through = 0;
-      pdpe[i].cache_disable = 0;
-      pdpe[i].accessed = 0;
-      pdpe[i].avail = 0;
-      pdpe[i].rsvd2 = 0;
-      pdpe[i].vmm_info = 0;
-      pdpe[i].pd_base_addr = 0;
-      pdpe[i].rsvd3 = 0;
-    } else {
-      pdpe[i].present = 1;
-      pdpe[i].rsvd = 0;
-      pdpe[i].write_through = 0;
-      pdpe[i].cache_disable = 0;
-      pdpe[i].accessed = 0;
-      pdpe[i].avail = 0;
-      pdpe[i].rsvd2 = 0;
-      pdpe[i].vmm_info = 0;
-      pdpe[i].pd_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pde));
-      pdpe[i].rsvd3 = 0;
+                   switch (pde64_lookup(V3_VAddr((void *)host_pde_pa), vaddr, &host_pte_pa)) {
+                       case PT_ENTRY_NOT_PRESENT:
+                           return -1;
+                       case PT_ENTRY_LARGE_PAGE:
+                           if ((ret == callback(info, PAGE_2MB, vaddr, (addr_t)V3_VAddr((void *)host_pte_pa), host_pte_pa, private_data)) != 0) {
+                               return (ret == -1) ? -1 : PAGE_2MB;
+                           }
+                           return 0;
+                       case PT_ENTRY_PAGE:
+
+                           if ((ret = callback(info, PAGE_PT64, vaddr, (addr_t)V3_VAddr((void *)host_pte_pa), host_pte_pa, private_data)) != 0) {
+                               return (ret == -1) ? -1 : PAGE_PT64;
+                           }
+
+                           if (pte64_lookup(V3_VAddr((void *)host_pte_pa), vaddr, &page_pa) == PT_ENTRY_NOT_PRESENT) {
+                               return -1;
+                           } else {
+                               if ((ret = callback(info, PAGE_4KB, vaddr, (addr_t)V3_VAddr((void *)PAGE_BASE_ADDR(page_pa)), page_pa, private_data)) != 0) {
+                                   return (ret == -1) ? -1 : PAGE_4KB;
+                               }
+                               return 0;
+                           }
+                   }
+           }
+       default:
+           return -1;
     }
-    
-  }
+    // should never get here
+    return -1;
+}
 
 
-  return pdpe;
-}
 
 
 
 
 
+int v3_drill_guest_pt_32(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, 
+                        int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, 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;
+    addr_t guest_pte_pa = 0;
+    int ret; 
+  
 
-pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
-  addr_t current_page_addr = 0;
-  int i, j, k, m;
-  struct shadow_map * map = &(info->mem_map);
+    if (v3_gpa_to_hva(info, guest_pde_pa, (addr_t *)&guest_pde) == -1) {
+       PrintError(info->vm_info, info, "Could not get virtual address of Guest PDE32 (PA=%p)\n", 
+                  (void *)guest_pde_pa);
+       return -1;
+    }
+  
+    if ((ret = callback(info, PAGE_PD32, vaddr, (addr_t)guest_pde, guest_pde_pa, private_data)) != 0) {
+       return (ret == -1) ? -1 : PAGE_PD32;
+    }
   
-  pml4e64_t * pml = V3_VAddr(V3_AllocPages(1));
+    switch (pde32_lookup(guest_pde, vaddr, &guest_pte_pa)) {
+       case PT_ENTRY_NOT_PRESENT:
+           return -1;
+       case PT_ENTRY_LARGE_PAGE:
+           {
+               addr_t large_page_pa = (addr_t)guest_pte_pa;
+               addr_t large_page_va = 0;
+      
+               if (v3_gpa_to_hva(info, large_page_pa, &large_page_va) == -1) {
+                   large_page_va = 0 ;
+               }
 
-  for (i = 0; i < 1; i++) {
-    int pdpe_present = 0;
-    pdpe64_t * pdpe = V3_VAddr(V3_AllocPages(1));
 
-    for (j = 0; j < 20; j++) {
-      int pde_present = 0;
-      pde64_t * pde = V3_VAddr(V3_AllocPages(1));
+               if ((ret == callback(info, PAGE_4MB, vaddr, large_page_va, large_page_pa, private_data)) != 0) {
+                   return (ret == -1) ? -1 : PAGE_4MB;
+               }
+               return 0;
+           }
+       case PT_ENTRY_PAGE:
+           {
+               pte32_t * guest_pte = NULL;
+               addr_t page_pa;
+
+               if (v3_gpa_to_hva(info, guest_pte_pa, (addr_t*)&guest_pte) == -1) {
+                   PrintError(info->vm_info, info, "Could not get virtual address of Guest PTE32 (PA=%p)\n", 
+                              (void *)guest_pte_pa);
+                   return -1;
+               }
 
-      for (k = 0; k < MAX_PDE64_ENTRIES; k++) {
-       int pte_present = 0;
-       pte64_t * pte = V3_VAddr(V3_AllocPages(1));
+               if ((ret = callback(info, PAGE_PT32, vaddr, (addr_t)guest_pte, guest_pte_pa, private_data)) != 0) {
+                   return (ret == -1) ? -1 : PAGE_PT32;
+               }
 
+               if (pte32_lookup(guest_pte, vaddr, &page_pa) == PT_ENTRY_NOT_PRESENT) {
+                   return -1;
+               } else {
+                   addr_t page_va;
 
-       for (m = 0; m < MAX_PTE64_ENTRIES; m++) {
-         struct shadow_region * region = get_shadow_region_by_addr(map, current_page_addr);
-         
+                   if (v3_gpa_to_hva(info, page_pa, &page_va) == -1) {
+                       page_va = 0;
+                   }
 
-         
-         if (!region || 
-             (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) ||
-             (region->host_type == HOST_REGION_SWAPPED)) {
-           pte[m].present = 0;
-           pte[m].writable = 0;
-           pte[m].user_page = 0;
-           pte[m].write_through = 0;
-           pte[m].cache_disable = 0;
-           pte[m].accessed = 0;
-           pte[m].dirty = 0;
-           pte[m].pte_attr = 0;
-           pte[m].global_page = 0;
-           pte[m].vmm_info = 0;
-           pte[m].page_base_addr = 0;
-         } else {
-           addr_t host_addr;
-           pte[m].present = 1;
-           pte[m].writable = 1;
-           pte[m].user_page = 1;
-           pte[m].write_through = 0;
-           pte[m].cache_disable = 0;
-           pte[m].accessed = 0;
-           pte[m].dirty = 0;
-           pte[m].pte_attr = 0;
-           pte[m].global_page = 0;
-           pte[m].vmm_info = 0;
-           
-           if (guest_pa_to_host_pa(info, current_page_addr, &host_addr) == -1) {
-             // BIG ERROR
-             // PANIC
-             return NULL;
+                   if ((ret = callback(info, PAGE_4KB, vaddr, page_va, page_pa, private_data)) != 0) {
+                       return (ret == -1) ? -1 : PAGE_4KB;
+                   }
+                   return 0;
+               }
            }
+    }
 
-           pte[m].page_base_addr = PAGE_BASE_ADDR(host_addr);
+    // should never get here
+    PrintError(info->vm_info, info, "End of drill function (guest 32)... Should never have gotten here...\n");
+    return -1;
+}
 
-           //PrintPTE64(current_page_addr, &(pte[m]));
 
-           pte_present = 1;      
-         }
 
+int v3_drill_guest_pt_32pae(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr,
+                           int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data),
+                           void * private_data) {                      
+    addr_t guest_pdpe_pa = CR3_TO_PDPE32PAE_PA(guest_cr3);
+    pdpe32pae_t * guest_pdpe = 0;
+    addr_t guest_pde_pa = 0;
+    int ret = 0;
+
+    if (v3_gpa_to_hva(info, guest_pdpe_pa, (addr_t*)&guest_pdpe) == -1) {
+       PrintError(info->vm_info, info, "Could not get virtual address of Guest PDPE32PAE (PA=%p)\n",
+                  (void *)guest_pdpe_pa);
+       return -1;
+    }
 
+    if ((ret = callback(info, PAGE_PDP32PAE, vaddr, (addr_t)guest_pdpe, guest_pdpe_pa, private_data)) != 0) {
+       return (ret == -1) ? -1 : PAGE_PDP32PAE;
+    }
 
+    switch (pdpe32pae_lookup(guest_pdpe, vaddr, &guest_pde_pa)) 
+       {
+           case PT_ENTRY_NOT_PRESENT:
+               return -1;
+           case PT_ENTRY_PAGE:
+               {
+                   pde32pae_t * guest_pde = NULL;
+                   addr_t guest_pte_pa = 0;
+       
+                   if (v3_gpa_to_hva(info, guest_pde_pa, (addr_t *)&guest_pde) == -1) {
+                       PrintError(info->vm_info, info, "Could not get virtual Address of Guest PDE32PAE (PA=%p)\n", 
+                                  (void *)guest_pde_pa);
+                       return -1;
+                   }
 
-         current_page_addr += PAGE_SIZE;
-       }
+                   if ((ret = callback(info, PAGE_PD32PAE, vaddr, (addr_t)guest_pde, guest_pde_pa, private_data)) != 0) {
+                       return (ret == -1) ? -1 : PAGE_PD32PAE;
+                   }
        
-       if (pte_present == 0) {
-         V3_FreePage(V3_PAddr(pte));
-
-         pde[k].present = 0;
-         pde[k].writable = 0;
-         pde[k].user_page = 0;
-         pde[k].write_through = 0;
-         pde[k].cache_disable = 0;
-         pde[k].accessed = 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 = 0;
-       } else {
-         pde[k].present = 1;
-         pde[k].writable = 1;
-         pde[k].user_page = 1;
-         pde[k].write_through = 0;
-         pde[k].cache_disable = 0;
-         pde[k].accessed = 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_BASE_ADDR((addr_t)V3_PAddr(pte));
-
-         pde_present = 1;
+                   switch (pde32pae_lookup(guest_pde, vaddr, &guest_pte_pa)) 
+                       {
+                           case PT_ENTRY_NOT_PRESENT:
+                               return -1;
+                           case PT_ENTRY_LARGE_PAGE:
+                               {
+                                   addr_t large_page_pa = (addr_t)guest_pte_pa;
+                                   addr_t large_page_va = 0;
+             
+                                   if (v3_gpa_to_hva(info, large_page_pa, &large_page_va) == -1) {
+                                       large_page_va = 0;
+                                   }
+             
+                                   if ((ret == callback(info, PAGE_2MB, vaddr, large_page_va, large_page_pa, private_data)) != 0) {
+                                       return (ret == -1) ? -1 : PAGE_2MB;
+                                   }
+                                   return 0;
+                               }
+                           case PT_ENTRY_PAGE:
+                               {
+                                   pte32pae_t * guest_pte = NULL;
+                                   addr_t page_pa;
+
+                                   if (v3_gpa_to_hva(info, guest_pte_pa, (addr_t *)&guest_pte) == -1) {
+                                       PrintError(info->vm_info, info, "Could not get virtual Address of Guest PTE32PAE (PA=%p)\n", 
+                                                  (void *)guest_pte_pa);
+                                       return -1;
+                                   }
+
+                                   if ((ret = callback(info, PAGE_PT32PAE, vaddr, (addr_t)guest_pte, guest_pte_pa, private_data)) != 0) {
+                                       return (ret == -1) ? -1 : PAGE_PT32PAE;
+                                   }
+
+                                   if (pte32pae_lookup(guest_pte, vaddr, &page_pa) == PT_ENTRY_NOT_PRESENT) {
+                                       return -1;
+                                   } else {
+                                       addr_t page_va;
+               
+                                       if (v3_gpa_to_hva(info, page_pa, &page_va) == -1) {
+                                           page_va = 0;
+                                       }
+               
+                                       if ((ret = callback(info, PAGE_4KB, vaddr, page_va, page_pa, private_data)) != 0) {
+                                           return (ret == -1) ? -1 : PAGE_4KB;
+                                       }
+                                       return 0;
+                                   }
+                               }
+                       }
+               }
+           default:
+               PrintError(info->vm_info, info, "Invalid page type for PD32PAE\n");
+               return -1;
        }
-      }
 
-      if (pde_present == 0) {
-       V3_FreePage(V3_PAddr(pde));
-       
-       pdpe[j].present = 0;
-       pdpe[j].writable = 0;
-       pdpe[j].user_page = 0;
-       pdpe[j].write_through = 0;
-       pdpe[j].cache_disable = 0;
-       pdpe[j].accessed = 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 = 0;
-      } else {
-       pdpe[j].present = 1;
-       pdpe[j].writable = 1;
-       pdpe[j].user_page = 1;
-       pdpe[j].write_through = 0;
-       pdpe[j].cache_disable = 0;
-       pdpe[j].accessed = 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_BASE_ADDR((addr_t)V3_PAddr(pde));
-
-
-       pdpe_present = 1;
-      }
+    // should never get here
+    PrintError(info->vm_info, info, "End of drill function (guest 32pae)... Should never have gotten here...\n");
+    return -1;
+}
 
+int v3_drill_guest_pt_64(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, 
+                        int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data),
+                        void * private_data) { 
+    addr_t guest_pml4_pa = CR3_TO_PML4E64_PA(guest_cr3);
+    pml4e64_t * guest_pmle = 0;
+    addr_t guest_pdpe_pa = 0;
+    int ret = 0;
+
+    if (v3_gpa_to_hva(info, guest_pml4_pa, (addr_t*)&guest_pmle) == -1) {
+       PrintError(info->vm_info, info, "Could not get virtual address of Guest PML4E64 (PA=%p)\n", 
+                  (void *)guest_pml4_pa);
+       return -1;
+    }
+  
+    if ((ret = callback(info, PAGE_PML464, vaddr, (addr_t)guest_pmle, guest_pml4_pa, private_data)) != 0) {
+       return (ret == -1) ? -1 : PAGE_PML464;
     }
 
-    PrintDebug("PML index=%d\n", i);
+    switch (pml4e64_lookup(guest_pmle, vaddr, &guest_pdpe_pa)) {
+       case PT_ENTRY_NOT_PRESENT:
+           return -1;
+       case PT_ENTRY_PAGE:
+           {
+               pdpe64_t * guest_pdp = NULL;
+               addr_t guest_pde_pa = 0;
 
-    if (pdpe_present == 0) {
-      V3_FreePage(V3_PAddr(pdpe));
-      
-      pml[i].present = 0;
-      pml[i].writable = 0;
-      pml[i].user_page = 0;
-      pml[i].write_through = 0;
-      pml[i].cache_disable = 0;
-      pml[i].accessed = 0;
-      pml[i].reserved = 0;
-      //pml[i].large_page = 0;
-      //pml[i].global_page = 0;
-      pml[i].vmm_info = 0;
-      pml[i].pdp_base_addr = 0;
-    } else {
-      pml[i].present = 1;
-      pml[i].writable = 1;
-      pml[i].user_page = 1;
-      pml[i].write_through = 0;
-      pml[i].cache_disable = 0;
-      pml[i].accessed = 0;
-      pml[i].reserved = 0;
-      //pml[i].large_page = 0;
-      //pml[i].global_page = 0;
-      pml[i].vmm_info = 0;
-      pml[i].pdp_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pdpe));
+               if (v3_gpa_to_hva(info, guest_pdpe_pa, (addr_t *)&guest_pdp) == -1) {
+                   PrintError(info->vm_info, info, "Could not get virtual address of Guest PDPE64 (PA=%p)\n", 
+                              (void *)guest_pdpe_pa);
+                   return -1;
+               }
+
+               if ((ret = callback(info, PAGE_PDP64, vaddr, (addr_t)guest_pdp, guest_pdpe_pa, private_data)) != 0) {
+                   return (ret == -1) ? -1 : PAGE_PDP64;
+               }
+
+               switch (pdpe64_lookup(guest_pdp, vaddr, &guest_pde_pa)) {
+                   case PT_ENTRY_NOT_PRESENT:
+                       return -1;
+                   case PT_ENTRY_LARGE_PAGE:
+                       {
+                           addr_t large_page_pa = (addr_t)guest_pde_pa;
+                           addr_t large_page_va = 0;
+         
+                           if (v3_gpa_to_hva(info, large_page_pa, &large_page_va) == -1) {
+                               large_page_va = 0;
+                           }
+         
+                           if ((ret == callback(info, PAGE_1GB, vaddr, large_page_va, large_page_pa, private_data)) != 0) {
+                               return (ret == -1) ? -1 : PAGE_1GB;
+                           }
+                           PrintError(info->vm_info, info, "1 Gigabyte Pages not supported\n");
+                           return 0;
+                       }
+                   case PT_ENTRY_PAGE:
+                       {
+                           pde64_t * guest_pde = NULL;
+                           addr_t guest_pte_pa = 0;
+
+                           if (v3_gpa_to_hva(info, guest_pde_pa, (addr_t *)&guest_pde) == -1) {
+                               PrintError(info->vm_info, info, "Could not get virtual address of guest PDE64 (PA=%p)\n", 
+                                          (void *)guest_pde_pa);
+                               return -1;
+                           }
+       
+                           if ((ret = callback(info, PAGE_PD64, vaddr, (addr_t)guest_pde, guest_pde_pa, private_data)) != 0) {
+                               return (ret == -1) ? -1 : PAGE_PD64;
+                           }
+
+                           switch (pde64_lookup(guest_pde, vaddr, &guest_pte_pa)) {
+                               case PT_ENTRY_NOT_PRESENT:
+                                   return -1;
+                               case PT_ENTRY_LARGE_PAGE:
+                                   {
+                                       addr_t large_page_pa = (addr_t)guest_pte_pa;
+                                       addr_t large_page_va = 0;
+             
+                                       if (v3_gpa_to_hva(info, large_page_pa, &large_page_va) == -1) {
+                                           large_page_va = 0;
+                                       }
+             
+                                       if ((ret == callback(info, PAGE_2MB, vaddr, large_page_va, large_page_pa, private_data)) != 0) {
+                                           return (ret == -1) ? -1 : PAGE_2MB;
+                                       }
+                                       return 0;
+                                   }
+                               case PT_ENTRY_PAGE:
+                                   {
+                                       pte64_t * guest_pte = NULL;
+                                       addr_t page_pa;
+             
+                                       if (v3_gpa_to_hva(info, guest_pte_pa, (addr_t *)&guest_pte) == -1) {
+                                           PrintError(info->vm_info, info, "Could not get virtual address of guest PTE64 (PA=%p)\n", 
+                                                      (void *)guest_pte_pa);
+                                           return -1;
+                                       }
+
+                                       if ((ret = callback(info, PAGE_PT64, vaddr, (addr_t)guest_pte, guest_pte_pa, private_data)) != 0) {
+                                           return (ret == -1) ? -1 : PAGE_PT64;
+                                       }
+               
+                                       if (pte64_lookup(guest_pte, vaddr, &page_pa) == PT_ENTRY_NOT_PRESENT) {
+                                           return -1;
+                                       } else {
+                                           addr_t page_va;
+               
+                                           if (v3_gpa_to_hva(info, page_pa, &page_va) == -1) {
+                                               page_va = 0;
+                                           }
+               
+                                           if ((ret = callback(info, PAGE_4KB, vaddr, page_va, page_pa, private_data)) != 0) {
+                                               return (ret == -1) ? -1 : PAGE_4KB;
+                                           }
+
+                                           return 0;
+                                       }
+                                   }
+                           }
+                       }
+               }
+           }
+       default:
+           return -1;
     }
-  }
 
-  return pml;
+    // should never get here
+    PrintError(info->vm_info, info, "End of drill function (guest 64)... Should never have gotten here...\n");
+    return -1;
 }
 
 
+
+
 int v3_walk_guest_pt_32(struct guest_info * info,  v3_reg_t guest_cr3,
-                       void (*callback)(page_type_t type, addr_t page_ptr, addr_t page_pa, void * private_data),
+                       int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, 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;
+    addr_t guest_pde_pa = CR3_TO_PDE32_PA(guest_cr3);
+    pde32_t * guest_pde = NULL;
+    int i, j;
+    addr_t vaddr = 0;
+    int ret = 0;
+
+    if (!callback) {
+       PrintError(info->vm_info, info, "Call back was not specified\n");
+       return -1;
+    }
 
-  if (!callback) {
-    PrintError("Call back was not specified\n");
-    return -1;
-  }
+    if (v3_gpa_to_hva(info, guest_pde_pa, (addr_t *)&guest_pde) == -1) {
+       PrintError(info->vm_info, info, "Could not get virtual address of Guest PDE32 (PA=%p)\n", 
+                  (void *)guest_pde_pa);
+       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;
-  }
+    if ((ret = callback(info, PAGE_PD32, vaddr, (addr_t)guest_pde, guest_pde_pa, private_data)) != 0) {
+       return ret;
+    }
 
-  callback(PAGE_PD32, (addr_t)guest_pde, guest_pde_pa, private_data);
+    for (i = 0; i < MAX_PDE32_ENTRIES; i++) {
+       if (guest_pde[i].present) {
+           if (guest_pde[i].large_page) {
+               pde32_4MB_t * large_pde = (pde32_4MB_t *)&(guest_pde[i]);
+               addr_t large_page_pa = BASE_TO_PAGE_ADDR_4MB(large_pde->page_base_addr);
+               addr_t large_page_va = 0;
 
-  for (i = 0; i < MAX_PDE32_ENTRIES; i++) {
-    if (guest_pde[i].present) {
-      if (guest_pde[i].large_page) {
-       pde32_4MB_t * large_pde = (pde32_4MB_t *)&(guest_pde[i]);
-       addr_t large_page_pa = BASE_TO_PAGE_ADDR_4MB(large_pde->page_base_addr);
-       addr_t large_page_va = 0;
+               if (v3_gpa_to_hva(info, large_page_pa, &large_page_va) == -1) {
+                   PrintDebug(info->vm_info, info,"Could not get virtual address of Guest 4MB Page (PA=%p)\n", 
+                              (void *)large_page_pa);
+                   // We'll let it through for data pages because they may be unmapped or hooked
+                   large_page_va = 0;
+               }
 
-       if (guest_pa_to_host_va(info, large_page_pa, &large_page_va) == -1) {
-         PrintError("Could not get virtual address of Guest 4MB Page (PA=%p)\n", 
-                    (void *)large_page_pa);
-         return -1;
-       }
+               if ((ret = callback(info, PAGE_4MB, vaddr, large_page_va, large_page_pa, private_data)) != 0) {
+                   return ret;
+               }
 
-       callback(PAGE_4MB, large_page_va, large_page_pa, private_data);
-      } else {
-       addr_t pte_pa = BASE_TO_PAGE_ADDR(guest_pde[i].pt_base_addr);
-       pte32_t * tmp_pte = NULL;
+               vaddr += PAGE_SIZE_4MB;
+           } else {
+               addr_t pte_pa = BASE_TO_PAGE_ADDR(guest_pde[i].pt_base_addr);
+               pte32_t * tmp_pte = NULL;
 
-       if (guest_pa_to_host_va(info, pte_pa, (addr_t *)&tmp_pte) == -1) {
-         PrintError("Could not get virtual address of Guest PTE32 (PA=%p)\n", 
-                    (void *)pte_pa);
-         return -1;
-       }
+               if (v3_gpa_to_hva(info, pte_pa, (addr_t *)&tmp_pte) == -1) {
+                   PrintError(info->vm_info, info, "Could not get virtual address of Guest PTE32 (PA=%p)\n", 
+                              (void *)pte_pa);
+                   return -1;
+               }
 
-       callback(PAGE_PT32, (addr_t)tmp_pte, pte_pa, private_data);
+               if ((ret = callback(info, PAGE_PT32, vaddr, (addr_t)tmp_pte, pte_pa, private_data)) != 0) {
+                   return ret;
+               }
 
-       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);
-           addr_t page_va = 0;
+               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);
+                       addr_t page_va = 0;
+
+                       if (v3_gpa_to_hva(info, page_pa, &page_va) == -1) {
+                           PrintDebug(info->vm_info, info, "Could not get virtual address of Guest 4KB Page (PA=%p)\n", 
+                                      (void *)page_pa);
+                           // We'll let it through for data pages because they may be unmapped or hooked
+                           page_va = 0;
+                       }
+           
+                       if ((ret = callback(info, PAGE_4KB, vaddr, page_va, page_pa, private_data)) != 0) {
+                           return ret;
+                       }
+                   }
 
-           if (guest_pa_to_host_va(info, page_pa, &page_va) == -1) {
-             PrintError("Could not get virtual address of Guest 4KB Page (PA=%p)\n", 
-                        (void *)page_pa);
-             return -1;
+                   vaddr += PAGE_SIZE_4KB;
+               }
            }
-           
-           callback(PAGE_4KB, page_va, page_pa, private_data);
-         }
+       } else {
+           vaddr += PAGE_SIZE_4MB;
        }
-      }
     }
-  }
-  return 0;
+    return 0;
 }
 
 
 int v3_walk_guest_pt_32pae(struct guest_info * info,  v3_reg_t guest_cr3,
-                          void (*callback)(page_type_t type, addr_t page_ptr, addr_t page_pa, void * private_data),
+                          int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data),
                           void * private_data) {
-  addr_t guest_pdpe_pa = CR3_TO_PDPE32PAE_PA(guest_cr3);
-  pdpe32pae_t * guest_pdpe = NULL;
-  int i, j, k;
-
-  if (!callback) {
-    PrintError("Call back was not specified\n");
-    return -1;
-  }
+    addr_t guest_pdpe_pa = CR3_TO_PDPE32PAE_PA(guest_cr3);
+    pdpe32pae_t * guest_pdpe = NULL;
+    int i, j, k;
+    addr_t vaddr = 0;
+    int ret = 0;
+
+    if (!callback) {
+       PrintError(info->vm_info, info, "Call back was not specified\n");
+       return -1;
+    }
 
-  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;
-  }
+    if (v3_gpa_to_hva(info, guest_pdpe_pa, (addr_t *)&guest_pdpe) == -1) {
+       PrintError(info->vm_info, info, "Could not get virtual address of Guest PDPE32PAE (PA=%p)\n", 
+                  (void *)guest_pdpe_pa);
+       return -1;
+    }
 
   
+    if ((ret = callback(info, PAGE_PDP32PAE, vaddr, (addr_t)guest_pdpe, guest_pdpe_pa, private_data)) != 0) {
+       return ret;
+    }
 
-  callback(PAGE_PDP32PAE, (addr_t)guest_pdpe, guest_pdpe_pa, private_data);
-
-  for (i = 0; i < MAX_PDPE32PAE_ENTRIES; i++) {
-    if (guest_pdpe[i].present) {
-      addr_t pde_pa = BASE_TO_PAGE_ADDR(guest_pdpe[i].pd_base_addr);
-      pde32pae_t * tmp_pde = NULL;
+    for (i = 0; i < MAX_PDPE32PAE_ENTRIES; i++) {
+       if (guest_pdpe[i].present) {
+           addr_t pde_pa = BASE_TO_PAGE_ADDR(guest_pdpe[i].pd_base_addr);
+           pde32pae_t * tmp_pde = NULL;
 
-      if (guest_pa_to_host_va(info, pde_pa, (addr_t *)&tmp_pde) == -1) {
-       PrintError("Could not get virtual address of Guest PDE32PAE (PA=%p)\n", 
-                  (void *)pde_pa);
-       return -1;
-      }
+           if (v3_gpa_to_hva(info, pde_pa, (addr_t *)&tmp_pde) == -1) {
+               PrintError(info->vm_info, info, "Could not get virtual address of Guest PDE32PAE (PA=%p)\n", 
+                          (void *)pde_pa);
+               return -1;
+           }
 
-      callback(PAGE_PD32PAE, (addr_t)tmp_pde, pde_pa, private_data);
+           if ((ret = callback(info, PAGE_PD32PAE, vaddr, (addr_t)tmp_pde, pde_pa, private_data)) != 0) {
+               return ret;
+           }
       
-      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);
-           addr_t large_page_va = 0;
+           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);
+                       addr_t large_page_va = 0;
            
-           if (guest_pa_to_host_va(info, large_page_pa, &large_page_va) == -1) {
-             PrintError("Could not get virtual address of Guest 2MB Page (PA=%p)\n", 
-                        (void *)large_page_pa);
-             return -1;
-           }
+                       if (v3_gpa_to_hva(info, large_page_pa, &large_page_va) == -1) {
+                           PrintDebug(info->vm_info, info,"Could not get virtual address of Guest 2MB Page (PA=%p)\n", 
+                                      (void *)large_page_pa);
+                           // We'll let it through for data pages because they may be unmapped or hooked
+                           large_page_va = 0;
+                       }
            
-           callback(PAGE_2MB, large_page_va, large_page_pa, private_data);
-         } else {
-           addr_t pte_pa = BASE_TO_PAGE_ADDR(tmp_pde[j].pt_base_addr);
-           pte32pae_t * tmp_pte = NULL;
+                       if ((ret = callback(info, PAGE_2MB, vaddr, large_page_va, large_page_pa, private_data)) != 0) {
+                           return ret;
+                       }
+
+                       vaddr += PAGE_SIZE_2MB;
+                   } else {
+                       addr_t pte_pa = BASE_TO_PAGE_ADDR(tmp_pde[j].pt_base_addr);
+                       pte32pae_t * tmp_pte = NULL;
            
-           if (guest_pa_to_host_va(info, pte_pa, (addr_t *)&tmp_pte) == -1) {
-             PrintError("Could not get virtual address of Guest PTE32PAE (PA=%p)\n", 
-                        (void *)pte_pa);
-             return -1;
-           }
+                       if (v3_gpa_to_hva(info, pte_pa, (addr_t *)&tmp_pte) == -1) {
+                           PrintError(info->vm_info, info, "Could not get virtual address of Guest PTE32PAE (PA=%p)\n", 
+                                      (void *)pte_pa);
+                           return -1;
+                       }
            
-           callback(PAGE_PT32PAE, (addr_t)tmp_pte, pte_pa, private_data);
+                       if ((ret = callback(info, PAGE_PT32PAE, vaddr, (addr_t)tmp_pte, pte_pa, private_data)) != 0) {
+                           return ret;
+                       }
            
-           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);
-               addr_t page_va = 0;
+                       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);
+                               addr_t page_va = 0;
                
-               if (guest_pa_to_host_va(info, page_pa, &page_va) == -1) {
-                 PrintError("Could not get virtual address of Guest 4KB Page (PA=%p)\n", 
-                            (void *)page_pa);
-                 return -1;
-               }
+                               if (v3_gpa_to_hva(info, page_pa, &page_va) == -1) {
+                                   PrintDebug(info->vm_info, info,"Could not get virtual address of Guest 4KB Page (PA=%p)\n", 
+                                              (void *)page_pa);
+                                   // We'll let it through for data pages because they may be unmapped or hooked
+                                   page_va = 0;
+                               }
                
-               callback(PAGE_4KB, page_va, page_pa, private_data);
-             }
+                               if ((ret = callback(info, PAGE_4KB, vaddr, page_va, page_pa, private_data)) != 0) {
+                                   return ret;
+                               }
+                           }
+             
+                           vaddr += PAGE_SIZE_4KB;
+                       }
+                   }
+               } else {
+                   vaddr += PAGE_SIZE_2MB;
+               }
            }
-         }
+       } else {
+           vaddr += PAGE_SIZE_2MB * MAX_PDE32PAE_ENTRIES;
        }
-      }
     }
-  }
-  return 0;
+    return 0;
 }
 
 
 
 
 int v3_walk_guest_pt_64(struct guest_info * info,  v3_reg_t guest_cr3,
-                       void (*callback)(page_type_t type, addr_t page_ptr, addr_t page_pa, void * private_data),
+                       int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, addr_t page_pa, void * private_data),
                        void * private_data) {
-  addr_t guest_pml_pa = CR3_TO_PML4E64_PA(guest_cr3);
-  pml4e64_t * guest_pml = NULL;
-  int i, j, k, m;
-
-  if (!callback) {
-    PrintError("Call back was not specified\n");
-    return -1;
-  }
+    addr_t guest_pml_pa = CR3_TO_PML4E64_PA(guest_cr3);
+    pml4e64_t * guest_pml = NULL;
+    int i, j, k, m;
+    addr_t vaddr = 0;
+    int ret = 0;
+
+    if (!callback) {
+       PrintError(info->vm_info, info, "Call back was not specified\n");
+       return -1;
+    }
 
-  if (guest_pa_to_host_va(info, guest_pml_pa, (addr_t *)&guest_pml) == -1) {
-    PrintError("Could not get virtual address of Guest PML464 (PA=%p)\n", 
-              (void *)guest_pml);
-    return -1;
-  }
+    if (v3_gpa_to_hva(info, guest_pml_pa, (addr_t *)&guest_pml) == -1) {
+       PrintError(info->vm_info, info, "Could not get virtual address of Guest PML464 (PA=%p)\n", 
+                  (void *)guest_pml);
+       return -1;
+    }
 
 
-  callback(PAGE_PML464, (addr_t)guest_pml, guest_pml_pa, private_data);
+    if ((ret = callback(info, PAGE_PML464, vaddr, (addr_t)guest_pml, guest_pml_pa, private_data)) != 0) {
+       return ret;
+    }
 
-  for (i = 0; i < MAX_PML4E64_ENTRIES; i++) {
-    if (guest_pml[i].present) {
-      addr_t pdpe_pa = BASE_TO_PAGE_ADDR(guest_pml[i].pdp_base_addr);
-      pdpe64_t * tmp_pdpe = NULL;
-      
+    for (i = 0; i < MAX_PML4E64_ENTRIES; i++) {
+       if (guest_pml[i].present) {
+           addr_t pdpe_pa = BASE_TO_PAGE_ADDR(guest_pml[i].pdp_base_addr);
+           pdpe64_t * tmp_pdpe = NULL;
       
-      if (guest_pa_to_host_va(info, pdpe_pa, (addr_t *)&tmp_pdpe) == -1) {
-       PrintError("Could not get virtual address of Guest PDPE64 (PA=%p)\n", 
-                  (void *)pdpe_pa);
-       return -1;
-      }
       
-      callback(PAGE_PDP64, (addr_t)tmp_pdpe, pdpe_pa, private_data);
+           if (v3_gpa_to_hva(info, pdpe_pa, (addr_t *)&tmp_pdpe) == -1) {
+               PrintError(info->vm_info, info, "Could not get virtual address of Guest PDPE64 (PA=%p)\n", 
+                          (void *)pdpe_pa);
+               return -1;
+           }
       
-      for (j = 0; j < MAX_PDPE64_ENTRIES; j++) {
-       if (tmp_pdpe[j].present) {
-         if (tmp_pdpe[j].large_page) {
-           pdpe64_1GB_t * large_pdpe = (pdpe64_1GB_t *)&(tmp_pdpe[j]);
-           addr_t large_page_pa = BASE_TO_PAGE_ADDR_1GB(large_pdpe->page_base_addr);
-           addr_t large_page_va = 0;
-
-           if (guest_pa_to_host_va(info, large_page_pa, &large_page_va) == -1) {
-             PrintError("Could not get virtual address of Guest 1GB page (PA=%p)\n", 
-                        (void *)large_page_pa);
-             return -1;
+           if ((ret = callback(info, PAGE_PDP64, vaddr, (addr_t)tmp_pdpe, pdpe_pa, private_data)) != 0) {
+               return ret;
            }
-
-           callback(PAGE_1GB, (addr_t)large_page_va, large_page_pa, private_data);
-
-         } else {
-           addr_t pde_pa = BASE_TO_PAGE_ADDR(tmp_pdpe[j].pd_base_addr);
-           pde64_t * tmp_pde = NULL;
+      
+           for (j = 0; j < MAX_PDPE64_ENTRIES; j++) {
+               if (tmp_pdpe[j].present) {
+                   if (tmp_pdpe[j].large_page) {
+                       pdpe64_1GB_t * large_pdpe = (pdpe64_1GB_t *)&(tmp_pdpe[j]);
+                       addr_t large_page_pa = BASE_TO_PAGE_ADDR_1GB(large_pdpe->page_base_addr);
+                       addr_t large_page_va = 0;
+
+                       if (v3_gpa_to_hva(info, large_page_pa, &large_page_va) == -1) {
+                           PrintDebug(info->vm_info, info,"Could not get virtual address of Guest 1GB page (PA=%p)\n", 
+                                      (void *)large_page_pa);
+                           // We'll let it through for data pages because they may be unmapped or hooked
+                           large_page_va = 0;
+                       }
+
+                       if ((ret = callback(info, PAGE_1GB, vaddr, (addr_t)large_page_va, large_page_pa, private_data)) != 0) {
+                           return ret;
+                       }
+
+                       vaddr += PAGE_SIZE_1GB;
+                   } else {
+                       addr_t pde_pa = BASE_TO_PAGE_ADDR(tmp_pdpe[j].pd_base_addr);
+                       pde64_t * tmp_pde = NULL;
            
-           if (guest_pa_to_host_va(info, pde_pa, (addr_t *)&tmp_pde) == -1) {
-             PrintError("Could not get virtual address of Guest PDE64 (PA=%p)\n", 
-                        (void *)pde_pa);
-             return -1;
-           }
+                       if (v3_gpa_to_hva(info, pde_pa, (addr_t *)&tmp_pde) == -1) {
+                           PrintError(info->vm_info, info, "Could not get virtual address of Guest PDE64 (PA=%p)\n", 
+                                      (void *)pde_pa);
+                           return -1;
+                       }
            
-           callback(PAGE_PD64, (addr_t)tmp_pde, pde_pa, private_data);
+                       if ((ret = callback(info, PAGE_PD64, vaddr, (addr_t)tmp_pde, pde_pa, private_data)) != 0) {
+                           return ret;
+                       }
            
-           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);
-                 addr_t large_page_va = 0;
+                       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);
+                                   addr_t large_page_va = 0;
                  
-                 if (guest_pa_to_host_va(info, large_page_pa, &large_page_va) == -1) {
-                   PrintError("Could not get virtual address of Guest 2MB page (PA=%p)\n", 
-                              (void *)large_page_pa);
-                   return -1;
-                 }
+                                   if (v3_gpa_to_hva(info, large_page_pa, &large_page_va) == -1) {
+                                       PrintDebug(info->vm_info, info,"Could not get virtual address of Guest 2MB page (PA=%p)\n", 
+                                                  (void *)large_page_pa);
+                                       // We'll let it through for data pages because they may be unmapped or hooked
+                                       large_page_va = 0;
+                                   }
                  
-                 callback(PAGE_2MB, large_page_va, large_page_pa, private_data);
-               } else {
-                 addr_t pte_pa = BASE_TO_PAGE_ADDR(tmp_pde[k].pt_base_addr);
-                 pte64_t * tmp_pte = NULL;
+                                   if ((ret = callback(info, PAGE_2MB, vaddr, large_page_va, large_page_pa, private_data)) != 0) {
+                                       return ret;
+                                   }
+
+                                   vaddr += PAGE_SIZE_2MB;
+                               } else {
+                                   addr_t pte_pa = BASE_TO_PAGE_ADDR(tmp_pde[k].pt_base_addr);
+                                   pte64_t * tmp_pte = NULL;
                  
-                 if (guest_pa_to_host_va(info, pte_pa, (addr_t *)&tmp_pte) == -1) {
-                   PrintError("Could not get virtual address of Guest PTE64 (PA=%p)\n", 
-                              (void *)pte_pa);
-                   return -1;
-                 }
+                                   if (v3_gpa_to_hva(info, pte_pa, (addr_t *)&tmp_pte) == -1) {
+                                       PrintError(info->vm_info, info, "Could not get virtual address of Guest PTE64 (PA=%p)\n", 
+                                                  (void *)pte_pa);
+                                       return -1;
+                                   }
                  
-                 callback(PAGE_PT64, (addr_t)tmp_pte, pte_pa, private_data);
+                                   if ((ret = callback(info, PAGE_PT64, vaddr, (addr_t)tmp_pte, pte_pa, private_data)) != 0) {
+                                       return ret;
+                                   }
                  
-                 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);
-                     addr_t page_va = 0;
+                                   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);
+                                           addr_t page_va = 0;
                      
-                     if (guest_pa_to_host_va(info, page_pa, &page_va) == -1) {
-                       PrintError("Could not get virtual address of Guest 4KB Page (PA=%p)\n", 
-                                  (void *)page_pa);
-                       return -1;
-                     }
+                                           if (v3_gpa_to_hva(info, page_pa, &page_va) == -1) {
+                                               PrintDebug(info->vm_info, info,"Could not get virtual address of Guest 4KB Page (PA=%p)\n", 
+                                                          (void *)page_pa);
+                                               // We'll let it through for data pages because they may be unmapped or hooked
+                                               page_va = 0;
+                                           }
                      
-                     callback(PAGE_4KB, page_va, page_pa, private_data);
+                                           if ((ret = callback(info, PAGE_4KB, vaddr, page_va, page_pa, private_data)) != 0) {
+                                               return ret;
+                                           }
+                                       }
+
+                                       vaddr += PAGE_SIZE_4KB;
+                                   }
+                               }
+                           } else {
+                               vaddr += PAGE_SIZE_2MB;
+                           }
+                       }
                    }
-                 }
+               } else {
+                   vaddr += PAGE_SIZE_1GB;
                }
-             }
            }
-         }
+       } else {
+           vaddr += ((ullong_t)PAGE_SIZE_1GB * (ullong_t)MAX_PDPE64_ENTRIES);
        }
-      }
     }
-  }
-  return 0;
+    return 0;
 }
 
-int v3_walk_host_pt_32(v3_reg_t host_cr3,
-                      void (*callback)(page_type_t type, addr_t page_ptr, addr_t page_pa, void * private_data),
+int v3_walk_host_pt_32(struct guest_info * info, v3_reg_t host_cr3,
+                      int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, 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;
+    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;
+    addr_t vaddr = 0;
+    int ret = 0;
+
+    if (!callback) {
+       PrintError(info->vm_info, info, "Call back was not specified\n");
+       return -1;
+    }
 
-  if (!callback) {
-    PrintError("Call back was not specified\n");
-    return -1;
-  }
+    if ((ret = callback(info, PAGE_PD32, vaddr, (addr_t)host_pde, pde_pa, private_data)) != 0) {
+       return ret;
+    }
 
-  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);
 
-  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);
+               if ((ret = callback(info, PAGE_4MB, vaddr, (addr_t)V3_VAddr((void *)large_page_pa), large_page_pa, private_data)) != 0) {
+                   return ret;
+               }
+
+               vaddr += PAGE_SIZE_4MB;
+           } 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_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);
+               if ((ret = callback(info, PAGE_PT32, vaddr, (addr_t)tmp_pte, pte_pa, private_data)) != 0) {
+                   return ret;
+               }
 
-       callback(PAGE_PT32, (addr_t)tmp_pte, pte_pa, private_data);
+               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);
+                       if ((ret = callback(info, PAGE_4KB, vaddr, (addr_t)V3_VAddr((void *)page_pa), page_pa, private_data)) != 0) {
+                           return ret;
+                       }
+                   }
 
-       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);
-         }
+                   vaddr += PAGE_SIZE_4KB;
+               }
+           }
+       } else {
+           vaddr += PAGE_SIZE_4MB;
        }
-      }
     }
-  }
-  return 0;
+    return 0;
 }
-       
 
 
 
 
-int v3_walk_host_pt_32pae(v3_reg_t host_cr3,
-                         void (*callback)(page_type_t type, addr_t page_ptr, addr_t page_pa, void * private_data),
+
+int v3_walk_host_pt_32pae(struct guest_info * info, v3_reg_t host_cr3,
+                         int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, 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;
-  
-  if (!callback) {
-    PrintError("Callback was not specified\n");
-    return -1;
-  }
+    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;
+    addr_t vaddr = 0;
+    int ret = 0;
+
+    if (!callback) {
+       PrintError(info->vm_info, info, "Callback was not specified\n");
+       return -1;
+    }
   
-  callback(PAGE_PDP32PAE, (addr_t)host_pdpe, pdpe_pa, private_data);
+    if ((ret = callback(info, PAGE_PDP32PAE, vaddr, (addr_t)host_pdpe, pdpe_pa, private_data)) != 0) {
+       return ret;
+    }
   
-  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);
+    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);
+           if ((ret = callback(info, PAGE_PD32PAE, vaddr, (addr_t)tmp_pde, pde_pa, private_data)) != 0) {
+               return ret;
+           }
       
-      for (j = 0; j < MAX_PDE32PAE_ENTRIES; j++) {
-       if (tmp_pde[j].present) {
+           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);
-
-           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);
+                   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 ((ret = callback(info, PAGE_2MB, vaddr, (addr_t)V3_VAddr((void *)large_page_pa), large_page_pa, private_data)) != 0) {
+                           return ret;
+                       }
+
+                       vaddr += PAGE_SIZE_2MB;
+                   } 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);
+                       if ((ret = callback(info, PAGE_PT32PAE, vaddr, (addr_t)tmp_pte, pte_pa, private_data)) != 0) {
+                           return ret;
+                       }
            
-           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);
-             }
+                       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);
+                               if ((ret = callback(info, PAGE_4KB, vaddr, (addr_t)V3_VAddr((void *)page_pa), page_pa, private_data)) != 0) {
+                                   return ret;
+                               }
+                           }
+
+                           vaddr += PAGE_SIZE_4KB;
+                       }
+                   }
+               } else {
+                   vaddr += PAGE_SIZE_2MB;
+               }
            }
-         }         
+       } else {
+           vaddr += PAGE_SIZE_2MB * MAX_PDE32PAE_ENTRIES;
        }
-      }
     }
-  }
-  return 0;
+    return 0;
 }
                        
 
-int v3_walk_host_pt_64(v3_reg_t host_cr3,
-                      void (*callback)(page_type_t type, addr_t page_ptr, addr_t page_pa, void * private_data),
+int v3_walk_host_pt_64(struct guest_info * info, v3_reg_t host_cr3,
+                      int (*callback)(struct guest_info * info, page_type_t type, addr_t vaddr, addr_t page_ptr, 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);
-
-      callback(PAGE_PDP64, (addr_t)tmp_pdpe, pdpe_pa, 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;
+    addr_t vaddr = 0;
+    int ret = 0;
+
+    if (!callback) {
+       PrintError(info->vm_info, info, "Callback was not specified\n");
+       return -1;
+    }
 
-      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 ((ret = callback(info, PAGE_PML464, vaddr, (addr_t)host_pml, pml_pa, private_data)) != 0) {
+       return ret;
+    }
 
-           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);
+    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);
 
-           callback(PAGE_PD64, (addr_t)tmp_pde, pde_pa, private_data);
+           if ((ret = callback(info, PAGE_PDP64, vaddr, (addr_t)tmp_pdpe, pdpe_pa, private_data)) != 0) {
+               return ret;
+           }
 
-           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);
+           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 ((ret = callback(info, PAGE_1GB, vaddr, (addr_t)V3_VAddr((void *)large_page_pa), large_page_pa, private_data)) != 0) {
+                           return ret;
+                       }
+
+                       vaddr += PAGE_SIZE_1GB;
+                   } 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);
+
+                       if ((ret = callback(info, PAGE_PD64, vaddr, (addr_t)tmp_pde, pde_pa, private_data)) != 0) {
+                           return ret;
+                       }
+
+                       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);
+                                   if ((ret = callback(info, PAGE_2MB, vaddr, (addr_t)V3_VAddr((void *)large_page_pa), large_page_pa, private_data)) != 0) {
+                                       return ret;
+                                   }
+                 
+                                   vaddr += PAGE_SIZE_2MB;
+                               } 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);
+
+                                   if ((ret = callback(info, PAGE_PT64, vaddr, (addr_t)tmp_pte, pte_pa, private_data)) != 0) {
+                                       return ret;
+                                   }
+
+                                   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);
+                                           if ((ret = callback(info, PAGE_4KB, vaddr, (addr_t)V3_VAddr((void *)page_pa), page_pa, private_data)) != 0) {
+                                               return ret;
+                                           }
+                                       }
+                                       vaddr += PAGE_SIZE_4KB;
+                                   }
+                               }
+                           } else {
+                               vaddr += PAGE_SIZE_2MB;
+                           }
+                       }
                    }
-                 }
+               } else {
+                   vaddr += PAGE_SIZE_1GB;
                }
-             }
            }
-         }
+       } else {
+           vaddr += (ullong_t)PAGE_SIZE_1GB * (ullong_t)MAX_PDPE64_ENTRIES;
        }
-      }
     }
-  }
-  return 0;
+    return 0;
 }
 
 
@@ -1852,34 +1824,34 @@ static const uchar_t PAGE_PT64_STR[] = "64 Bit PT";
 
 
 const uchar_t * v3_page_type_to_str(page_type_t type) {
-  switch (type) {
-  case PAGE_4KB:
-    return PAGE_4KB_STR;
-  case PAGE_2MB:
-    return PAGE_2MB_STR;
-  case PAGE_4MB:
-    return PAGE_4MB_STR;
-  case PAGE_1GB:
-    return PAGE_1GB_STR;
-  case PAGE_PT32:
-    return PAGE_PT32_STR;
-  case PAGE_PD32:
-    return PAGE_PD32_STR;
-  case PAGE_PDP32PAE:
-    return PAGE_PDP32PAE_STR;
-  case PAGE_PD32PAE:
-    return PAGE_PD32PAE_STR;
-  case PAGE_PT32PAE:
-    return PAGE_PT32PAE_STR;
-  case PAGE_PML464:
-    return PAGE_PML464_STR;
-  case PAGE_PDP64:
-    return PAGE_PDP64_STR;
-  case PAGE_PD64:
-    return PAGE_PD64_STR;
-  case PAGE_PT64:
-    return PAGE_PT64_STR;
-  default:
-    return NULL;
-  }
+    switch (type) {
+       case PAGE_4KB:
+           return PAGE_4KB_STR;
+       case PAGE_2MB:
+           return PAGE_2MB_STR;
+       case PAGE_4MB:
+           return PAGE_4MB_STR;
+       case PAGE_1GB:
+           return PAGE_1GB_STR;
+       case PAGE_PT32:
+           return PAGE_PT32_STR;
+       case PAGE_PD32:
+           return PAGE_PD32_STR;
+       case PAGE_PDP32PAE:
+           return PAGE_PDP32PAE_STR;
+       case PAGE_PD32PAE:
+           return PAGE_PD32PAE_STR;
+       case PAGE_PT32PAE:
+           return PAGE_PT32PAE_STR;
+       case PAGE_PML464:
+           return PAGE_PML464_STR;
+       case PAGE_PDP64:
+           return PAGE_PDP64_STR;
+       case PAGE_PD64:
+           return PAGE_PD64_STR;
+       case PAGE_PT64:
+           return PAGE_PT64_STR;
+       default:
+           return NULL;
+    }
 }