#include <stdio.h>
+#include "sbcl.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)
#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;
type = widetag_of(obj);
switch (type) {
- case BASE_CHAR_WIDETAG:
+ case CHARACTER_WIDETAG:
c = (obj>>8)&0xff;
switch (c) {
case '\0':
printf(", unknown type (0x%0x)", type);
switch (widetag_of(obj)) {
- case BASE_CHAR_WIDETAG:
+ case CHARACTER_WIDETAG:
printf(": ");
brief_otherimm(obj);
break;
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");
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)");
}
break;
- case SIMPLE_STRING_WIDETAG:
+ case SIMPLE_BASE_STRING_WIDETAG:
vector = (struct vector *)ptr;
putchar('"');
for (charptr = (char *)vector->data; *charptr != '\0'; charptr++) {
* 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};
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);
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('"');
#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:
break;
case SIMPLE_FUN_HEADER_WIDETAG:
- case CLOSURE_FUN_HEADER_WIDETAG:
print_slots(fn_slots, 5, 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?");