X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fparse.c;h=f6c636021d581fcddf8ebd44f1ab88447297e730;hb=cf4cb9554515c59eddbde38d1cf236339c37f55f;hp=4038f51104dd180900ee060159c18afd2dcf2d27;hpb=81cfdf526490d642c73602ebac9bcacb8af644e1;p=sbcl.git

diff --git a/src/runtime/parse.c b/src/runtime/parse.c
index 4038f51..f6c6360 100644
--- a/src/runtime/parse.c
+++ b/src/runtime/parse.c
@@ -15,8 +15,8 @@
 #include <ctype.h>
 #include <signal.h>
 
-#include "runtime.h"
 #include "sbcl.h"
+#include "runtime.h"
 
 #if defined(LISP_FEATURE_SB_LDB)
 
@@ -29,6 +29,12 @@
 #include "monitor.h"
 #include "arch.h"
 #include "search.h"
+#include "thread.h"
+
+#include "genesis/simple-fun.h"
+#include "genesis/fdefn.h"
+#include "genesis/symbol.h"
+#include "genesis/static-symbols.h"
 
 static void skip_ws(char **ptr)
 {
@@ -243,26 +249,26 @@ static boolean lookup_symbol(char *name, lispobj *result)
     /* Search static space. */
     headerptr = (lispobj *)STATIC_SPACE_START;
     count =
-	(lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER) -
+	(lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER,0) -
 	(lispobj *)STATIC_SPACE_START;
     if (search_for_symbol(name, &headerptr, &count)) {
-        *result = (lispobj)headerptr | type_OtherPointer;
+        *result = make_lispobj(headerptr,OTHER_POINTER_LOWTAG);
         return 1;
     }
 
     /* Search dynamic space. */
     headerptr = (lispobj *)DYNAMIC_SPACE_START;
-#if !defined(__i386__)
+#if !defined(LISP_FEATURE_X86)
     count =
 	dynamic_space_free_pointer -
 	(lispobj *)DYNAMIC_SPACE_START;
 #else
     count =
-	(lispobj *)SymbolValue(ALLOCATION_POINTER) -
+	(lispobj *)SymbolValue(ALLOCATION_POINTER,0) -
 	(lispobj *)DYNAMIC_SPACE_START;
 #endif
     if (search_for_symbol(name, &headerptr, &count)) {
-        *result = (lispobj)headerptr | type_OtherPointer;
+        *result = make_lispobj(headerptr, OTHER_POINTER_LOWTAG);
         return 1;
     }
 
@@ -272,36 +278,37 @@ static boolean lookup_symbol(char *name, lispobj *result)
 static int
 parse_regnum(char *s)
 {
-	if ((s[1] == 'R') || (s[1] == 'r')) {
-		int regnum;
-
-		if (s[2] == '\0')
-			return -1;
-
-		/* skip the $R part and call atoi on the number */
-		regnum = atoi(s + 2);
-		if ((regnum >= 0) && (regnum < NREGS))
-			return regnum;
-		else
-			return -1;
-	} else {
-		int i;
-
-		for (i = 0; i < NREGS ; i++)
-			if (strcasecmp(s + 1, lisp_register_names[i]) == 0)
-#ifdef __i386__
-				return i*2;
+    if ((s[1] == 'R') || (s[1] == 'r')) {
+	int regnum;
+
+	if (s[2] == '\0')
+	    return -1;
+
+	/* skip the $R part and call atoi on the number */
+	regnum = atoi(s + 2);
+	if ((regnum >= 0) && (regnum < NREGS))
+	    return regnum;
+	else
+	    return -1;
+    } else {
+	int i;
+
+	for (i = 0; i < NREGS ; i++)
+	    if (strcasecmp(s + 1, lisp_register_names[i]) == 0)
+#ifdef LISP_FEATURE_X86
+		return i*2;
 #else
-				return i;
+	return i;
 #endif
 		
-		return -1;
-	}
+	return -1;
+    }
 }
 
 lispobj parse_lispobj(ptr)
 char **ptr;
 {
+    struct thread *thread=arch_os_get_current_thread();
     char *token = parse_token(ptr);
     long pointer;
     lispobj result;
@@ -311,26 +318,26 @@ char **ptr;
         throw_to_monitor();
     } else if (token[0] == '$') {
 	if (isalpha(token[1])) {
-		int free;
-		int regnum;
-		os_context_t *context;
+	    int free;
+	    int regnum;
+	    os_context_t *context;
 
-		free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX)>>2;
+	    free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)>>2;
 
-		if (free == 0) {
-			printf("Variable ``%s'' is not valid -- there is no current interrupt context.\n", token);
-			throw_to_monitor();
-		}
+	    if (free == 0) {
+		printf("Variable ``%s'' is not valid -- there is no current interrupt context.\n", token);
+		throw_to_monitor();
+	    }
 
-		context = lisp_interrupt_contexts[free - 1];
+	    context = thread->interrupt_contexts[free - 1];
 
-		regnum = parse_regnum(token);
-		if (regnum < 0) {
-			printf("bogus register: ``%s''\n", token);
-			throw_to_monitor();
-		}
+	    regnum = parse_regnum(token);
+	    if (regnum < 0) {
+		printf("bogus register: ``%s''\n", token);
+		throw_to_monitor();
+	    }
 
-		result = *os_context_register_addr(context, regnum);
+	    result = *os_context_register_addr(context, regnum);
 	} else if (!lookup_variable(token+1, &result)) {
             printf("unknown variable: ``%s''\n", token);
             throw_to_monitor();