projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.21.50:
[sbcl.git]
/
src
/
runtime
/
print.c
diff --git
a/src/runtime/print.c
b/src/runtime/print.c
index
6362a6f
..
46f2b2f
100644
(file)
--- a/
src/runtime/print.c
+++ b/
src/runtime/print.c
@@
-20,9
+20,9
@@
#include <stdio.h>
#include <stdio.h>
+#include "sbcl.h"
#include "print.h"
#include "runtime.h"
#include "print.h"
#include "runtime.h"
-#include "sbcl.h"
/* This file can be skipped if we're not supporting LDB. */
#if defined(LISP_FEATURE_SB_LDB)
/* This file can be skipped if we're not supporting LDB. */
#if defined(LISP_FEATURE_SB_LDB)
@@
-218,7
+218,7
@@
static void brief_otherimm(lispobj obj)
type = widetag_of(obj);
switch (type) {
type = widetag_of(obj);
switch (type) {
- case BASE_CHAR_WIDETAG:
+ case CHARACTER_WIDETAG:
c = (obj>>8)&0xff;
switch (c) {
case '\0':
c = (obj>>8)&0xff;
switch (c) {
case '\0':
@@
-275,7
+275,7
@@
static void print_otherimm(lispobj obj)
printf(", unknown type (0x%0x)", type);
switch (widetag_of(obj)) {
printf(", unknown type (0x%0x)", type);
switch (widetag_of(obj)) {
- case BASE_CHAR_WIDETAG:
+ case CHARACTER_WIDETAG:
printf(": ");
brief_otherimm(obj);
break;
printf(": ");
brief_otherimm(obj);
break;
@@
-385,7
+385,7
@@
static void brief_otherptr(lispobj obj)
}
break;
}
break;
- case SIMPLE_STRING_WIDETAG:
+ case SIMPLE_BASE_STRING_WIDETAG:
vector = (struct vector *)ptr;
putchar('"');
for (charptr = (char *)vector->data; *charptr != '\0'; charptr++) {
vector = (struct vector *)ptr;
putchar('"');
for (charptr = (char *)vector->data; *charptr != '\0'; charptr++) {
@@
-491,11
+491,12
@@
static void print_otherptr(lispobj obj)
print_slots(symbol_slots, count, ptr);
break;
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;
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);
case DOUBLE_FLOAT_WIDETAG:
NEWLINE_OR_RETURN;
printf("%g", ((struct double_float *)native_pointer(obj))->value);
@@
-535,7
+536,10
@@
static void print_otherptr(lispobj obj)
break;
#endif
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('"');
NEWLINE_OR_RETURN;
cptr = (char *)(ptr+1);
putchar('"');
@@
-598,7
+602,11
@@
static void print_otherptr(lispobj obj)
#ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG
case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG:
#endif
#ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG
case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG:
#endif
- case COMPLEX_STRING_WIDETAG:
+ case COMPLEX_BASE_STRING_WIDETAG:
+#ifdef COMPLEX_CHARACTER_STRING_WIDETAG
+ case COMPLEX_CHARACTER_STRING_WIDETAG:
+#endif
+ case COMPLEX_VECTOR_NIL_WIDETAG:
case COMPLEX_BIT_VECTOR_WIDETAG:
case COMPLEX_VECTOR_WIDETAG:
case COMPLEX_ARRAY_WIDETAG:
case COMPLEX_BIT_VECTOR_WIDETAG:
case COMPLEX_VECTOR_WIDETAG:
case COMPLEX_ARRAY_WIDETAG:
@@
-609,7
+617,6
@@
static void print_otherptr(lispobj obj)
break;
case SIMPLE_FUN_HEADER_WIDETAG:
break;
case SIMPLE_FUN_HEADER_WIDETAG:
- case CLOSURE_FUN_HEADER_WIDETAG:
print_slots(fn_slots, 5, ptr);
break;
print_slots(fn_slots, 5, ptr);
break;
@@
-642,7
+649,7
@@
static void print_otherptr(lispobj obj)
print_slots(weak_pointer_slots, 1, ptr);
break;
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?");
case UNBOUND_MARKER_WIDETAG:
NEWLINE_OR_RETURN;
printf("pointer to an immediate?");