0.7.4.40:

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

diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c
index f8a0778..4037c92 100644 (file)
--- a/src/runtime/monitor.c
+++ b/src/runtime/monitor.c
@@ -30,6 +30,9 @@
 #include "gc.h"
 #include "search.h"
 #include "purify.h"
+#include "globals.h"
+#include "lispregs.h"
+#include "interrupt.h"
 
 /* When we need to do command input, we use this stream, which is not
  * in general stdin, so that things will "work" (as well as being
@@ -246,11 +249,11 @@ search_cmd(char **ptr)
         obj = *end;
         addr = end;
         end += 2;
-        if (TypeOf(obj) == type_SimpleFunHeader) {
-            print((long)addr | type_FunPointer);
-        } else if (LowtagOf(obj) == type_OtherImmediate0 ||
-                  LowtagOf(obj) == type_OtherImmediate1) {
-            print((lispobj)addr | type_OtherPointer);
+        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((lispobj)addr | OTHER_POINTER_LOWTAG);
         } else {
             print((lispobj)addr);
         } if (count == -1) {
@@ -265,9 +268,9 @@ call_cmd(char **ptr)
     lispobj thing = parse_lispobj(ptr), function, result = 0, cons, args[3];
     int numargs;
 
-    if (LowtagOf(thing) == type_OtherPointer) {
-       switch (TypeOf(*(lispobj *)(thing-type_OtherPointer))) {
-         case type_SymbolHeader:
+    if (lowtag_of(thing) == OTHER_POINTER_LOWTAG) {
+       switch (widetag_of(*(lispobj *)(thing-OTHER_POINTER_LOWTAG))) {
+         case SYMBOL_HEADER_WIDETAG:
            for (cons = SymbolValue(INITIAL_FDEFN_OBJECTS);
                 cons != NIL;
                 cons = CONS(cons)->cdr) {
@@ -279,7 +282,7 @@ call_cmd(char **ptr)
            printf("Symbol 0x%08lx is undefined.\n", (long unsigned)thing);
            return;
 
-         case type_Fdefn:
+         case FDEFN_WIDETAG:
          fdefn:
            function = FDEFN(thing)->fun;
            if (function == NIL) {
@@ -294,7 +297,7 @@ call_cmd(char **ptr)
            return;
        }
     }
-    else if (LowtagOf(thing) != type_FunPointer) {
+    else if (lowtag_of(thing) != FUN_POINTER_LOWTAG) {
         printf("0x%08lx is not a function pointer, symbol, or fdefn object.\n",
               (long unsigned)thing);
         return;
@@ -459,7 +462,7 @@ catchers_cmd(char **ptr)
                   (unsigned long)catch, (unsigned long)(catch->current_uwp),
                   (unsigned long)(catch->current_cont),
                   (unsigned long)component_ptr_from_pc((void*)catch->entry_pc) +
-                  type_OtherPointer,
+                  OTHER_POINTER_LOWTAG,
                   (unsigned long)catch->entry_pc);
 #endif
             brief_print((lispobj)catch->tag);