X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbacktrace.c;h=f03e84f3bf1e01fc1cabb17178cdec21d6930611;hb=69d60b456b07a0256f08df0d02484f361ce5737c;hp=e10af61db11226cb8881abdaa656e1694fd6e195;hpb=cf4cb9554515c59eddbde38d1cf236339c37f55f;p=sbcl.git
diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c
index e10af61..f03e84f 100644
--- a/src/runtime/backtrace.c
+++ b/src/runtime/backtrace.c
@@ -28,13 +28,13 @@
#include "genesis/primitive-objects.h"
#include "thread.h"
-#ifndef LISP_FEATURE_X86
+#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
/* KLUDGE: Sigh ... I know what the call frame looks like and it had
* better not change. */
struct call_frame {
-#ifndef alpha
+#ifndef LISP_FEATURE_ALPHA
struct call_frame *old_cont;
#else
u32 old_cont;
@@ -45,13 +45,13 @@ struct call_frame {
};
struct call_info {
-#ifndef alpha
+#ifndef LISP_FEATURE_ALPHA
struct call_frame *frame;
#else
u32 frame;
#endif
int interrupted;
-#ifndef alpha
+#ifndef LISP_FEATURE_ALPHA
struct code *code;
#else
u32 code;
@@ -139,7 +139,7 @@ call_info_from_context(struct call_info *info, os_context_t *context)
}
if (info->code != NULL)
info->pc = pc - (unsigned long) info->code -
-#ifndef alpha
+#ifndef LISP_FEATURE_ALPHA
(HEADER_LENGTH(info->code->header) * sizeof(lispobj));
#else
(HEADER_LENGTH(((struct code *)info->code)->header) * sizeof(lispobj));
@@ -156,7 +156,7 @@ previous_info(struct call_info *info)
int free;
if (!cs_valid_pointer_p(info->frame)) {
- printf("Bogus callee value (0x%08x).\n", (unsigned long)info->frame);
+ printf("Bogus callee value (0x%08lx).\n", (unsigned long)info->frame);
return 0;
}
@@ -187,7 +187,7 @@ previous_info(struct call_info *info)
if (info->code != NULL)
info->pc = (unsigned long)native_pointer(info->lra) -
(unsigned long)info->code -
-#ifndef alpha
+#ifndef LISP_FEATURE_ALPHA
(HEADER_LENGTH(info->code->header) * sizeof(lispobj));
#else
(HEADER_LENGTH(((struct code *)info->code)->header) * sizeof(lispobj));
@@ -207,15 +207,15 @@ backtrace(int nframes)
call_info_from_lisp_state(&info);
do {
- printf("entry_points;
#else
function = ((struct code *)info.code)->entry_points;
@@ -244,6 +244,7 @@ backtrace(int nframes)
string = (struct vector *) object;
printf("%s, ", (char *) string->data);
} else
+ /* FIXME: broken from (VECTOR NIL) */
printf("(Not simple string??\?), ");
} else
printf("(Not other pointer??\?), ");
@@ -256,7 +257,7 @@ backtrace(int nframes)
printf("CODE: ???, ");
if (info.lra != NIL)
- printf("LRA: 0x%08x, ", (unsigned long)info.lra);
+ printf("LRA: 0x%08lx, ", (unsigned long)info.lra);
else
printf(", ");