Change -nv to -v, -ns to -s, for consistency.

[pintos-anon] / src / userprog / exception.c

diff --git a/src/userprog/exception.c b/src/userprog/exception.c
index 0d5461a31078a20145490c668ae5fd302f51569f..f31f7a884a323b12b48c6c598d1fa6689fc57fa3 100644 (file)
--- a/src/userprog/exception.c
+++ b/src/userprog/exception.c
@@ -1,7 +1,7 @@
-#include "exception.h"
+#include "userprog/exception.h"

 #include <inttypes.h>
 #include <inttypes.h>

-#include "gdt.h"
-#include "lib/lib.h"
+#include <stdio.h>
+#include "userprog/gdt.h"

 #include "threads/interrupt.h"
 #include "threads/thread.h"
 
 #include "threads/interrupt.h"
 #include "threads/thread.h"
 


@@ -73,9 +73,8 @@ kill (struct intr_frame *f)
     case SEL_UCSEG:
       /* User's code segment, so it's a user exception, as we
          expected.  Kill the user process.  */
     case SEL_UCSEG:
       /* User's code segment, so it's a user exception, as we
          expected.  Kill the user process.  */

-      printk ("%s: dying due to interrupt %#04x (%s).\n",
-              thread_name (thread_current ()),
-              f->vec_no, intr_name (f->vec_no));
+      printf ("%s: dying due to interrupt %#04x (%s).\n",
+              thread_name (), f->vec_no, intr_name (f->vec_no));

       intr_dump_frame (f);
       thread_exit (); 
 
       intr_dump_frame (f);
       thread_exit (); 
 


@@ -90,7 +89,7 @@ kill (struct intr_frame *f)
     default:
       /* Some other code segment?  Shouldn't happen.  Panic the
          kernel. */
     default:
       /* Some other code segment?  Shouldn't happen.  Panic the
          kernel. */

-      printk ("Interrupt %#04x (%s) in unknown segment %04x\n",
+      printf ("Interrupt %#04x (%s) in unknown segment %04x\n",

              f->vec_no, intr_name (f->vec_no), f->cs);
       thread_exit ();
     }
              f->vec_no, intr_name (f->vec_no), f->cs);
       thread_exit ();
     }


@@ -102,7 +101,8 @@ kill (struct intr_frame *f)
 #define PF_U 0x4    /* 0: kernel, 1: user process. */
 
 /* Page fault handler.  This is a skeleton that must be filled in
 #define PF_U 0x4    /* 0: kernel, 1: user process. */
 
 /* Page fault handler.  This is a skeleton that must be filled in

-   to implement virtual memory.
+   to implement virtual memory.  Some solutions to project 2 may
+   also require modifying this code.

 
    At entry, the address that faulted is in CR2 (Control Register
    2) and information about the fault, formatted as described in
 
    At entry, the address that faulted is in CR2 (Control Register
    2) and information about the fault, formatted as described in


@@ -114,19 +114,19 @@ kill (struct intr_frame *f)
 static void
 page_fault (struct intr_frame *f) 
 {
 static void
 page_fault (struct intr_frame *f) 
 {

-  bool not_present, write, user;
-  uint32_t fault_addr;
-
-  /* Obtain faulting address, then turn interrupts back on.
-     (Interrupts were only off so that we could be assured of
-     reading CR2 before it changed.)
-
-     The faulting address is not necesarily the address of the
-     instruction that caused the fault--that's in F's eip
-     member.  Rather, it's the linear address that was accessed
-     to cause the fault, which is probably an address of data,
-     not code. */
+  bool not_present;  /* True: not-present page, false: writing r/o page. */
+  bool write;        /* True: access was write, false: access was read. */
+  bool user;         /* True: access by user, false: access by kernel. */
+  void *fault_addr;  /* Fault address. */
+
+  /* Obtain faulting address, the virtual address that was
+     accessed to cause the fault.  It may point to code or to
+     data.  It is not necessarily the address of the instruction
+     that caused the fault (that's f->eip).  */

   asm ("movl %%cr2, %0" : "=r" (fault_addr));
   asm ("movl %%cr2, %0" : "=r" (fault_addr));

+
+  /* Turn interrupts back on (they were only off so that we could
+     be assured of reading CR2 before it changed). */

   intr_enable ();
 
   /* Determine cause. */
   intr_enable ();
 
   /* Determine cause. */


@@ -137,7 +137,7 @@ page_fault (struct intr_frame *f)
   /* To implement virtual memory, delete the rest of the function
      body, and replace it with code that brings in the page to
      which fault_addr refers. */
   /* To implement virtual memory, delete the rest of the function
      body, and replace it with code that brings in the page to
      which fault_addr refers. */

-  printk ("Page fault at %08"PRIx32": %s error %s page in %s context.\n",
+  printf ("Page fault at %p: %s error %s page in %s context.\n",

           fault_addr,
           not_present ? "not present" : "rights violation",
           write ? "writing" : "reading",
           fault_addr,
           not_present ? "not present" : "rights violation",
           write ? "writing" : "reading",