0.8.3.1

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

diff --git a/src/runtime/search.c b/src/runtime/search.c
index 19e656e..1ea8dfa 100644 (file)
--- a/src/runtime/search.c
+++ b/src/runtime/search.c
@@ -9,14 +9,14 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
+#include <string.h>
 
 #include "runtime.h"
 #include "sbcl.h"
 #include "os.h"
 #include "search.h"
+#include "thread.h"
+#include "genesis/primitive-objects.h"
 
 boolean search_for_type(int type, lispobj **start, int *count)
 {
@@ -29,7 +29,7 @@ boolean search_for_type(int type, lispobj **start, int *count)
         if (*count != -1)
             *count -= 2;
 
-        if (TypeOf(obj) == type)
+        if (widetag_of(obj) == type)
             return 1;
 
         (*start) += 2;
@@ -42,12 +42,12 @@ boolean search_for_symbol(char *name, lispobj **start, int *count)
     struct symbol *symbol;
     struct vector *symbol_name;
 
-    while (search_for_type(type_SymbolHeader, start, count)) {
-        symbol = (struct symbol *)PTR((lispobj)*start);
-       if (LowtagOf(symbol->name) == type_OtherPointer) {
-            symbol_name = (struct vector *)PTR(symbol->name);
+    while (search_for_type(SYMBOL_HEADER_WIDETAG, start, count)) {
+        symbol = (struct symbol *)native_pointer((lispobj)*start);
+       if (lowtag_of(symbol->name) == OTHER_POINTER_LOWTAG) {
+            symbol_name = (struct vector *)native_pointer(symbol->name);
             if (is_valid_lisp_addr((os_vm_address_t)symbol_name) &&
-               TypeOf(symbol_name->header) == type_SimpleString &&
+               widetag_of(symbol_name->header) == SIMPLE_BASE_STRING_WIDETAG &&
                strcmp((char *)symbol_name->data, name) == 0)
                 return 1;
        }