projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.9.4.68:
[sbcl.git]
/
src
/
runtime
/
parse.c
diff --git
a/src/runtime/parse.c
b/src/runtime/parse.c
index
f8a0dd1
..
62a0f59
100644
(file)
--- 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);
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 (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 {
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();
}
printf("invalid number: ``%s''\n", token);
throw_to_monitor();
}
- result &= ~3;
+ result = (value & ~3);
}
if (!is_valid_lisp_addr((os_vm_address_t)result)) {
}
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();
}
throw_to_monitor();
}
@@
-310,6
+311,7
@@
char **ptr;
char *token = parse_token(ptr);
long pointer;
lispobj result;
char *token = parse_token(ptr);
long pointer;
lispobj result;
+ long value;
if (token == NULL) {
printf("expected an object\n");
if (token == NULL) {
printf("expected an object\n");
@@
-355,8
+357,8
@@
char **ptr;
throw_to_monitor();
}
}
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 {
else if (lookup_symbol(token, &result))
;
else {