projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of THREAD_JOIN_IMPLEMENTED by adding thread_join() stub.
[pintos-anon]
/
src
/
userprog
/
exception.c
diff --git
a/src/userprog/exception.c
b/src/userprog/exception.c
index 745adaa086e4614245748ddd3cbc6c6262b1f5de..dcfccb85f998da6b5e584da19b891819dc7f776f 100644
(file)
--- a/
src/userprog/exception.c
+++ b/
src/userprog/exception.c
@@
-136,7
+136,7
@@
page_fault (struct intr_frame *f)
See [IA32-v2a] "MOV--Move to/from Control Registers" and
[IA32-v3] 5.14 "Interrupt 14--Page Fault Exception
(#PF)". */
See [IA32-v2a] "MOV--Move to/from Control Registers" and
[IA32-v3] 5.14 "Interrupt 14--Page Fault Exception
(#PF)". */
- asm ("mov
l %%cr2, %0
" : "=r" (fault_addr));
+ asm ("mov
%0, %%cr2
" : "=r" (fault_addr));
/* Turn interrupts back on (they were only off so that we could
be assured of reading CR2 before it changed). */
/* Turn interrupts back on (they were only off so that we could
be assured of reading CR2 before it changed). */