Simplify (and robustify) regular PACKing
[sbcl.git] / src / runtime / monitor.c
index dd7808d..30f9fc7 100644 (file)
@@ -9,17 +9,22 @@
  * files for more information.
  */
 
+#include "sbcl.h"
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <sys/time.h>
+#ifndef LISP_FEATURE_WIN32
 #include <sys/resource.h>
+#endif
 #include <signal.h>
 #include <unistd.h>
 
-#include "sbcl.h"
 #include "runtime.h"
+#include "parse.h"
+#include "vars.h"
 
 /* Almost all of this file can be skipped if we're not supporting LDB. */
 #if defined(LISP_FEATURE_SB_LDB)
@@ -46,7 +51,7 @@
  *
  * (We could set up output to go to a special ldb_out stream for the
  * same reason, but there's been no pressure for that so far.)
- * 
+ *
  * The enter-the-ldb-monitor function is responsible for setting up
  * this stream. */
 static FILE *ldb_in = 0;
@@ -132,13 +137,13 @@ dump_cmd(char **ptr)
     }
 
     while (count-- > 0) {
-#ifndef alpha
-        printf("0x%08lX: ", (unsigned long) addr);
+#ifndef LISP_FEATURE_ALPHA
+        printf("0x%p: ", (os_vm_address_t) addr);
 #else
         printf("0x%08X: ", (u32) addr);
 #endif
         if (is_valid_lisp_addr((os_vm_address_t)addr)) {
-#ifndef alpha
+#ifndef LISP_FEATURE_ALPHA
             unsigned long *lptr = (unsigned long *)addr;
 #else
             u32 *lptr = (u32 *)addr;
@@ -146,7 +151,14 @@ dump_cmd(char **ptr)
             unsigned short *sptr = (unsigned short *)addr;
             unsigned char *cptr = (unsigned char *)addr;
 
-            printf("0x%08lx   0x%04x 0x%04x   0x%02x 0x%02x 0x%02x 0x%02x    %c%c%c%c\n", lptr[0], sptr[0], sptr[1], cptr[0], cptr[1], cptr[2], cptr[3], visible(cptr[0]), visible(cptr[1]), visible(cptr[2]), visible(cptr[3]));
+            printf("0x%08lx   0x%04x 0x%04x   "
+                   "0x%02x 0x%02x 0x%02x 0x%02x    "
+                   "%c%c"
+                   "%c%c\n",
+                   lptr[0], sptr[0], sptr[1],
+                   cptr[0], cptr[1], cptr[2], cptr[3],
+                   visible(cptr[0]), visible(cptr[1]),
+                   visible(cptr[2]), visible(cptr[3]));
         }
         else
             printf("invalid Lisp-level address\n");
@@ -168,39 +180,48 @@ print_cmd(char **ptr)
 static void
 kill_cmd(char **ptr)
 {
+#ifndef LISP_FEATURE_WIN32
     kill(getpid(), parse_number(ptr));
+#endif
 }
 
 static void
 regs_cmd(char **ptr)
 {
-    printf("CSP\t=\t0x%08lX\n", (unsigned long)current_control_stack_pointer);
-    printf("FP\t=\t0x%08lX\n", (unsigned long)current_control_frame_pointer);
-#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
-    printf("BSP\t=\t0x%08X\n", (unsigned long)current_binding_stack_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
-#if 0
-#if (defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
-    printf("BSP\t=\t0x%08lx\n",
-          (unsigned long)SymbolValue(BINDING_STACK_POINTER));
+
+#ifdef reg_BSP
+    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
 
-    printf("DYNAMIC\t=\t0x%08lx\n", (unsigned long)DYNAMIC_SPACE_START);
-#if (defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
-    printf("ALLOC\t=\t0x%08lx\n",
-          (unsigned long)SymbolValue(ALLOCATION_POINTER));
+#ifdef LISP_FEATURE_GENCGC
+    /* printf("DYNAMIC\t=\t0x%08lx\n", DYNAMIC_SPACE_START); */
 #else
-    printf("ALLOC\t=\t0x%08X\n",
-          (unsigned long)dynamic_space_free_pointer);
-    printf("TRIGGER\t=\t0x%08lx\n", (unsigned long)current_auto_gc_trigger);
+    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
+
+#ifdef reg_ALLOC
+    printf("ALLOC\t=\t0x%08lx\n", (unsigned long)dynamic_space_free_pointer);
+#else
+    printf("ALLOC\t=\t0x%08lx\n",
+           (unsigned long)SymbolValue(ALLOCATION_POINTER, thread));
 #endif
-    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 /* 0 */
-#ifdef MIPS
-    printf("FLAGS\t=\t0x%08x\n", current_flags_register);
+
+#ifndef LISP_FEATURE_GENCGC
+    printf("TRIGGER\t=\t0x%08lx\n", (unsigned long)current_auto_gc_trigger);
 #endif
 }
 
@@ -219,7 +240,7 @@ search_cmd(char **ptr)
             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);
             }
@@ -245,23 +266,22 @@ search_cmd(char **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);
         } if (count == -1) {
             return;
-       }
+        }
     }
 }
 
@@ -283,9 +303,13 @@ quit_cmd(char **ptr)
 
     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
@@ -318,12 +342,12 @@ print_context(os_context_t *context)
     int i;
 
     for (i = 0; i < NREGS; i++) {
-       printf("%s:\t", lisp_register_names[i]);
+        printf("%s:\t", lisp_register_names[i]);
 #ifdef LISP_FEATURE_X86
-       brief_print((lispobj)(*os_context_register_addr(context,
-                                                       i*2)));
+        brief_print((lispobj)(*os_context_register_addr(context,
+                                                        i*2)));
 #else
-       brief_print((lispobj)(*os_context_register_addr(context,i)));
+        brief_print((lispobj)(*os_context_register_addr(context,i)));
 #endif
     }
 #ifdef LISP_FEATURE_DARWIN
@@ -331,54 +355,54 @@ print_context(os_context_t *context)
     printf("DSISR:\t\t 0x%08lx\n", (unsigned long)(*os_context_register_addr(context, 42)));
 #endif
     printf("PC:\t\t  0x%08lx\n",
-          (unsigned long)(*os_context_pc_addr(context)));
+           (unsigned long)(*os_context_pc_addr(context)));
 }
 
 static void
 print_context_cmd(char **ptr)
 {
-    int free;
+    int free_ici;
     struct thread *thread=arch_os_get_current_thread();
 
-    free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)>>2;
-       
+    free_ici = fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread));
+
     if (more_p(ptr)) {
-       int index;
-
-       index = parse_number(ptr);
-
-       if ((index >= 0) && (index < free)) {
-           printf("There are %d interrupt contexts.\n", free);
-           printf("printing context %d\n", index);
-           print_context(thread->interrupt_contexts[index]);
-       } else {
-           printf("There aren't that many/few contexts.\n");
-           printf("There are %d interrupt contexts.\n", free);
-       }
+        int index;
+
+        index = parse_number(ptr);
+
+        if ((index >= 0) && (index < free_ici)) {
+            printf("There are %d interrupt contexts.\n", free_ici);
+            printf("printing context %d\n", index);
+            print_context(thread->interrupt_contexts[index]);
+        } else {
+            printf("There aren't that many/few contexts.\n");
+            printf("There are %d interrupt contexts.\n", free_ici);
+        }
     } else {
-       if (free == 0)
-           printf("There are no interrupt contexts!\n");
-       else {
-           printf("There are %d interrupt contexts.\n", free);
-           printf("printing context %d\n", free - 1);
-           print_context(thread->interrupt_contexts[free - 1]);
-       }
+        if (free_ici == 0)
+            printf("There are no interrupt contexts!\n");
+        else {
+            printf("There are %d interrupt contexts.\n", free_ici);
+            printf("printing context %d\n", free_ici - 1);
+            print_context(thread->interrupt_contexts[free_ici - 1]);
+        }
     }
 }
 
 static void
 backtrace_cmd(char **ptr)
 {
-    void backtrace(int frames);
+    void lisp_backtrace(int frames);
     int n;
 
     if (more_p(ptr))
-       n = parse_number(ptr);
+        n = parse_number(ptr);
     else
-       n = 100;
+        n = 100;
 
     printf("Backtrace:\n");
-    backtrace(n);
+    lisp_backtrace(n);
 }
 
 static void
@@ -393,20 +417,18 @@ catchers_cmd(char **ptr)
         printf("There are no active catchers!\n");
     else {
         while (catch != NULL) {
-#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
-            printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\tcode: 0x%08lx\n\tentry: 0x%08lx\n\ttag: ",
-                  (unsigned long)catch, (unsigned long)(catch->current_uwp),
-                  (unsigned long)(catch->current_cont),
-                  catch->current_code,
-                  catch->entry_pc);
+            printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\t"
+                   "code: 0x%08lX\n\tentry: 0x%08lX\n\ttag: ",
+                   (uword_t)catch,
+                   (uword_t)(catch->current_uwp),
+                   (uword_t)(catch->current_cont),
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+                   (uword_t)component_ptr_from_pc((void*)catch->entry_pc)
+                       + OTHER_POINTER_LOWTAG,
 #else
-            printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\tcode: 0x%08lx\n\tentry: 0x%08lx\n\ttag: ",
-                  (unsigned long)catch, (unsigned long)(catch->current_uwp),
-                  (unsigned long)(catch->current_cont),
-                  (unsigned long)component_ptr_from_pc((void*)catch->entry_pc) +
-                  OTHER_POINTER_LOWTAG,
-                  (unsigned long)catch->entry_pc);
+                   (uword_t)(catch->current_code),
 #endif
+                   (uword_t)(catch->entry_pc));
             brief_print((lispobj)catch->tag);
             catch = catch->previous_catch;
         }
@@ -431,8 +453,16 @@ sub_monitor(void)
     int ambig;
 
     if (!ldb_in) {
-       ldb_in = fopen("/dev/tty","r+");
-       ldb_in_fd = fileno(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
+        ldb_in_fd = fileno(ldb_in);
     }
 
     while (!done) {
@@ -440,15 +470,8 @@ sub_monitor(void)
         fflush(stdout);
         line = fgets(buf, sizeof(buf), ldb_in);
         if (line == NULL) {
-           if (isatty(ldb_in_fd)) {
-               putchar('\n');
-               continue;
-           }
-           else {
-               fprintf(stderr, "\nEOF on something other than a tty.\n");
-               exit(0);
-           }
-       }
+            exit(1);
+        }
         ptr = line;
         if ((token = parse_token(&ptr)) == NULL)
             continue;
@@ -485,7 +508,7 @@ ldb_monitor()
 
     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);