X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmonitor.c;h=4037c92162a95d912f277fcb827900e3d804d75f;hb=bc46c8bcdd6ac8918df8ea9e9db49808e4924fcf;hp=14d1d431814852ad76c8db2294b8b911da5d9097;hpb=6fb6e66f531dfb6140ec3e0cc8f84f6ecd1927ca;p=sbcl.git

diff --git a/src/runtime/monitor.c b/src/runtime/monitor.c
index 14d1d43..4037c92 100644
--- 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,10 +249,10 @@ search_cmd(char **ptr)
         obj = *end;
         addr = end;
         end += 2;
-        if (TypeOf(obj) == type_SimpleFunHeader) {
+        if (widetag_of(obj) == SIMPLE_FUN_HEADER_WIDETAG) {
             print((long)addr | FUN_POINTER_LOWTAG);
-        } else if (lowtagof(obj) == OTHER_IMMEDIATE_0_LOWTAG ||
-		   lowtagof(obj) == OTHER_IMMEDIATE_1_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);
@@ -265,9 +268,9 @@ call_cmd(char **ptr)
     lispobj thing = parse_lispobj(ptr), function, result = 0, cons, args[3];
     int numargs;
 
-    if (lowtagof(thing) == OTHER_POINTER_LOWTAG) {
-	switch (TypeOf(*(lispobj *)(thing-OTHER_POINTER_LOWTAG))) {
-	  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) != FUN_POINTER_LOWTAG) {
+    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;