From cc4ded85a8f3dca9eb0d651d0200fccb1893b6c6 Mon Sep 17 00:00:00 2001 From: Alexander Huddleston Date: Tue, 27 Jun 2017 02:46:52 -0500 Subject: [PATCH] Transferring changes. --- MP3/MP3_Sources/kernel.C | 3 +-- MP3/MP3_Sources/page_table.C | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/MP3/MP3_Sources/kernel.C b/MP3/MP3_Sources/kernel.C index 733cef8..c252dac 100755 --- a/MP3/MP3_Sources/kernel.C +++ b/MP3/MP3_Sources/kernel.C @@ -157,7 +157,6 @@ int main() { PageTable::enable_paging(); - for(;;); Console::puts("WE TURNED ON PAGING!\n"); Console::puts("If we see this message, the page tables have been\n"); Console::puts("set up mostly correctly.\n"); @@ -176,7 +175,7 @@ int main() { } Console::puts("DONE WRITING TO MEMORY. Now testing...\n"); - + for (i=0; iget_frames(1); Console::puts("\nerror code: "); Console::puti(_r->err_code); unsigned char mask = 0x00; - - read_cr2(); -*/ - assert(false); + Console::puts("\nhandled page fault\n"); }