#include "gencgc-alloc-region.h" /* genesis/thread.h needs this */
#include "genesis/static-symbols.h"
#include "genesis/primitive-objects.h"
-
#include "genesis/static-symbols.h"
-
-
+#include "genesis/tagnames.h"
static int max_lines = 20, cur_lines = 0;
static int max_depth = 5, brief_depth = 2, cur_depth = 0;
#define NEWLINE_OR_RETURN if (continue_p(1)) newline(NULL); else return;
-/* FIXME: This should be auto-generated by whatever generates
- constants.h so we don't have to maintain this twice! */
-#ifdef LISP_FEATURE_X86_64
-char *lowtag_Names[] = {
- "even fixnum",
- "instance pointer",
- "other immediate [0]",
- "unknown [3]",
- "unknown [4]",
- "unknown [5]",
- "other immediate [1]",
- "list pointer",
- "odd fixnum",
- "function pointer",
- "other immediate [2]",
- "unknown [11]",
- "unknown [12]",
- "unknown [13]",
- "other immediate [3]",
- "other pointer"
-};
-#else
-char *lowtag_Names[] = {
- "even fixnum",
- "instance pointer",
- "other immediate [0]",
- "list pointer",
- "odd fixnum",
- "function pointer",
- "other immediate [1]",
- "other pointer"
-};
-#endif
-
-/* FIXME: Yikes! This table implicitly depends on the values in sbcl.h,
- * but doesn't actually depend on them, so if they change, it gets
- * all broken. We should either get rid of it or
- * rewrite the code so that it's cleanly initialized by gc_init_tables[]
- * in a way which varies correctly with the values in sbcl.h. */
-char *subtype_Names[] = {
- "unused 0",
- "unused 1",
- "bignum",
- "ratio",
- "single float",
- "double float",
-#ifdef LONG_FLOAT_WIDETAG
- "long float",
-#endif
- "complex",
-#ifdef COMPLEX_SINGLE_FLOAT_WIDETAG
- "complex single float",
-#endif
-#ifdef COMPLEX_DOUBLE_FLOAT_WIDETAG
- "complex double float",
-#endif
-#ifdef COMPLEX_LONG_FLOAT_WIDETAG
- "complex long float",
-#endif
- "simple-array",
- "simple-string",
- "simple-bit-vector",
- "simple-vector",
- "(simple-array (unsigned-byte 2) (*))",
- "(simple-array (unsigned-byte 4) (*))",
- "(simple-array (unsigned-byte 8) (*))",
- "(simple-array (unsigned-byte 16) (*))",
- "(simple-array (unsigned-byte 32) (*))",
-#ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG
- "(simple-array (signed-byte 8) (*))",
-#endif
-#ifdef SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG
- "(simple-array (signed-byte 16) (*))",
-#endif
-#ifdef SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG
- "(simple-array fixnum (*))",
-#endif
-#ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG
- "(simple-array (signed-byte 32) (*))",
-#endif
- "(simple-array single-float (*))",
- "(simple-array double-float (*))",
-#ifdef SIMPLE_ARRAY_LONG_FLOAT_WIDETAG
- "(simple-array long-float (*))",
-#endif
-#ifdef SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG
- "(simple-array (complex single-float) (*))",
-#endif
-#ifdef SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG
- "(simple-array (complex double-float) (*))",
-#endif
-#ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG
- "(simple-array (complex long-float) (*))",
-#endif
- "complex-string",
- "complex-bit-vector",
- "(array * (*))",
- "array",
- "code header",
- "function header",
- "closure header",
- "funcallable-instance header",
- "unused function header 1",
- "unused function header 2",
- "unused function header 3",
- "closure function header",
- "return PC header",
- "value cell header",
- "symbol header",
- "character",
- "SAP",
- "unbound marker",
- "weak pointer",
- "instance header",
- "fdefn"
-};
-
static void indent(int in)
{
static char *spaces = " ";
}
+static void print_unknown(lispobj obj)
+{
+ printf("unknown object: %p", (void *)obj);
+}
+
static void brief_fixnum(lispobj obj)
{
+ /* KLUDGE: Rather than update the tables in print_obj(), we
+ declare all fixnum-or-unknown tags to be fixnums and sort it
+ out here with a guard clause. */
+ if (!fixnump(obj)) return print_unknown(obj);
+
#ifndef LISP_FEATURE_ALPHA
printf("%ld", ((long)obj)>>2);
#else
static void print_fixnum(lispobj obj)
{
+ /* KLUDGE: Rather than update the tables in print_obj(), we
+ declare all fixnum-or-unknown tags to be fixnums and sort it
+ out here with a guard clause. */
+ if (!fixnump(obj)) return print_unknown(obj);
+
#ifndef LISP_FEATURE_ALPHA
printf(": %ld", ((long)obj)>>2);
#else
static void brief_otherimm(lispobj obj)
{
int type, c;
- unsigned int idx;
char buffer[10];
type = widetag_of(obj);
break;
default:
- idx = type >> 2;
- if (idx < (sizeof(lowtag_Names) / sizeof(char *)))
- printf("%s", lowtag_Names[idx]);
- else
- printf("unknown type (0x%0x)", type);
+ printf("%s", widetag_names[type >> 2]);
break;
}
}
static void print_otherimm(lispobj obj)
{
- int type;
-
- unsigned int idx;
-
- type = widetag_of(obj);
- idx = type >> 2;
-
- if (idx < (sizeof(lowtag_Names) / sizeof(char *)))
- printf(", %s", lowtag_Names[idx]);
- else
- printf(", unknown type (0x%0x)", type);
+ printf(", %s", widetag_names[widetag_of(obj) >> 2]);
switch (widetag_of(obj)) {
case CHARACTER_WIDETAG:
}
}
-#ifdef LISP_FEATURE_X86_64
-static void print_unknown(lispobj obj)
-{
- printf("unknown object: %p", (void *)obj);
-}
-#endif
-
static void print_list(lispobj obj)
{
if (!is_valid_lisp_addr((os_vm_address_t)native_pointer(obj))) {
static void brief_struct(lispobj obj)
{
- printf("#<ptr to 0x%08lx instance>",
- (unsigned long) ((struct instance *)native_pointer(obj))->slots[0]);
+ struct instance *instance = (struct instance *)native_pointer(obj);
+ if (!is_valid_lisp_addr((os_vm_address_t)instance)) {
+ printf("(invalid address)");
+ } else {
+ printf("#<ptr to 0x%08lx instance>",
+ (unsigned long) instance->slots[0]);
+ }
}
static void print_struct(lispobj obj)
struct instance *instance = (struct instance *)native_pointer(obj);
unsigned int i;
char buffer[16];
- 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]);
+ if (!is_valid_lisp_addr((os_vm_address_t)instance)) {
+ printf("(invalid address)");
+ } else {
+ 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]);
+ }
}
}
}
}
-/* FIXME: Yikes again! This, like subtype_Names[], needs to depend
- * on the values in sbcl.h (or perhaps be generated automatically
- * by GENESIS as part of sbcl.h). */
+/* FIXME: Yikes! This needs to depend on the values in sbcl.h (or
+ * perhaps be generated automatically by GENESIS as part of
+ * sbcl.h). */
static char *symbol_slots[] = {"value: ", "hash: ",
"plist: ", "name: ", "package: ",
#ifdef LISP_FEATURE_SB_THREAD
}
header = *ptr++;
- length = (*ptr) >> 2;
- count = header>>8;
+ length = fixnum_value(*ptr);
+ count = HeaderValue(header);
type = widetag_of(header);
print_obj("header: ", header);
- if (lowtag_of(header) != OTHER_IMMEDIATE_0_LOWTAG &&
- lowtag_of(header) != OTHER_IMMEDIATE_1_LOWTAG) {
+ if (!other_immediate_lowtag_p(header)) {
NEWLINE_OR_RETURN;
printf("(invalid header object)");
return;
case SIMPLE_BIT_VECTOR_WIDETAG:
case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG:
case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG:
+ case SIMPLE_ARRAY_UNSIGNED_BYTE_7_WIDETAG:
case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG:
+ case SIMPLE_ARRAY_UNSIGNED_BYTE_15_WIDETAG:
case SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG:
+
+ case SIMPLE_ARRAY_UNSIGNED_FIXNUM_WIDETAG:
+
+ case SIMPLE_ARRAY_UNSIGNED_BYTE_31_WIDETAG:
case SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG:
+#ifdef SIMPLE_ARRAY_UNSIGNED_BYTE_63_WIDETAG
+ case SIMPLE_ARRAY_UNSIGNED_BYTE_63_WIDETAG:
+#endif
+#ifdef SIMPLE_ARRAY_UNSIGNED_BYTE_64_WIDETAG
+ case SIMPLE_ARRAY_UNSIGNED_BYTE_64_WIDETAG:
+#endif
#ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG
case SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG:
#endif
#ifdef SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG
case SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG:
#endif
-#ifdef SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG
- case SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG:
-#endif
+
+ case SIMPLE_ARRAY_FIXNUM_WIDETAG:
+
#ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG
case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG:
#endif
+#ifdef SIMPLE_ARRAY_SIGNED_BYTE_64_WIDETAG
+ case SIMPLE_ARRAY_SIGNED_BYTE_64_WIDETAG:
+#endif
case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG:
case SIMPLE_ARRAY_DOUBLE_FLOAT_WIDETAG:
#ifdef SIMPLE_ARRAY_LONG_FLOAT_WIDETAG
{
#ifdef LISP_FEATURE_X86_64
static void (*verbose_fns[])(lispobj obj)
- = {print_fixnum, print_struct, print_otherimm, print_unknown,
- print_unknown, print_unknown, print_otherimm, print_list,
- print_fixnum, print_otherptr, print_otherimm, print_unknown,
- print_unknown, print_unknown, print_otherimm, print_otherptr};
+ = {print_fixnum, print_otherimm, print_fixnum, print_struct,
+ print_fixnum, print_otherimm, print_fixnum, print_list,
+ print_fixnum, print_otherimm, print_fixnum, print_otherptr,
+ print_fixnum, print_otherimm, print_fixnum, print_otherptr};
static void (*brief_fns[])(lispobj obj)
- = {brief_fixnum, brief_struct, brief_otherimm, print_unknown,
- print_unknown, print_unknown, brief_otherimm, brief_list,
- brief_fixnum, brief_otherptr, brief_otherimm, print_unknown,
- print_unknown, print_unknown,brief_otherimm, brief_otherptr};
+ = {brief_fixnum, brief_otherimm, brief_fixnum, brief_struct,
+ brief_fixnum, brief_otherimm, brief_fixnum, brief_list,
+ brief_fixnum, brief_otherimm, brief_fixnum, brief_otherptr,
+ brief_fixnum, brief_otherimm, brief_fixnum, brief_otherptr};
#else
static void (*verbose_fns[])(lispobj obj)
= {print_fixnum, print_struct, print_otherimm, print_list,
if (var != NULL && var_clock(var) == cur_clock)
dont_descend = 1;
- if (var == NULL &&
- ((obj & LOWTAG_MASK) == FUN_POINTER_LOWTAG ||
- (obj & LOWTAG_MASK) == LIST_POINTER_LOWTAG ||
- (obj & LOWTAG_MASK) == INSTANCE_POINTER_LOWTAG ||
- (obj & LOWTAG_MASK) == OTHER_POINTER_LOWTAG))
+ if (var == NULL && is_lisp_pointer(obj))
var = define_var(NULL, obj, 0);
if (var != NULL)
newline(NULL);
printf("%s0x%08lx: ", prefix, (unsigned long) obj);
if (cur_depth < brief_depth) {
- fputs(lowtag_Names[type], stdout);
+ fputs(lowtag_names[type], stdout);
(*verbose_fns[type])(obj);
}
else