X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finterrupt.c;h=4ab0050c9ceff522dedc962c3f4fb7c91f106a14;hb=f8cae751ac2163f5fe73d5b1372c93ada35dc9e3;hp=3ae505033d02bda812985a703c05573e8bd66ac9;hpb=76a72158378a6447bb3dbce5bae41db48da0d64f;p=pintos-anon

diff --git a/src/threads/interrupt.c b/src/threads/interrupt.c
index 3ae5050..4ab0050 100644
--- a/src/threads/interrupt.c
+++ b/src/threads/interrupt.c
@@ -98,13 +98,13 @@ extern void (*intr_stubs[256]) (void);
 
 intr_handler_func *intr_handlers[256];
 
-void intr_handler (struct intr_args *args);
+void intr_handler (struct intr_frame *args);
 
 bool intr_in_progress;
 bool yield_on_return;
 
 void
-intr_handler (struct intr_args *args) 
+intr_handler (struct intr_frame *args) 
 {
   bool external;
   
@@ -256,10 +256,10 @@ intr_init (void)
 }
 
 void
-intr_unexpected (struct intr_args *regs)
+intr_unexpected (struct intr_frame *regs)
 {
   uint32_t cr2;
   asm ("movl %%cr2, %0" : "=r" (cr2));
-  panic ("Unexpected interrupt 0x%02x, error code %08x, cr2=%08x, eip=%08x",
-         regs->vec_no, regs->error_code, cr2, regs->eip);
+  panic ("Unexpected interrupt 0x%02x, error code %08x, cr2=%08x, eip=%p",
+         regs->vec_no, regs->error_code, cr2, (void *) regs->eip);
 }