1.0.26.8: QSHOW changes, bug reporting guidelines

[sbcl.git] / src / runtime / monitor.c

diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c
index 69d0380..9d17508 100644 (file)
--- a/src/runtime/monitor.c
+++ b/src/runtime/monitor.c
@@ -9,16 +9,19 @@
  * 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"
@@ -177,25 +180,34 @@ 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("CFP\t=\t0x%08lx\n", (unsigned long)current_control_frame_pointer);
+    struct thread *thread=arch_os_get_current_thread();
+
+    printf("CSP\t=\t0x%08lx   ", (unsigned long)current_control_stack_pointer);
+    printf("CFP\t=\t0x%08lx   ", (unsigned long)current_control_frame_pointer);
 
 #ifdef reg_BSP
     printf("BSP\t=\t0x%08lx\n", (unsigned long)current_binding_stack_pointer);
 #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%08lx   ",
+           (unsigned long)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
 
@@ -203,20 +215,12 @@ regs_cmd(char **ptr)
     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
@@ -298,9 +302,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
@@ -444,7 +452,11 @@ sub_monitor(void)
     int ambig;
 
     if (!ldb_in) {
+#ifndef LISP_FEATURE_WIN32
         ldb_in = fopen("/dev/tty","r+");
+#else
+        ldb_in = stdin;
+#endif
         ldb_in_fd = fileno(ldb_in);
     }
 
@@ -453,14 +465,7 @@ 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)
@@ -498,7 +503,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);