#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 "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;
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"
};
default:
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);
break;
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);
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)");
}
}
-/* 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};
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];