0.9.0.7:

[sbcl.git] / src / runtime / interr.c

diff --git a/src/runtime/interr.c b/src/runtime/interr.c
index cb46573..fc66ac9 100644 (file)
--- a/src/runtime/interr.c
+++ b/src/runtime/interr.c
@@ -17,11 +17,11 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
+#include "sbcl.h"
 #include "arch.h"
 #include "signal.h"
 
 #include "runtime.h"
-#include "sbcl.h"
 #include "interr.h"
 #include "print.h"
 #include "lispregs.h"
@@ -112,9 +112,9 @@ describe_internal_error(os_context_t *context)
            brief_print(*os_context_register_addr(context, offset));
            break;
 
-       case sc_BaseCharReg:
+       case sc_CharacterReg:
            ch = *os_context_register_addr(context, offset);
-#ifdef __i386__
+#ifdef LISP_FEATURE_X86
            if (offset&1)
                ch = ch>>8;
            ch = ch & 0xff;
@@ -136,13 +136,13 @@ describe_internal_error(os_context_t *context)
 #ifdef sc_WordPointerReg
        case sc_WordPointerReg:
 #endif
-           printf("\t0x%08x\n", *os_context_register_addr(context, offset));
+           printf("\t0x%08lx\n", (unsigned long) *os_context_register_addr(context, offset));
            break;
        case sc_SignedReg:
-           printf("\t%d\n", *os_context_register_addr(context, offset));
+           printf("\t%ld\n", (long) *os_context_register_addr(context, offset));
            break;
        case sc_UnsignedReg:
-           printf("\t%u\n", *os_context_register_addr(context, offset));
+           printf("\t%lu\n", (unsigned long) *os_context_register_addr(context, offset));
            break;
 #ifdef sc_SingleFloatReg
        case sc_SingleFloatReg: