X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fparse.c;h=1edfe1849a8e1430ceaacf07d901bc07bca6943b;hb=7f1e94ae961a198e00daf281eb1dc858e5b2dcc7;hp=9dd8082a1e193e3c783add0b11511627f08fd22d;hpb=d0583fb59b0d5e243c9141d649b82bac577f5aa9;p=sbcl.git diff --git a/src/runtime/parse.c b/src/runtime/parse.c index 9dd8082..1edfe18 100644 --- a/src/runtime/parse.c +++ b/src/runtime/parse.c @@ -1,3 +1,5 @@ +/* parsing for LDB monitor */ + /* * This software is part of the SBCL system. See the README file for * more information. @@ -9,16 +11,20 @@ * files for more information. */ -/* - * $Header$ - */ - #include +#include #include -#include -#include "runtime.h" #include "sbcl.h" +#if defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THREAD) +#include "pthreads_win32.h" +#else +#include +#endif +#include "runtime.h" + +#if defined(LISP_FEATURE_SB_LDB) + #include "globals.h" #include "vars.h" #include "parse.h" @@ -26,8 +32,16 @@ #include "interrupt.h" #include "lispregs.h" #include "monitor.h" +#include "validate.h" #include "arch.h" #include "search.h" +#include "thread.h" +#include "pseudo-atomic.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) { @@ -35,10 +49,10 @@ static void skip_ws(char **ptr) (*ptr)++; } -static boolean string_to_long(char *token, long *value) +static boolean string_to_long(char *token, uword_t *value) { int base, digit; - long num; + uword_t num; char *ptr; if (token == 0) @@ -182,11 +196,11 @@ char *token; } #endif -long parse_number(ptr) +uword_t parse_number(ptr) char **ptr; { char *token = parse_token(ptr); - long result; + uword_t result; if (token == NULL) { printf("expected a number\n"); @@ -205,29 +219,30 @@ char *parse_addr(ptr) char **ptr; { char *token = parse_token(ptr); - long result; + lispobj result; if (token == NULL) { printf("expected an address\n"); throw_to_monitor(); } else if (token[0] == '$') { - if (!lookup_variable(token+1, (lispobj *)&result)) { + if (!lookup_variable(token+1, &result)) { printf("unknown variable: ``%s''\n", token); throw_to_monitor(); } result &= ~7; } else { - if (!string_to_long(token, &result)) { + uword_t value; + if (!string_to_long(token, &value)) { printf("invalid number: ``%s''\n", token); throw_to_monitor(); } - result &= ~3; + result = (value & ~3); } if (!is_valid_lisp_addr((os_vm_address_t)result)) { - printf("invalid Lisp-level address: 0x%lx\n", result); + printf("invalid Lisp-level address: %p\n", (void *)result); throw_to_monitor(); } @@ -242,26 +257,24 @@ static boolean lookup_symbol(char *name, lispobj *result) /* Search static space. */ headerptr = (lispobj *)STATIC_SPACE_START; count = - (lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER) - - (lispobj *)STATIC_SPACE_START; + (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. */ +#if defined(LISP_FEATURE_GENCGC) headerptr = (lispobj *)DYNAMIC_SPACE_START; -#if !defined(ibmrt) && !defined(__i386__) - count = - dynamic_space_free_pointer - - (lispobj *)DYNAMIC_SPACE_START; + count = (lispobj *)get_alloc_pointer() - headerptr; #else - count = - (lispobj *)SymbolValue(ALLOCATION_POINTER) - - (lispobj *)DYNAMIC_SPACE_START; + headerptr = (lispobj *)current_dynamic_space; + count = dynamic_space_free_pointer - headerptr; #endif + if (search_for_symbol(name, &headerptr, &count)) { - *result = (lispobj)headerptr | type_OtherPointer; + *result = make_lispobj(headerptr, OTHER_POINTER_LOWTAG); return 1; } @@ -271,66 +284,68 @@ 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; + uword_t pointer; lispobj result; + uword_t value; if (token == NULL) { printf("expected an object\n"); throw_to_monitor(); } else if (token[0] == '$') { - if (isalpha(token[1])) { - int free; - int regnum; - os_context_t *context; + if (isalpha(token[1])) { + int free_ici; + int regnum; + os_context_t *context; - free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX)>>2; + free_ici = fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)); - if (free == 0) { - printf("Variable ``%s'' is not valid -- there is no current interrupt context.\n", token); - throw_to_monitor(); - } + if (free_ici == 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_ici - 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); - } else if (!lookup_variable(token+1, &result)) { + result = *os_context_register_addr(context, regnum); + } else if (!lookup_variable(token+1, &result)) { printf("unknown variable: ``%s''\n", token); throw_to_monitor(); } @@ -349,8 +364,8 @@ char **ptr; throw_to_monitor(); } } - else if (string_to_long(token, (long *)&result)) - ; + else if (string_to_long(token, &value)) + result = value; else if (lookup_symbol(token, &result)) ; else { @@ -360,3 +375,5 @@ char **ptr; return result; } + +#endif /* defined(LISP_FEATURE_SB_LDB) */