X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmonitor.c;h=72d31040b53aacb935bf6cc2b7d90bb427972a1d;hb=5d18b03968d5fc696790609ae0ac2669473fbfb7;hp=cbd92872a5073b4632214666d022512f58fe7f8a;hpb=6cbe4d8ba6d7bc469d03a72514c789b1f3944878;p=sbcl.git

diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c
index cbd9287..72d3104 100644
--- a/src/runtime/monitor.c
+++ b/src/runtime/monitor.c
@@ -20,13 +20,10 @@
 
 #include "runtime.h"
 #include "sbcl.h"
-#include "globals.h"
-#include "vars.h"
-#include "parse.h"
-#include "os.h"
-#include "interrupt.h"
-#include "lispregs.h"
-#include "monitor.h"
+
+/* Almost all of this file can be skipped if we're not supporting LDB. */
+#if defined(LISP_FEATURE_SB_LDB)
+
 #include "print.h"
 #include "arch.h"
 #include "interr.h"
@@ -216,7 +213,7 @@ search_cmd(char **ptr)
             return;
         }
         if (more_p(ptr)) {
-            addr = (lispobj *)PTR((long)parse_addr(ptr));
+            addr = (lispobj *)native_pointer((long)parse_addr(ptr));
             if (more_p(ptr)) {
                 count = parse_number(ptr);
             }
@@ -557,3 +554,17 @@ throw_to_monitor()
 {
     longjmp(curbuf, 1);
 }
+
+#endif /* defined(LISP_FEATURE_SB_LDB) */
+
+/* what we do when things go badly wrong at a low level */
+void
+monitor_or_something()
+{
+#if defined(LISP_FEATURE_SB_LDB)
+    ldb_monitor();
+#else
+    fprintf(stderr, "There's no LDB in this build; exiting.\n");
+    exit(1);
+#endif
+}