-/* code for low-level debugging output */
+/* code for low-level debugging/diagnostic output */
/*
* This software is part of the SBCL system. See the README file for
*/
/*
- * $Header$
- */
-
-/*
* FIXME:
- * 1. Ordinary users won't get much out of this code, so it shouldn't
- * be compiled into the ordinary build of the system. Probably it
- * should be made conditional on the SB-SHOW target feature.
- * 2. Some of the code in here (subtype_Names[] and the various
- * foo_slots[], at least) is deeply broken, depending on fixed
- * (and already out-of-date) values in sbcl.h.
+ * Some of the code in here (subtype_Names[] and the various
+ * foo_slots[], at least) is deeply broken, depending on fixed
+ * (and already out-of-date) values in sbcl.h.
*/
#include <stdio.h>
#include "print.h"
#include "runtime.h"
+
+/* This file can be skipped if we're not supporting LDB. */
+#if defined(LISP_FEATURE_SB_LDB)
+
#include "sbcl.h"
#include "monitor.h"
#include "vars.h"
static int max_depth = 5, brief_depth = 2, cur_depth = 0;
static int max_length = 5;
static boolean dont_descend = 0, skip_newline = 0;
-static cur_clock = 0;
+static int cur_clock = 0;
static void print_obj(char *prefix, lispobj obj);
-#define NEWLINE if (continue_p(1)) newline(NULL); else return;
+#define NEWLINE_OR_RETURN if (continue_p(1)) newline(NULL); else return;
char *lowtag_Names[] = {
"even fixnum",
break;
default:
- printf(": data=%ld", (obj>>8)&0xffffff);
+ printf(": data=%ld", (long) (obj>>8)&0xffffff);
break;
}
}
else {
putchar('(');
while (LowtagOf(obj) == type_ListPointer) {
- struct cons *cons = (struct cons *)PTR(obj);
+ struct cons *cons = (struct cons *)native_pointer(obj);
if (space)
putchar(' ');
} else if (obj == NIL) {
printf(" (NIL)");
} else {
- struct cons *cons = (struct cons *)PTR(obj);
+ struct cons *cons = (struct cons *)native_pointer(obj);
print_obj("car: ", cons->car);
print_obj("cdr: ", cons->cdr);
static void brief_struct(lispobj obj)
{
printf("#<ptr to 0x%08lx instance>",
- ((struct instance *)PTR(obj))->slots[0]);
+ (unsigned long) ((struct instance *)native_pointer(obj))->slots[0]);
}
static void print_struct(lispobj obj)
{
- struct instance *instance = (struct instance *)PTR(obj);
+ struct instance *instance = (struct instance *)native_pointer(obj);
int i;
char buffer[16];
- print_obj("type: ", ((struct instance *)PTR(obj))->slots[0]);
+ print_obj("type: ", ((struct instance *)native_pointer(obj))->slots[0]);
for (i = 1; i < HeaderValue(instance->header); i++) {
sprintf(buffer, "slot %d: ", i);
print_obj(buffer, instance->slots[i]);
struct vector *vector;
char *charptr;
- ptr = (lispobj *) PTR(obj);
+ ptr = (lispobj *) native_pointer(obj);
if (!is_valid_lisp_addr((os_vm_address_t)obj)) {
printf("(invalid address)");
switch (type) {
case type_SymbolHeader:
symbol = (struct symbol *)ptr;
- vector = (struct vector *)PTR(symbol->name);
+ vector = (struct vector *)native_pointer(symbol->name);
for (charptr = (char *)vector->data; *charptr != '\0'; charptr++) {
if (*charptr == '"')
putchar('\\');
int count, type, index;
char *cptr, buffer[16];
- ptr = (lispobj*) PTR(obj);
+ ptr = (lispobj*) native_pointer(obj);
if (ptr == NULL) {
printf(" (NULL Pointer)");
return;
print_obj("header: ", header);
if (LowtagOf(header) != type_OtherImmediate0 && LowtagOf(header) != type_OtherImmediate1) {
- NEWLINE;
+ NEWLINE_OR_RETURN;
printf("(invalid header object)");
return;
}
switch (type) {
case type_Bignum:
ptr += count;
- NEWLINE;
+ NEWLINE_OR_RETURN;
printf("0x");
while (count-- > 0)
- printf("%08lx", *--ptr);
+ printf("%08lx", (unsigned long) *--ptr);
break;
case type_Ratio:
break;
case type_SingleFloat:
- NEWLINE;
- printf("%g", ((struct single_float *)PTR(obj))->value);
+ NEWLINE_OR_RETURN;
+ printf("%g", ((struct single_float *)native_pointer(obj))->value);
break;
case type_DoubleFloat:
- NEWLINE;
- printf("%g", ((struct double_float *)PTR(obj))->value);
+ NEWLINE_OR_RETURN;
+ printf("%g", ((struct double_float *)native_pointer(obj))->value);
break;
#ifdef type_LongFloat
case type_LongFloat:
- NEWLINE;
- printf("%Lg", ((struct long_float *)PTR(obj))->value);
+ NEWLINE_OR_RETURN;
+ printf("%Lg", ((struct long_float *)native_pointer(obj))->value);
break;
#endif
#ifdef type_ComplexSingleFloat
case type_ComplexSingleFloat:
- NEWLINE;
- printf("%g", ((struct complex_single_float *)PTR(obj))->real);
- NEWLINE;
- printf("%g", ((struct complex_single_float *)PTR(obj))->imag);
+ NEWLINE_OR_RETURN;
+ printf("%g", ((struct complex_single_float *)native_pointer(obj))->real);
+ NEWLINE_OR_RETURN;
+ printf("%g", ((struct complex_single_float *)native_pointer(obj))->imag);
break;
#endif
#ifdef type_ComplexDoubleFloat
case type_ComplexDoubleFloat:
- NEWLINE;
- printf("%g", ((struct complex_double_float *)PTR(obj))->real);
- NEWLINE;
- printf("%g", ((struct complex_double_float *)PTR(obj))->imag);
+ NEWLINE_OR_RETURN;
+ printf("%g", ((struct complex_double_float *)native_pointer(obj))->real);
+ NEWLINE_OR_RETURN;
+ printf("%g", ((struct complex_double_float *)native_pointer(obj))->imag);
break;
#endif
#ifdef type_ComplexLongFloat
case type_ComplexLongFloat:
- NEWLINE;
- printf("%Lg", ((struct complex_long_float *)PTR(obj))->real);
- NEWLINE;
- printf("%Lg", ((struct complex_long_float *)PTR(obj))->imag);
+ NEWLINE_OR_RETURN;
+ printf("%Lg", ((struct complex_long_float *)native_pointer(obj))->real);
+ NEWLINE_OR_RETURN;
+ printf("%Lg", ((struct complex_long_float *)native_pointer(obj))->imag);
break;
#endif
case type_SimpleString:
- NEWLINE;
+ NEWLINE_OR_RETURN;
cptr = (char *)(ptr+1);
putchar('"');
while (length-- > 0)
break;
case type_SimpleVector:
- case type_InstanceHeader:
- NEWLINE;
+ NEWLINE_OR_RETURN;
printf("length = %ld", length);
ptr++;
index = 0;
}
break;
+ case type_InstanceHeader:
+ NEWLINE_OR_RETURN;
+ printf("length = %ld", (long) count);
+ index = 0;
+ while (count-- > 0) {
+ sprintf(buffer, "%d: ", index++);
+ print_obj(buffer, *ptr++);
+ }
+ break;
+
case type_SimpleArray:
case type_SimpleBitVector:
case type_SimpleArrayUnsignedByte2:
print_slots(code_slots, count-1, ptr);
break;
- case type_FunctionHeader:
- case type_ClosureFunctionHeader:
+ case type_SimpleFunHeader:
+ case type_ClosureFunHeader:
print_slots(fn_slots, 5, ptr);
break;
break;
case type_Sap:
- NEWLINE;
+ NEWLINE_OR_RETURN;
#ifndef alpha
- printf("0x%08lx", *ptr);
+ printf("0x%08lx", (unsigned long) *ptr);
#else
- printf("0x%016lx", *(long*)(ptr+1));
+ printf("0x%016lx", *(lispobj*)(ptr+1));
#endif
break;
case type_BaseChar:
case type_UnboundMarker:
- NEWLINE;
+ NEWLINE_OR_RETURN;
printf("pointer to an immediate?");
break;
break;
default:
- NEWLINE;
+ NEWLINE_OR_RETURN;
printf("Unknown header object?");
break;
}
char buffer[256];
boolean verbose = cur_depth < brief_depth;
-
if (!continue_p(verbose))
return;
if (var != NULL && var_clock(var) == cur_clock)
dont_descend = 1;
- if (var == NULL && (obj & type_FunctionPointer & type_ListPointer & type_InstancePointer & type_OtherPointer) != 0)
+ if (var == NULL &&
+ /* FIXME: What does this "x & y & z & .." expression mean? */
+ (obj & type_FunPointer & type_ListPointer & type_InstancePointer & type_OtherPointer) != 0)
var = define_var(NULL, obj, 0);
if (var != NULL)
}
else
newline(NULL);
- printf("%s0x%08lx: ", prefix, obj);
+ printf("%s0x%08lx: ", prefix, (unsigned long) obj);
if (cur_depth < brief_depth) {
fputs(lowtag_Names[type], stdout);
(*verbose_fns[type])(obj);
print_obj("", obj);
putchar('\n');
}
+
+#else
+
+void
+brief_print(lispobj obj)
+{
+ printf("lispobj 0x%lx\n", (unsigned long)obj);
+}
+
+#endif /* defined(LISP_FEATURE_SB_LDB) */