X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fprint.c;h=f448e519811f595c9bbaa58f06a98ba3f5af77fe;hb=182b1cc78309d1db9764a3e6a74d821109bbc096;hp=8e3ba511b7a52615b5d53c3a5b9be5c9cfe25887;hpb=eb7b749ab699ed56499c608e1ec4c36870e99aed;p=sbcl.git diff --git a/src/runtime/print.c b/src/runtime/print.c index 8e3ba51..f448e51 100644 --- a/src/runtime/print.c +++ b/src/runtime/print.c @@ -335,7 +335,7 @@ static void brief_list(lispobj obj) obj = NIL; break; } - print_obj(NULL, cons->car); + print_obj("", cons->car); obj = cons->cdr; space = 1; if (obj == NIL) @@ -343,16 +343,18 @@ static void brief_list(lispobj obj) } if (obj != NIL) { printf(" . "); - print_obj(NULL, obj); + print_obj("", obj); } putchar(')'); } } +#ifdef LISP_FEATURE_X86_64 static void print_unknown(lispobj obj) { - printf("unknown object: %p", obj); + printf("unknown object: %p", (void *)obj); } +#endif static void print_list(lispobj obj) { @@ -729,8 +731,10 @@ 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) + ((obj & LOWTAG_MASK) == FUN_POINTER_LOWTAG || + (obj & LOWTAG_MASK) == LIST_POINTER_LOWTAG || + (obj & LOWTAG_MASK) == INSTANCE_POINTER_LOWTAG || + (obj & LOWTAG_MASK) == OTHER_POINTER_LOWTAG)) var = define_var(NULL, obj, 0); if (var != NULL)