while (count-- > 0) {
#ifndef LISP_FEATURE_ALPHA
- printf("0x%08lX: ", (unsigned long) addr);
+ printf("0x%p: ", (os_vm_address_t) addr);
#else
printf("0x%08X: ", (u32) addr);
#endif
static void
regs_cmd(char **ptr)
{
- printf("CSP\t=\t0x%08lx\n", (unsigned long)current_control_stack_pointer);
- printf("CFP\t=\t0x%08lx\n", (unsigned long)current_control_frame_pointer);
+ struct thread *thread=arch_os_get_current_thread();
+
+ printf("CSP\t=\t0x%p ", access_control_stack_pointer(thread));
+#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
+ printf("CFP\t=\t0x%p ", access_control_frame_pointer(thread));
+#endif
#ifdef reg_BSP
- printf("BSP\t=\t0x%08lx\n", (unsigned long)current_binding_stack_pointer);
+ printf("BSP\t=\t0x%p\n", get_binding_stack_pointer(thread));
#else
/* printf("BSP\t=\t0x%08lx\n",
(unsigned long)SymbolValue(BINDING_STACK_POINTER)); */
+ printf("\n");
#endif
#ifdef LISP_FEATURE_GENCGC
/* printf("DYNAMIC\t=\t0x%08lx\n", DYNAMIC_SPACE_START); */
#else
+ printf("STATIC\t=\t0x%p ",
+ SymbolValue(STATIC_SPACE_FREE_POINTER, thread));
+ printf("RDONLY\t=\t0x%08lx ",
+ (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER, thread));
printf("DYNAMIC\t=\t0x%08lx\n", (unsigned long)current_dynamic_space);
#endif
printf("ALLOC\t=\t0x%08lx\n", (unsigned long)dynamic_space_free_pointer);
#else
printf("ALLOC\t=\t0x%08lx\n",
- (unsigned long)SymbolValue(ALLOCATION_POINTER,
- arch_os_get_current_thread()));
+ (unsigned long)SymbolValue(ALLOCATION_POINTER, thread));
#endif
#ifndef LISP_FEATURE_GENCGC
printf("TRIGGER\t=\t0x%08lx\n", (unsigned long)current_auto_gc_trigger);
#endif
-
-#if 0
- printf("STATIC\t=\t0x%08lx\n",
- (unsigned long)SymbolValue(STATIC_SPACE_FREE_POINTER));
- printf("RDONLY\t=\t0x%08lx\n",
- (unsigned long)SymbolValue(READ_ONLY_SPACE_FREE_POINTER));
-#endif
}
static void
return;
}
if (more_p(ptr)) {
- addr = (lispobj *)native_pointer((long)parse_addr(ptr));
+ addr = (lispobj *)native_pointer((uword_t)parse_addr(ptr));
if (more_p(ptr)) {
count = parse_number(ptr);
}
start = end = addr;
lastcount = count;
- printf("searching for 0x%x at 0x%08lX\n", val, (unsigned long)end);
+ printf("searching for 0x%x at 0x%p\n", val, (void*)(uword_t)end);
while (search_for_type(val, &end, &count)) {
- printf("found 0x%x at 0x%08lX:\n", val, (unsigned long)end);
+ printf("found 0x%x at 0x%p:\n", val, (void*)(uword_t)end);
obj = *end;
addr = end;
end += 2;
if (widetag_of(obj) == SIMPLE_FUN_HEADER_WIDETAG) {
- print((long)addr | FUN_POINTER_LOWTAG);
- } else if (lowtag_of(obj) == OTHER_IMMEDIATE_0_LOWTAG ||
- lowtag_of(obj) == OTHER_IMMEDIATE_1_LOWTAG) {
+ print((uword_t)addr | FUN_POINTER_LOWTAG);
+ } else if (other_immediate_lowtag_p(obj)) {
print((lispobj)addr | OTHER_POINTER_LOWTAG);
} else {
print((lispobj)addr);
printf("Really quit? [y] ");
fflush(stdout);
- fgets(buf, sizeof(buf), ldb_in);
- if (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n')
+ if (fgets(buf, sizeof(buf), ldb_in)) {
+ if (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n')
+ exit(1);
+ } else {
+ printf("\nUnable to read response, assuming y.\n");
exit(1);
+ }
}
static void
static void
backtrace_cmd(char **ptr)
{
- void backtrace(int frames);
+ void lisp_backtrace(int frames);
int n;
if (more_p(ptr))
n = 100;
printf("Backtrace:\n");
- backtrace(n);
+ lisp_backtrace(n);
}
static void
while (catch != NULL) {
printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\t"
"code: 0x%08lX\n\tentry: 0x%08lX\n\ttag: ",
- (unsigned long)catch,
- (unsigned long)(catch->current_uwp),
- (unsigned long)(catch->current_cont),
+ (uword_t)catch,
+ (uword_t)(catch->current_uwp),
+ (uword_t)(catch->current_cont),
#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
- (unsigned long)component_ptr_from_pc((void*)catch->entry_pc)
+ (uword_t)component_ptr_from_pc((void*)catch->entry_pc)
+ OTHER_POINTER_LOWTAG,
#else
- (unsigned long)(catch->current_code),
+ (uword_t)(catch->current_code),
#endif
- (unsigned long)(catch->entry_pc));
+ (uword_t)(catch->entry_pc));
brief_print((lispobj)catch->tag);
catch = catch->previous_catch;
}
if (!ldb_in) {
#ifndef LISP_FEATURE_WIN32
ldb_in = fopen("/dev/tty","r+");
+ if (ldb_in == NULL) {
+ perror("Error opening /dev/tty");
+ ldb_in = stdin;
+ }
#else
ldb_in = stdin;
#endif
bcopy(curbuf, oldbuf, sizeof(oldbuf));
- printf("LDB monitor\n");
+ printf("Welcome to LDB, a low-level debugger for the Lisp runtime environment.\n");
setjmp(curbuf);