X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fprint.c;h=451a16d95816d52632e6596666d2394b9eaf3383;hb=bd455348d39bee562296741689882dcb97c46ba3;hp=d39586d27ea96259d6150cf34f2e25d152cd5de2;hpb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;p=sbcl.git diff --git a/src/runtime/print.c b/src/runtime/print.c index d39586d..451a16d 100644 --- a/src/runtime/print.c +++ b/src/runtime/print.c @@ -19,17 +19,25 @@ */ #include +#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 +51,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" }; @@ -188,7 +196,7 @@ static void newline(char *label) static void brief_fixnum(lispobj obj) { -#ifndef alpha +#ifndef LISP_FEATURE_ALPHA printf("%ld", ((long)obj)>>2); #else printf("%d", ((s32)obj)>>2); @@ -197,7 +205,7 @@ static void brief_fixnum(lispobj obj) static void print_fixnum(lispobj obj) { -#ifndef alpha +#ifndef LISP_FEATURE_ALPHA printf(": %ld", ((long)obj)>>2); #else printf(": %d", ((s32)obj)>>2); @@ -211,7 +219,7 @@ static void brief_otherimm(lispobj obj) type = widetag_of(obj); switch (type) { - case BASE_CHAR_WIDETAG: + case CHARACTER_WIDETAG: c = (obj>>8)&0xff; switch (c) { case '\0': @@ -246,11 +254,11 @@ static void brief_otherimm(lispobj obj) break; default: - idx = type >> 2; - if (idx < (sizeof(SUBNAMES_WIDETAG) / sizeof(char *))) - printf("%s", SUBNAMES_WIDETAG[idx]); - else - printf("unknown type (0x%0x)", type); + idx = type >> 2; + if (idx < (sizeof(lowtag_Names) / sizeof(char *))) + printf("%s", lowtag_Names[idx]); + else + printf("unknown type (0x%0x)", type); break; } } @@ -262,13 +270,13 @@ static void print_otherimm(lispobj obj) type = widetag_of(obj); idx = type >> 2; - if (idx < (sizeof(SUBNAMES_WIDETAG) / sizeof(char *))) - printf(", %s", SUBNAMES_WIDETAG[idx]); + if (idx < (sizeof(lowtag_Names) / sizeof(char *))) + printf(", %s", lowtag_Names[idx]); else - printf(", unknown type (0x%0x)", type); + printf(", unknown type (0x%0x)", type); switch (widetag_of(obj)) { - case BASE_CHAR_WIDETAG: + case CHARACTER_WIDETAG: printf(": "); brief_otherimm(obj); break; @@ -288,8 +296,8 @@ static void brief_list(lispobj obj) int space = 0; int length = 0; - if (!is_valid_lisp_addr((os_vm_address_t)obj)) - printf("(invalid Lisp-level address)"); + if (!is_valid_lisp_addr((os_vm_address_t)native_pointer(obj))) + printf("(invalid Lisp-level address)"); else if (obj == NIL) printf("NIL"); else { @@ -320,8 +328,8 @@ static void brief_list(lispobj obj) static void print_list(lispobj obj) { - if (!is_valid_lisp_addr((os_vm_address_t)obj)) { - printf("(invalid address)"); + if (!is_valid_lisp_addr((os_vm_address_t)native_pointer(obj))) { + printf("(invalid address)"); } else if (obj == NIL) { printf(" (NIL)"); } else { @@ -345,8 +353,8 @@ static void print_struct(lispobj obj) 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]); + sprintf(buffer, "slot %d: ", i); + print_obj(buffer, instance->slots[i]); } } @@ -361,8 +369,8 @@ static void brief_otherptr(lispobj obj) ptr = (lispobj *) native_pointer(obj); if (!is_valid_lisp_addr((os_vm_address_t)obj)) { - printf("(invalid address)"); - return; + printf("(invalid address)"); + return; } header = *ptr; @@ -378,7 +386,7 @@ static void brief_otherptr(lispobj obj) } break; - case SIMPLE_STRING_WIDETAG: + case SIMPLE_BASE_STRING_WIDETAG: vector = (struct vector *)ptr; putchar('"'); for (charptr = (char *)vector->data; *charptr != '\0'; charptr++) { @@ -403,18 +411,24 @@ static void print_slots(char **slots, int count, lispobj *ptr) print_obj(*slots++, *ptr++); } else { print_obj("???: ", *ptr++); - } + } } } -/* FIXME: Yikes again! This, like SUBNAMES_WIDETAG[], needs to depend - * on the values in sbcl.h. */ +/* 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). */ 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}; @@ -424,9 +438,9 @@ static char *value_cell_slots[] = {"value: ", NULL}; static void print_otherptr(lispobj obj) { if (!is_valid_lisp_addr((os_vm_address_t)obj)) { - printf("(invalid address)"); + printf("(invalid address)"); } else { -#ifndef alpha +#ifndef LISP_FEATURE_ALPHA lispobj *ptr; unsigned long header; unsigned long length; @@ -438,20 +452,20 @@ static void print_otherptr(lispobj obj) int count, type, index; char *cptr, buffer[16]; - ptr = (lispobj*) native_pointer(obj); - if (ptr == NULL) { - printf(" (NULL Pointer)"); - return; - } + ptr = (lispobj*) native_pointer(obj); + if (ptr == NULL) { + printf(" (NULL Pointer)"); + return; + } - header = *ptr++; - length = (*ptr) >> 2; - count = header>>8; - type = widetag_of(header); + header = *ptr++; + length = (*ptr) >> 2; + count = header>>8; + type = widetag_of(header); print_obj("header: ", header); if (lowtag_of(header) != OTHER_IMMEDIATE_0_LOWTAG && - lowtag_of(header) != OTHER_IMMEDIATE_1_LOWTAG) { + lowtag_of(header) != OTHER_IMMEDIATE_1_LOWTAG) { NEWLINE_OR_RETURN; printf("(invalid header object)"); return; @@ -478,11 +492,12 @@ static void print_otherptr(lispobj obj) print_slots(symbol_slots, count, ptr); break; +#if N_WORD_BITS == 32 case SINGLE_FLOAT_WIDETAG: NEWLINE_OR_RETURN; printf("%g", ((struct single_float *)native_pointer(obj))->value); break; - +#endif case DOUBLE_FLOAT_WIDETAG: NEWLINE_OR_RETURN; printf("%g", ((struct double_float *)native_pointer(obj))->value); @@ -522,7 +537,10 @@ static void print_otherptr(lispobj obj) break; #endif - case SIMPLE_STRING_WIDETAG: + 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('"'); @@ -560,16 +578,16 @@ static void print_otherptr(lispobj obj) 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: + case SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG: #endif #ifdef SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG - case 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: + case SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG: #endif #ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG - case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG: + case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG: #endif case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG: case SIMPLE_ARRAY_DOUBLE_FLOAT_WIDETAG: @@ -577,15 +595,19 @@ static void print_otherptr(lispobj obj) case SIMPLE_ARRAY_LONG_FLOAT_WIDETAG: #endif #ifdef SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG - case SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG: + case SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG: #endif #ifdef SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG - case SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG: + case SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG: #endif #ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG - case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG: + case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG: +#endif + case COMPLEX_BASE_STRING_WIDETAG: +#ifdef COMPLEX_CHARACTER_STRING_WIDETAG + case COMPLEX_CHARACTER_STRING_WIDETAG: #endif - case COMPLEX_STRING_WIDETAG: + case COMPLEX_VECTOR_NIL_WIDETAG: case COMPLEX_BIT_VECTOR_WIDETAG: case COMPLEX_VECTOR_WIDETAG: case COMPLEX_ARRAY_WIDETAG: @@ -596,7 +618,6 @@ static void print_otherptr(lispobj obj) break; case SIMPLE_FUN_HEADER_WIDETAG: - case CLOSURE_FUN_HEADER_WIDETAG: print_slots(fn_slots, 5, ptr); break; @@ -613,12 +634,12 @@ static void print_otherptr(lispobj obj) break; case VALUE_CELL_HEADER_WIDETAG: - print_slots(value_cell_slots, 1, ptr); + print_slots(value_cell_slots, 1, ptr); break; case SAP_WIDETAG: NEWLINE_OR_RETURN; -#ifndef alpha +#ifndef LISP_FEATURE_ALPHA printf("0x%08lx", (unsigned long) *ptr); #else printf("0x%016lx", *(lispobj*)(ptr+1)); @@ -626,19 +647,19 @@ static void print_otherptr(lispobj obj) break; case WEAK_POINTER_WIDETAG: - print_slots(weak_pointer_slots, 1, ptr); + print_slots(weak_pointer_slots, 1, ptr); break; - case BASE_CHAR_WIDETAG: + case CHARACTER_WIDETAG: case UNBOUND_MARKER_WIDETAG: NEWLINE_OR_RETURN; printf("pointer to an immediate?"); break; - case FDEFN_WIDETAG: - print_slots(fdefn_slots, count, ptr); - break; - + case FDEFN_WIDETAG: + print_slots(fdefn_slots, count, ptr); + break; + default: NEWLINE_OR_RETURN; printf("Unknown header object?"); @@ -650,11 +671,11 @@ 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}; + = {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]; @@ -667,8 +688,8 @@ static void print_obj(char *prefix, lispobj obj) dont_descend = 1; if (var == NULL && - /* FIXME: What does this "x & y & z & .." expression mean? */ - (obj & FUN_POINTER_LOWTAG & LIST_POINTER_LOWTAG & INSTANCE_POINTER_LOWTAG & OTHER_POINTER_LOWTAG) != 0) + /* FIXME: What does this "x & y & z & .." expression mean? */ + (obj & FUN_POINTER_LOWTAG & LIST_POINTER_LOWTAG & INSTANCE_POINTER_LOWTAG & OTHER_POINTER_LOWTAG) != 0) var = define_var(NULL, obj, 0); if (var != NULL) @@ -740,5 +761,5 @@ brief_print(lispobj obj) { printf("lispobj 0x%lx\n", (unsigned long)obj); } - + #endif /* defined(LISP_FEATURE_SB_LDB) */