X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fuserprog%2Fexception.c;h=4f3e4f9d120efcef5ddecf1fb845956e0e44f40d;hb=24445a35e861ddb50df05731ca4635fbd36e04a4;hp=4e9d28ffd321204709afaabc0ea22f023e53296f;hpb=f2f8875638593bd5365cfd6a5ba7c9578e52322f;p=pintos-anon diff --git a/src/userprog/exception.c b/src/userprog/exception.c index 4e9d28f..4f3e4f9 100644 --- a/src/userprog/exception.c +++ b/src/userprog/exception.c @@ -74,8 +74,7 @@ kill (struct intr_frame *f) /* User's code segment, so it's a user exception, as we expected. Kill the user process. */ printf ("%s: dying due to interrupt %#04x (%s).\n", - thread_name (thread_current ()), - f->vec_no, intr_name (f->vec_no)); + thread_name (), f->vec_no, intr_name (f->vec_no)); intr_dump_frame (f); 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 - 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