X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fparse.c;h=d00719366a84b7ea673ce9eeb71814e53d03f511;hb=5563d2712045491695f68c018dbdd1233faca4e5;hp=8a2d9e32352e5fb9b29b8a218d68ac2bda70e5dc;hpb=f7b3fe1bd86348bfd2a3c506e437084752142c83;p=sbcl.git diff --git a/src/runtime/parse.c b/src/runtime/parse.c index 8a2d9e3..d007193 100644 --- a/src/runtime/parse.c +++ b/src/runtime/parse.c @@ -15,8 +15,8 @@ #include #include -#include "runtime.h" #include "sbcl.h" +#include "runtime.h" #if defined(LISP_FEATURE_SB_LDB) @@ -27,6 +27,7 @@ #include "interrupt.h" #include "lispregs.h" #include "monitor.h" +#include "validate.h" #include "arch.h" #include "search.h" #include "thread.h" @@ -257,15 +258,12 @@ static boolean lookup_symbol(char *name, lispobj *result) } /* Search dynamic space. */ - headerptr = (lispobj *)DYNAMIC_SPACE_START; -#if !defined(LISP_FEATURE_X86) - count = - dynamic_space_free_pointer - - (lispobj *)DYNAMIC_SPACE_START; +#ifndef LISP_FEATURE_GENCGC + headerptr = (lispobj *)current_dynamic_space; + count = dynamic_space_free_pointer - headerptr; #else - count = - (lispobj *)SymbolValue(ALLOCATION_POINTER,0) - - (lispobj *)DYNAMIC_SPACE_START; + headerptr = (lispobj *)DYNAMIC_SPACE_START; + count = ((lispobj *)SymbolValue(ALLOCATION_POINTER,0)) - headerptr; #endif if (search_for_symbol(name, &headerptr, &count)) { *result = make_lispobj(headerptr, OTHER_POINTER_LOWTAG);