#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)
{
/* 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;
}
(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;
}
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)
+ 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;
+ 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;
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();