-#include "exception.h"
+#include "userprog/exception.h"
#include <inttypes.h>
-#include "lib.h"
-#include "gdt.h"
-#include "interrupt.h"
-#include "thread.h"
+#include <stdio.h>
+#include "userprog/gdt.h"
+#include "threads/interrupt.h"
+#include "threads/thread.h"
static void kill (struct intr_frame *);
static void page_fault (struct intr_frame *);
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 ();
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 ();
}
#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
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));
+
+ /* Turn interrupts back on (they were only off so that we could
+ be assured of reading CR2 before it changed). */
intr_enable ();
/* Determine cause. */
/* 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",