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

Look up symbols for immediate operands.

This commit is contained in:
Daniel Beer 2010-03-29 21:42:53 +13:00
parent 19bb129f81
commit 37af91e60c
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
dis.c
View File

@ -528,18 +528,6 @@ static const char *const msp430_reg_names[] = {
"R12", "R13", "R14", "R15" "R12", "R13", "R14", "R15"
}; };
static int format_addr(char *buf, int max_len, const char *prefix,
u_int16_t addr)
{
char name[64];
u_int16_t offset;
if (stab_nearest(addr, name, sizeof(name), &offset) < 0 || offset)
return snprintf(buf, max_len, "%s0x%04x", prefix, addr);
return snprintf(buf, max_len, "%s%s", prefix, name);
}
/* Given an operands addressing mode, value and associated register, /* Given an operands addressing mode, value and associated register,
* print the canonical representation of it to stdout. * print the canonical representation of it to stdout.
* *
@ -549,6 +537,12 @@ static int format_operand(char *buf, int max_len,
msp430_amode_t amode, u_int16_t addr, msp430_amode_t amode, u_int16_t addr,
msp430_reg_t reg) msp430_reg_t reg)
{ {
const char *prefix = "";
const char *suffix = "";
char rbuf[32];
char name[64];
u_int16_t offset;
assert (reg >= 0 && reg < ARRAY_LEN(msp430_reg_names)); assert (reg >= 0 && reg < ARRAY_LEN(msp430_reg_names));
switch (amode) { switch (amode) {
@ -556,20 +550,16 @@ static int format_operand(char *buf, int max_len,
return snprintf(buf, max_len, "%s", msp430_reg_names[reg]); return snprintf(buf, max_len, "%s", msp430_reg_names[reg]);
case MSP430_AMODE_INDEXED: case MSP430_AMODE_INDEXED:
{ snprintf(rbuf, sizeof(rbuf), "(%s)", msp430_reg_names[reg]);
int len = format_addr(buf, max_len, "", addr); suffix = rbuf;
break;
len += snprintf(buf + len,
max_len - len,
"(%s)", msp430_reg_names[reg]);
return len;
}
case MSP430_AMODE_SYMBOLIC: case MSP430_AMODE_SYMBOLIC:
return format_addr(buf, max_len, "", addr); break;
case MSP430_AMODE_ABSOLUTE: case MSP430_AMODE_ABSOLUTE:
return format_addr(buf, max_len, "&", addr); prefix = "&";
break;
case MSP430_AMODE_INDIRECT: case MSP430_AMODE_INDIRECT:
return snprintf(buf, max_len, "@%s", msp430_reg_names[reg]); return snprintf(buf, max_len, "@%s", msp430_reg_names[reg]);
@ -578,10 +568,24 @@ static int format_operand(char *buf, int max_len,
return snprintf(buf, max_len, "@%s+", msp430_reg_names[reg]); return snprintf(buf, max_len, "@%s+", msp430_reg_names[reg]);
case MSP430_AMODE_IMMEDIATE: case MSP430_AMODE_IMMEDIATE:
return snprintf(buf, max_len, "#0x%x", (u_int16_t)addr); prefix = "#";
break;
default:
return snprintf(buf, max_len, "???");
} }
return snprintf(buf, max_len, "???"); if ((amode != MSP430_AMODE_IMMEDIATE ||
(addr >= 0x200 && addr < 0xfff0)) &&
!stab_nearest(addr, name, sizeof(name), &offset) &&
!offset)
return snprintf(buf, max_len, "%s%s%s",
prefix, name, suffix);
return snprintf(buf, max_len,
amode == MSP430_AMODE_IMMEDIATE ?
"%s0x%x%s" : "%s0x%04x%s",
prefix, addr, suffix);
} }
/* Write assembly language for the instruction to this buffer */ /* Write assembly language for the instruction to this buffer */
@ -616,19 +620,12 @@ int dis_format(char *buf, int max_len,
} }
/* Destination operand */ /* Destination operand */
if (insn->itype != MSP430_ITYPE_NOARG) { if (insn->itype != MSP430_ITYPE_NOARG)
if ((insn->op == MSP430_OP_CALL || count += format_operand(buf + count,
insn->op == MSP430_OP_BR) && max_len - count,
insn->dst_mode == MSP430_AMODE_IMMEDIATE) insn->dst_mode,
count += format_addr(buf + count, max_len - count, insn->dst_addr,
"#", insn->dst_addr); insn->dst_reg);
else
count += format_operand(buf + count,
max_len - count,
insn->dst_mode,
insn->dst_addr,
insn->dst_reg);
}
buf[count] = 0; buf[count] = 0;
return count; return count;