sys64738
/
mspdebug
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use decimal values unless indicated by 0x.

This commit is contained in:
Daniel Beer 2010-01-06 12:01:49 +13:00
parent 2bceb42bb7
commit 597de3180f
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.c
View File

@ -483,7 +483,7 @@ static int cmd_eval(char **arg)
return -1; return -1;
} }
printf("%04x", addr); printf("0x%04x", addr);
offset = addr; offset = addr;
if (!stab_find(&offset, &name)) { if (!stab_find(&offset, &name)) {
printf(" = %s", name); printf(" = %s", name);

33
stab.c
View File

@ -183,17 +183,33 @@ static int token_len;
static int token_mult; static int token_mult;
static int token_sum; static int token_sum;
static void token_add(void) static int token_add(void)
{ {
int low = 0; int low = 0;
int high = by_name.len - 1; int high = by_name.len - 1;
int i;
if (!token_len) if (!token_len)
return; return 0;
token_buf[token_len] = 0; token_buf[token_len] = 0;
token_len = 0; token_len = 0;
/* Is it a decimal? */
i = 0;
while (token_buf[i] && isdigit(token_buf[i]))
i++;
if (!token_buf[i]) {
token_sum += token_mult * atoi(token_buf);
return 0;
}
/* Is it hex? */
if (token_buf[0] == '0' && tolower(token_buf[1]) == 'x') {
token_sum += token_mult * strtol(token_buf + 2, NULL, 16);
return 0;
}
/* Look up the name in the symbol table */ /* Look up the name in the symbol table */
while (low <= high) { while (low <= high) {
int mid = (low + high) / 2; int mid = (low + high) / 2;
@ -202,7 +218,7 @@ static void token_add(void)
if (!cmp) { if (!cmp) {
token_sum += token_mult * (int)sym->addr; token_sum += token_mult * (int)sym->addr;
return; return 0;
} }
if (cmp < 0) if (cmp < 0)
@ -211,8 +227,8 @@ static void token_add(void)
high = mid - 1; high = mid - 1;
} }
/* Not found? Try to parse it the old way */ fprintf(stderr, "stab: unknown token: %s\n", token_buf);
token_sum += token_mult * strtol(token_buf, NULL, 16); return -1;
} }
int stab_parse(const char *text, int *addr) int stab_parse(const char *text, int *addr)
@ -228,7 +244,8 @@ int stab_parse(const char *text, int *addr)
if (token_len + 1 < sizeof(token_buf)) if (token_len + 1 < sizeof(token_buf))
token_buf[token_len++] = *text; token_buf[token_len++] = *text;
} else { } else {
token_add(); if (token_add() < 0)
return -1;
if (*text == '+') if (*text == '+')
token_mult = 1; token_mult = 1;
if (*text == '-') if (*text == '-')
@ -238,7 +255,9 @@ int stab_parse(const char *text, int *addr)
text++; text++;
} }
token_add(); if (token_add() < 0)
return -1;
*addr = token_sum; *addr = token_sum;
return 0; return 0;
} }