projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.20.19:
[sbcl.git]
/
src
/
runtime
/
backtrace.c
diff --git
a/src/runtime/backtrace.c
b/src/runtime/backtrace.c
index
c4840cc
..
429807f
100644
(file)
--- a/
src/runtime/backtrace.c
+++ b/
src/runtime/backtrace.c
@@
-15,8
+15,8
@@
#include <stdio.h>
#include <signal.h>
#include <stdio.h>
#include <signal.h>
-#include "runtime.h"
#include "sbcl.h"
#include "sbcl.h"
+#include "runtime.h"
#include "globals.h"
#include "os.h"
#include "interrupt.h"
#include "globals.h"
#include "os.h"
#include "interrupt.h"
@@
-28,7
+28,7
@@
#include "genesis/primitive-objects.h"
#include "thread.h"
#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. */
/* KLUDGE: Sigh ... I know what the call frame looks like and it had
* better not change. */
@@
-156,7
+156,7
@@
previous_info(struct call_info *info)
int free;
if (!cs_valid_pointer_p(info->frame)) {
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;
}
return 0;
}
@@
-207,13
+207,13
@@
backtrace(int nframes)
call_info_from_lisp_state(&info);
do {
call_info_from_lisp_state(&info);
do {
- printf("<Frame 0x%08x%s, ", (unsigned long) info.frame,
+ printf("<Frame 0x%08lx%s, ", (unsigned long) info.frame,
info.interrupted ? " [interrupted]" : "");
if (info.code != (struct code *) 0) {
lispobj function;
info.interrupted ? " [interrupted]" : "");
if (info.code != (struct code *) 0) {
lispobj function;
- printf("CODE: 0x%08X, ", (unsigned long) info.code | OTHER_POINTER_LOWTAG);
+ printf("CODE: 0x%08lX, ", (unsigned long) info.code | OTHER_POINTER_LOWTAG);
#ifndef alpha
function = info.code->entry_points;
#ifndef alpha
function = info.code->entry_points;
@@
-244,6
+244,7
@@
backtrace(int nframes)
string = (struct vector *) object;
printf("%s, ", (char *) string->data);
} else
string = (struct vector *) object;
printf("%s, ", (char *) string->data);
} else
+ /* FIXME: broken from (VECTOR NIL) */
printf("(Not simple string??\?), ");
} else
printf("(Not other pointer??\?), ");
printf("(Not simple string??\?), ");
} else
printf("(Not other pointer??\?), ");
@@
-256,7
+257,7
@@
backtrace(int nframes)
printf("CODE: ???, ");
if (info.lra != NIL)
printf("CODE: ???, ");
if (info.lra != NIL)
- printf("LRA: 0x%08x, ", (unsigned long)info.lra);
+ printf("LRA: 0x%08lx, ", (unsigned long)info.lra);
else
printf("<no LRA>, ");
else
printf("<no LRA>, ");