X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fprint.c;h=46f2b2f4eb7e419a0a5931a9a59b1866dc01af4e;hb=a3649ba68e298d9203e8bb1de5629ff788586fe1;hp=1097d71e7bf28add595cfb62c214618b46e150ec;hpb=6fb6e66f531dfb6140ec3e0cc8f84f6ecd1927ca;p=sbcl.git diff --git a/src/runtime/print.c b/src/runtime/print.c index 1097d71..46f2b2f 100644 --- a/src/runtime/print.c +++ b/src/runtime/print.c @@ -13,23 +13,30 @@ /* * FIXME: - * 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 (the various + * foo_slots[], at least) is deeply broken, depending on guessing + * already out-of-date values instead of getting them from sbcl.h. */ #include +#include "sbcl.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" #include "os.h" +#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" + + static int max_lines = 20, cur_lines = 0; static int max_depth = 5, brief_depth = 2, cur_depth = 0; @@ -43,11 +50,11 @@ static void print_obj(char *prefix, lispobj obj); char *lowtag_Names[] = { "even fixnum", - "function pointer", + "instance pointer", "other immediate [0]", "list pointer", "odd fixnum", - "instance pointer", + "function pointer", "other immediate [1]", "other pointer" }; @@ -64,17 +71,17 @@ char *subtype_Names[] = { "ratio", "single float", "double float", -#ifdef type_LongFloat +#ifdef LONG_FLOAT_WIDETAG "long float", #endif "complex", -#ifdef type_ComplexSingleFloat +#ifdef COMPLEX_SINGLE_FLOAT_WIDETAG "complex single float", #endif -#ifdef type_ComplexDoubleFloat +#ifdef COMPLEX_DOUBLE_FLOAT_WIDETAG "complex double float", #endif -#ifdef type_ComplexLongFloat +#ifdef COMPLEX_LONG_FLOAT_WIDETAG "complex long float", #endif "simple-array", @@ -86,30 +93,30 @@ char *subtype_Names[] = { "(simple-array (unsigned-byte 8) (*))", "(simple-array (unsigned-byte 16) (*))", "(simple-array (unsigned-byte 32) (*))", -#ifdef type_SimpleArraySignedByte8 +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG "(simple-array (signed-byte 8) (*))", #endif -#ifdef type_SimpleArraySignedByte16 +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG "(simple-array (signed-byte 16) (*))", #endif -#ifdef type_SimpleArraySignedByte30 +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG "(simple-array fixnum (*))", #endif -#ifdef type_SimpleArraySignedByte32 +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG "(simple-array (signed-byte 32) (*))", #endif "(simple-array single-float (*))", "(simple-array double-float (*))", -#ifdef type_SimpleArrayLongFloat +#ifdef SIMPLE_ARRAY_LONG_FLOAT_WIDETAG "(simple-array long-float (*))", #endif -#ifdef type_SimpleArrayComplexSingleFloat +#ifdef SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG "(simple-array (complex single-float) (*))", #endif -#ifdef type_SimpleArrayComplexDoubleFloat +#ifdef SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG "(simple-array (complex double-float) (*))", #endif -#ifdef type_SimpleArrayComplexLongFloat +#ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG "(simple-array (complex long-float) (*))", #endif "complex-string", @@ -209,9 +216,9 @@ static void brief_otherimm(lispobj obj) int type, c, idx; char buffer[10]; - type = TypeOf(obj); + type = widetag_of(obj); switch (type) { - case type_BaseChar: + case CHARACTER_WIDETAG: c = (obj>>8)&0xff; switch (c) { case '\0': @@ -241,14 +248,14 @@ static void brief_otherimm(lispobj obj) } break; - case type_UnboundMarker: + case UNBOUND_MARKER_WIDETAG: printf(""); break; default: idx = type >> 2; - if (idx < (sizeof(subtype_Names) / sizeof(char *))) - printf("%s", subtype_Names[idx]); + if (idx < (sizeof(lowtag_Names) / sizeof(char *))) + printf("%s", lowtag_Names[idx]); else printf("unknown type (0x%0x)", type); break; @@ -259,22 +266,22 @@ static void print_otherimm(lispobj obj) { int type, idx; - type = TypeOf(obj); + type = widetag_of(obj); idx = type >> 2; - if (idx < (sizeof(subtype_Names) / sizeof(char *))) - printf(", %s", subtype_Names[idx]); + if (idx < (sizeof(lowtag_Names) / sizeof(char *))) + printf(", %s", lowtag_Names[idx]); else printf(", unknown type (0x%0x)", type); - switch (TypeOf(obj)) { - case type_BaseChar: + switch (widetag_of(obj)) { + case CHARACTER_WIDETAG: printf(": "); brief_otherimm(obj); break; - case type_Sap: - case type_UnboundMarker: + case SAP_WIDETAG: + case UNBOUND_MARKER_WIDETAG: break; default: @@ -288,13 +295,13 @@ static void brief_list(lispobj obj) int space = 0; int length = 0; - if (!is_valid_lisp_addr((os_vm_address_t)obj)) + if (!is_valid_lisp_addr((os_vm_address_t)native_pointer(obj))) printf("(invalid Lisp-level address)"); else if (obj == NIL) printf("NIL"); else { putchar('('); - while (lowtagof(obj) == LIST_POINTER_LOWTAG) { + while (lowtag_of(obj) == LIST_POINTER_LOWTAG) { struct cons *cons = (struct cons *)native_pointer(obj); if (space) @@ -320,7 +327,7 @@ static void brief_list(lispobj obj) static void print_list(lispobj obj) { - if (!is_valid_lisp_addr((os_vm_address_t)obj)) { + if (!is_valid_lisp_addr((os_vm_address_t)native_pointer(obj))) { printf("(invalid address)"); } else if (obj == NIL) { printf(" (NIL)"); @@ -366,9 +373,9 @@ static void brief_otherptr(lispobj obj) } header = *ptr; - type = TypeOf(header); + type = widetag_of(header); switch (type) { - case type_SymbolHeader: + case SYMBOL_HEADER_WIDETAG: symbol = (struct symbol *)ptr; vector = (struct vector *)native_pointer(symbol->name); for (charptr = (char *)vector->data; *charptr != '\0'; charptr++) { @@ -378,7 +385,7 @@ static void brief_otherptr(lispobj obj) } break; - case type_SimpleString: + case SIMPLE_BASE_STRING_WIDETAG: vector = (struct vector *)ptr; putchar('"'); for (charptr = (char *)vector->data; *charptr != '\0'; charptr++) { @@ -408,13 +415,19 @@ static void print_slots(char **slots, int count, lispobj *ptr) } /* FIXME: Yikes again! This, like subtype_Names[], needs to depend - * on the values in sbcl.h. */ + * on the values in sbcl.h (or perhaps be generated automatically + * by GENESIS as part of sbcl.h). */ static char *symbol_slots[] = {"value: ", "unused: ", - "plist: ", "name: ", "package: ", NULL}; + "plist: ", "name: ", "package: ", +#ifdef LISP_FEATURE_SB_THREAD + "tls-index: " , +#endif + NULL}; static char *ratio_slots[] = {"numer: ", "denom: ", NULL}; static char *complex_slots[] = {"real: ", "imag: ", NULL}; static char *code_slots[] = {"words: ", "entry: ", "debug: ", NULL}; -static char *fn_slots[] = {"self: ", "next: ", "name: ", "arglist: ", "type: ", NULL}; +static char *fn_slots[] = { + "self: ", "next: ", "name: ", "arglist: ", "type: ", NULL}; static char *closure_slots[] = {"fn: ", NULL}; static char *funcallable_instance_slots[] = {"fn: ", "lexenv: ", "layout: ", NULL}; static char *weak_pointer_slots[] = {"value: ", NULL}; @@ -447,18 +460,18 @@ static void print_otherptr(lispobj obj) header = *ptr++; length = (*ptr) >> 2; count = header>>8; - type = TypeOf(header); + type = widetag_of(header); print_obj("header: ", header); - if (lowtagof(header) != OTHER_IMMEDIATE_0_LOWTAG && - lowtagof(header) != OTHER_IMMEDIATE_1_LOWTAG) { + if (lowtag_of(header) != OTHER_IMMEDIATE_0_LOWTAG && + lowtag_of(header) != OTHER_IMMEDIATE_1_LOWTAG) { NEWLINE_OR_RETURN; printf("(invalid header object)"); return; } switch (type) { - case type_Bignum: + case BIGNUM_WIDETAG: ptr += count; NEWLINE_OR_RETURN; printf("0x"); @@ -466,37 +479,38 @@ static void print_otherptr(lispobj obj) printf("%08lx", (unsigned long) *--ptr); break; - case type_Ratio: + case RATIO_WIDETAG: print_slots(ratio_slots, count, ptr); break; - case type_Complex: + case COMPLEX_WIDETAG: print_slots(complex_slots, count, ptr); break; - case type_SymbolHeader: + case SYMBOL_HEADER_WIDETAG: print_slots(symbol_slots, count, ptr); break; - case type_SingleFloat: +#if N_WORD_BITS == 32 + case SINGLE_FLOAT_WIDETAG: NEWLINE_OR_RETURN; printf("%g", ((struct single_float *)native_pointer(obj))->value); break; - - case type_DoubleFloat: +#endif + case DOUBLE_FLOAT_WIDETAG: NEWLINE_OR_RETURN; printf("%g", ((struct double_float *)native_pointer(obj))->value); break; -#ifdef type_LongFloat - case type_LongFloat: +#ifdef LONG_FLOAT_WIDETAG + case LONG_FLOAT_WIDETAG: NEWLINE_OR_RETURN; printf("%Lg", ((struct long_float *)native_pointer(obj))->value); break; #endif -#ifdef type_ComplexSingleFloat - case type_ComplexSingleFloat: +#ifdef COMPLEX_SINGLE_FLOAT_WIDETAG + case COMPLEX_SINGLE_FLOAT_WIDETAG: NEWLINE_OR_RETURN; printf("%g", ((struct complex_single_float *)native_pointer(obj))->real); NEWLINE_OR_RETURN; @@ -504,8 +518,8 @@ static void print_otherptr(lispobj obj) break; #endif -#ifdef type_ComplexDoubleFloat - case type_ComplexDoubleFloat: +#ifdef COMPLEX_DOUBLE_FLOAT_WIDETAG + case COMPLEX_DOUBLE_FLOAT_WIDETAG: NEWLINE_OR_RETURN; printf("%g", ((struct complex_double_float *)native_pointer(obj))->real); NEWLINE_OR_RETURN; @@ -513,8 +527,8 @@ static void print_otherptr(lispobj obj) break; #endif -#ifdef type_ComplexLongFloat - case type_ComplexLongFloat: +#ifdef COMPLEX_LONG_FLOAT_WIDETAG + case COMPLEX_LONG_FLOAT_WIDETAG: NEWLINE_OR_RETURN; printf("%Lg", ((struct complex_long_float *)native_pointer(obj))->real); NEWLINE_OR_RETURN; @@ -522,7 +536,10 @@ static void print_otherptr(lispobj obj) break; #endif - case type_SimpleString: + case SIMPLE_BASE_STRING_WIDETAG: +#ifdef SIMPLE_CHARACTER_STRING_WIDETAG + case SIMPLE_CHARACTER_STRING_WIDETAG: /* FIXME */ +#endif NEWLINE_OR_RETURN; cptr = (char *)(ptr+1); putchar('"'); @@ -531,7 +548,7 @@ static void print_otherptr(lispobj obj) putchar('"'); break; - case type_SimpleVector: + case SIMPLE_VECTOR_WIDETAG: NEWLINE_OR_RETURN; printf("length = %ld", length); ptr++; @@ -542,7 +559,7 @@ static void print_otherptr(lispobj obj) } break; - case type_InstanceHeader: + case INSTANCE_HEADER_WIDETAG: NEWLINE_OR_RETURN; printf("length = %ld", (long) count); index = 0; @@ -552,71 +569,74 @@ static void print_otherptr(lispobj obj) } break; - case type_SimpleArray: - case type_SimpleBitVector: - case type_SimpleArrayUnsignedByte2: - case type_SimpleArrayUnsignedByte4: - case type_SimpleArrayUnsignedByte8: - case type_SimpleArrayUnsignedByte16: - case type_SimpleArrayUnsignedByte32: -#ifdef type_SimpleArraySignedByte8 - case type_SimpleArraySignedByte8: + case SIMPLE_ARRAY_WIDETAG: + case SIMPLE_BIT_VECTOR_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG: +#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 type_SimpleArraySignedByte16 - case type_SimpleArraySignedByte16: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG: #endif -#ifdef type_SimpleArraySignedByte30 - case type_SimpleArraySignedByte30: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG: #endif -#ifdef type_SimpleArraySignedByte32 - case type_SimpleArraySignedByte32: + case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG: + case SIMPLE_ARRAY_DOUBLE_FLOAT_WIDETAG: +#ifdef SIMPLE_ARRAY_LONG_FLOAT_WIDETAG + case SIMPLE_ARRAY_LONG_FLOAT_WIDETAG: #endif - case type_SimpleArraySingleFloat: - case type_SimpleArrayDoubleFloat: -#ifdef type_SimpleArrayLongFloat - case type_SimpleArrayLongFloat: +#ifdef SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG: #endif -#ifdef type_SimpleArrayComplexSingleFloat - case type_SimpleArrayComplexSingleFloat: +#ifdef SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG: #endif -#ifdef type_SimpleArrayComplexDoubleFloat - case type_SimpleArrayComplexDoubleFloat: +#ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG: #endif -#ifdef type_SimpleArrayComplexLongFloat - case type_SimpleArrayComplexLongFloat: + case COMPLEX_BASE_STRING_WIDETAG: +#ifdef COMPLEX_CHARACTER_STRING_WIDETAG + case COMPLEX_CHARACTER_STRING_WIDETAG: #endif - case type_ComplexString: - case type_ComplexBitVector: - case type_ComplexVector: - case type_ComplexArray: + case COMPLEX_VECTOR_NIL_WIDETAG: + case COMPLEX_BIT_VECTOR_WIDETAG: + case COMPLEX_VECTOR_WIDETAG: + case COMPLEX_ARRAY_WIDETAG: break; - case type_CodeHeader: + case CODE_HEADER_WIDETAG: print_slots(code_slots, count-1, ptr); break; - case type_SimpleFunHeader: - case type_ClosureFunHeader: + case SIMPLE_FUN_HEADER_WIDETAG: print_slots(fn_slots, 5, ptr); break; - case type_ReturnPcHeader: + case RETURN_PC_HEADER_WIDETAG: print_obj("code: ", obj - (count * 4)); break; - case type_ClosureHeader: + case CLOSURE_HEADER_WIDETAG: print_slots(closure_slots, count, ptr); break; - case type_FuncallableInstanceHeader: + case FUNCALLABLE_INSTANCE_HEADER_WIDETAG: print_slots(funcallable_instance_slots, count, ptr); break; - case type_ValueCellHeader: + case VALUE_CELL_HEADER_WIDETAG: print_slots(value_cell_slots, 1, ptr); break; - case type_Sap: + case SAP_WIDETAG: NEWLINE_OR_RETURN; #ifndef alpha printf("0x%08lx", (unsigned long) *ptr); @@ -625,17 +645,17 @@ static void print_otherptr(lispobj obj) #endif break; - case type_WeakPointer: + case WEAK_POINTER_WIDETAG: print_slots(weak_pointer_slots, 1, ptr); break; - case type_BaseChar: - case type_UnboundMarker: + case CHARACTER_WIDETAG: + case UNBOUND_MARKER_WIDETAG: NEWLINE_OR_RETURN; printf("pointer to an immediate?"); break; - case type_Fdefn: + case FDEFN_WIDETAG: print_slots(fdefn_slots, count, ptr); break; @@ -650,12 +670,12 @@ static void print_otherptr(lispobj obj) static void print_obj(char *prefix, lispobj obj) { static void (*verbose_fns[])(lispobj obj) - = {print_fixnum, print_otherptr, print_otherimm, print_list, - print_fixnum, print_struct, print_otherimm, print_otherptr}; + = {print_fixnum, print_struct, print_otherimm, print_list, + print_fixnum, print_otherptr, print_otherimm, print_otherptr}; static void (*brief_fns[])(lispobj obj) - = {brief_fixnum, brief_otherptr, brief_otherimm, brief_list, - brief_fixnum, brief_struct, brief_otherimm, brief_otherptr}; - int type = lowtagof(obj); + = {brief_fixnum, brief_struct, brief_otherimm, brief_list, + brief_fixnum, brief_otherptr, brief_otherimm, brief_otherptr}; + int type = lowtag_of(obj); struct var *var = lookup_by_obj(obj); char buffer[256]; boolean verbose = cur_depth < brief_depth;