From 6a466fe48d37b275f4d0c2d1b606dc5510b165db Mon Sep 17 00:00:00 2001
From: Alexander Huddleston <shadow8t4@tamu.edu>
Date: Tue, 27 Jun 2017 04:07:08 -0500
Subject: [PATCH] Still debugging. Something wrong with writing to pages. Going
 to give it another go after bed.

---
 MP3/MP3_Sources/kernel.C     |  1 -
 MP3/MP3_Sources/page_table.C | 19 +++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/MP3/MP3_Sources/kernel.C b/MP3/MP3_Sources/kernel.C
index c252dac..bb97e13 100755
--- a/MP3/MP3_Sources/kernel.C
+++ b/MP3/MP3_Sources/kernel.C
@@ -173,7 +173,6 @@ int main() {
     for (i=0; i<NACCESS; i++) {
         foo[i] = i;
     }
-
     Console::puts("DONE WRITING TO MEMORY. Now testing...\n");
     
     for (i=0; i<NACCESS; i++) {
diff --git a/MP3/MP3_Sources/page_table.C b/MP3/MP3_Sources/page_table.C
index d38c1c0..2aa4753 100644
--- a/MP3/MP3_Sources/page_table.C
+++ b/MP3/MP3_Sources/page_table.C
@@ -32,7 +32,13 @@ PageTable::PageTable()
   unsigned long tempaddr = 0; // Temporary address iterator.
 
   // We need to map the first 4MB.
-  for(unsigned int i = 0; i < 1024; i++)
+  for(unsigned int i = 0; i < 512; i++)
+  {
+    page_table[i] = tempaddr | 3; // set bits 0 and 1 to present and read/write respectively
+    tempaddr += 4096; // 4096 = 4kb
+  }
+  
+  for(unsigned int i = 512; i < 1024; i++)
   {
     page_table[i] = tempaddr | 3; // set bits 0 and 1 to present and read/write respectively
     tempaddr += 4096; // 4096 = 4kb
@@ -73,16 +79,21 @@ void PageTable::enable_paging()
 
 void PageTable::handle_fault(REGS * _r)
 {
-  unsigned long temp_addr = (process_mem_pool->get_frames(1));
+  unsigned long temp_addr = (kernel_mem_pool->get_frames(1));
+
   ((unsigned long *) ((unsigned long *) current_page_table->page_directory)[0])[temp_addr] 
     = ((unsigned long *) ((unsigned long *) current_page_table->page_directory)[0])[temp_addr] | 3;
 
   Console::puts("\nerror code: ");
-  Console::puti(_r->err_code);
+Console::puti(_r->err_code);
 
   unsigned char mask = 0x00;
-  read_cr2();
+  Console::puts("\naddress: ");
+Console::puti(read_cr2());
   
+  Console::puts("\naddress: ");
+Console::puti(read_cr3());
+
   Console::puts("\nhandled page fault\n");
 }