+int pt32_lookup(pde32_t * pd, addr_t vaddr, addr_t * paddr) {
+ addr_t pde_entry;
+ pde32_entry_type_t pde_entry_type;
+
+ if (pd == 0) {
+ return -1;
+ }
+
+ pde_entry_type = pde32_lookup(pd, vaddr, &pde_entry);
+
+ if (pde_entry_type == PDE32_ENTRY_PTE32) {
+ return pte32_lookup((pte32_t *)pde_entry, vaddr, paddr);
+ } else if (pde_entry_type == PDE32_ENTRY_LARGE_PAGE) {
+ *paddr = pde_entry;
+ return 0;
+ }
+
+ return -1;
+}
+
/* We can't do a full lookup because we don't know what context the page tables are in...
*entry = 0;
return PDE32_ENTRY_NOT_PRESENT;
} else {
- *entry = PAGE_ADDR(pde_entry->pt_base_addr);
-
+
if (pde_entry->large_page) {
- *entry += PAGE_OFFSET(addr);
+ pde32_4MB_t * large_pde = (pde32_4MB_t *)pde_entry;
+
+ *entry = PDE32_4MB_T_ADDR(*large_pde);
+ *entry += PD32_4MB_PAGE_OFFSET(addr);
return PDE32_ENTRY_LARGE_PAGE;
} else {
*entry = PDE32_T_ADDR(*pde_entry);
} else if ((entry->writable == 0) && (access_type.write == 1)) {
return PT_WRITE_ERROR;
} else if ((entry->user_page == 0) && (access_type.user == 1)) {
- // Check CR0.WP
+ // Check CR0.WP?
return PT_USER_ERROR;
}
} else if ((entry->writable == 0) && (access_type.write == 1)) {
return PT_WRITE_ERROR;
} else if ((entry->user_page == 0) && (access_type.user == 1)) {
- // Check CR0.WP
+ // Check CR0.WP?
return PT_USER_ERROR;
}