diff options
| author | Neal H. Walfield <neal@gnu.org> | 2009-04-30 20:05:23 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@gnu.org> | 2009-04-30 20:05:23 +0200 |
| commit | 5b45875ff585fb9d495fe4e4ede54b7a39f2e341 (patch) | |
| tree | 4dd06857df99179487fa36008df57666bb33bd5c | |
| parent | d62e6256649e0e5d2106c753299ce57fd0ca62c4 (diff) | |
Fix some warnings. Reverse logic of ASSERTX definition. Fix a printf.
| -rw-r--r-- | viengoos/sysdeps/x86_64/idt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/viengoos/sysdeps/x86_64/idt.c b/viengoos/sysdeps/x86_64/idt.c index 12a0845..a27f1fd 100644 --- a/viengoos/sysdeps/x86_64/idt.c +++ b/viengoos/sysdeps/x86_64/idt.c @@ -334,7 +334,7 @@ int in_interrupt_handler; #endif /* We need to disable interrupts before triggering some asserts... */ -#ifdef NDEBUG +#ifndef NDEBUG # define ASSERTX(x, fmt, ...) \ do { \ if (!(x)) \ @@ -392,6 +392,7 @@ handler (struct interrupt_context *t, bool from_kernel) from_kernel ? "kernel" : "user space", t->err, t->rip, t->cs, t->rflags.raw, RFLAGS_PRINTF (t->rflags), t->rsp, t->ss, cr2, + db6, last_branch_from_ip, last_branch_to_ip, last_exception_from_ip, @@ -400,7 +401,7 @@ handler (struct interrupt_context *t, bool from_kernel) if (current_thread) printf ("Current thread: " OBJECT_NAME_FMT":\n"REGS_FMT"\n", - OBJECT_NAME_PRINTF (current_thread), + OBJECT_NAME_PRINTF ((struct vg_object *) current_thread), REGS_PRINTF (current_thread)); else printf ("current_thread is NULL.\n"); @@ -431,7 +432,8 @@ handler (struct interrupt_context *t, bool from_kernel) #ifndef NDEBUG /* Assert that interrupts are not enabled. */ - struct rflags rflags = { 0 }; + struct rflags rflags; + rflags.raw = 0; asm ("pushfq\n\t" "popq %0" : "=r" (rflags)); assertx (! rflags.if_, |