X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fbacktrace.c;h=f03e84f3bf1e01fc1cabb17178cdec21d6930611;hb=69d60b456b07a0256f08df0d02484f361ce5737c;hp=d21e4885ed228b1efcde34379ac875038a3de7c2;hpb=78fa16bf55be44cc16845be84d98023e83fb14bc;p=sbcl.git
diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c
index d21e488..f03e84f 100644
--- a/src/runtime/backtrace.c
+++ b/src/runtime/backtrace.c
@@ -34,7 +34,7 @@
* 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;
@@ -257,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(", ");