| 53,7 → 53,7 |
|---|
| { |
| uintptr_t cur; |
| int flags; |
| |
| |
| if (config.cpu_active == 1) { |
| page_mapping_operations = &pt_mapping_operations; |
| |
| 66,12 → 66,12 |
|---|
| flags |= PAGE_GLOBAL; |
| page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags); |
| } |
| |
| |
| exc_register(14, "page_fault", (iroutine) page_fault); |
| write_cr3((uintptr_t) AS_KERNEL->genarch.page_table); |
| } else |
| write_cr3((uintptr_t) AS_KERNEL->genarch.page_table); |
| |
| |
| paging_on(); |
| } |
| |
| 79,7 → 79,7 |
|---|
| uintptr_t hw_map(uintptr_t physaddr, size_t size) |
| { |
| if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) |
| panic("Unable to map physical memory %p (%d bytes)", physaddr, size) |
| panic("Unable to map physical memory %p (%d bytes).", physaddr, size) |
| |
| uintptr_t virtaddr = PA2KA(last_frame); |
| pfn_t i; |
| 101,8 → 101,8 |
|---|
| page = read_cr2(); |
| |
| if (istate->error_word & PFERR_CODE_RSVD) |
| panic("Reserved bit set in page directory.\n"); |
| |
| panic("Reserved bit set in page directory."); |
| |
| if (istate->error_word & PFERR_CODE_RW) |
| access = PF_ACCESS_WRITE; |
| else |
| 109,11 → 109,11 |
|---|
| access = PF_ACCESS_READ; |
| |
| if (as_page_fault(page, access, istate) == AS_PF_FAULT) { |
| fault_if_from_uspace(istate, "Page fault: %#x", page); |
| fault_if_from_uspace(istate, "Page fault: %#x.", page); |
| |
| decode_istate(istate); |
| printf("page fault address: %#lx\n", page); |
| panic("page fault\n"); |
| panic("Page fault."); |
| } |
| } |
| |