X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fparse.c;h=62a0f59b85da7b374da3170644ebe93ecf6cb9c0;hb=5e92e9ed61903658015c2a75c79a32ad41dbd29d;hp=f8a0dd123fd32c53a96ea7f19ab9bfa4a8cd987d;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git diff --git a/src/runtime/parse.c b/src/runtime/parse.c index f8a0dd1..62a0f59 100644 --- a/src/runtime/parse.c +++ b/src/runtime/parse.c @@ -213,29 +213,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)) { + long 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(); } @@ -310,6 +311,7 @@ char **ptr; char *token = parse_token(ptr); long pointer; lispobj result; + long value; if (token == NULL) { printf("expected an object\n"); @@ -355,8 +357,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 {