X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finterrupt.c;h=380544a1779e6a75a2e08baa8b81ceb5ad68c67e;hb=f329c5c10351234a6a5e2757c5f070f02b73639c;hp=c6ca2bd0060339b19aa38d92655564a4869878e1;hpb=e6e58461d3040e76e501a9dc9d4b38c5c825dc9c;p=pintos-anon diff --git a/src/threads/interrupt.c b/src/threads/interrupt.c index c6ca2bd..380544a 100644 --- a/src/threads/interrupt.c +++ b/src/threads/interrupt.c @@ -54,7 +54,7 @@ intr_get_level (void) /* Push the flags register on the processor stack, then pop the value off the stack into `flags'. See [IA32-v2b] "PUSHF" and "POP" and [IA32-v3] 5.8.1. */ - asm volatile ("pushfl; popl %0" : "=g" (flags)); + asm volatile ("pushf; pop %0" : "=g" (flags)); return flags & FLAG_IF ? INTR_ON : INTR_OFF; } @@ -368,7 +368,7 @@ intr_dump_frame (const struct intr_frame *f) See [IA32-v2a] "MOV--Move to/from Control Registers" and [IA32-v3] 5.14 "Interrupt 14--Page Fault Exception (#PF)". */ - asm ("movl %%cr2, %0" : "=r" (cr2)); + asm ("mov %0, %%cr2" : "=r" (cr2)); printf ("Interrupt %#04x (%s) at eip=%p\n", f->vec_no, intr_names[f->vec_no], f->eip);