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

dis: decode CALLA instruction.

This commit is contained in:
Daniel Beer 2010-08-10 15:06:12 +12:00
parent ab0d02b2b3
commit 3bec9b02cf
2 changed files with 72 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
dis.c
View File

@ -32,6 +32,69 @@
/* Disassembler /* Disassembler
*/ */
static int decode_13xx(const uint8_t *code, address_t offset,
address_t len, struct msp430_instruction *insn)
{
uint16_t op = code[0] | (code[1] << 8);
int subtype = (op >> 4) & 0xf;
insn->itype = MSP430_ITYPE_SINGLE;
insn->op = MSP430_OP_CALLA;
switch (subtype) {
case 0:
insn->itype = MSP430_ITYPE_NOARG;
insn->op = MSP430_OP_RETI;
return 2;
case 4:
insn->dst_mode = MSP430_AMODE_REGISTER;
insn->dst_reg = op & 0xf;
return 2;
case 5:
insn->dst_mode = MSP430_AMODE_INDEXED;
insn->dst_reg = op & 0xf;
break;
case 6:
insn->dst_mode = MSP430_AMODE_INDIRECT;
insn->dst_reg = op & 0xf;
return 2;
case 7:
insn->dst_mode = MSP430_AMODE_INDIRECT_INC;
insn->dst_reg = op & 0xf;
return 2;
case 8:
insn->dst_mode = MSP430_AMODE_ABSOLUTE;
insn->dst_addr = (address_t)(op & 0xf) << 16;
break;
case 9:
insn->dst_mode = MSP430_AMODE_SYMBOLIC;
insn->dst_addr = (address_t)(op & 0xf) << 16;
break;
case 11:
insn->dst_mode = MSP430_AMODE_IMMEDIATE;
insn->dst_addr = (address_t)(op & 0xf) << 16;
break;
default:
return -1;
}
if (len < 4)
return -1;
insn->dst_addr |= code[2];
insn->dst_addr |= code[3] << 8;
return 4;
}
/* Decode a single-operand instruction. /* Decode a single-operand instruction.
* *
* Returns the number of bytes consumed in decoding, or -1 if the a * Returns the number of bytes consumed in decoding, or -1 if the a
@ -477,11 +540,9 @@ int dis_decode(const uint8_t *code, address_t offset, address_t len,
insn->dsize = (op & 0x0100) ? insn->dsize = (op & 0x0100) ?
MSP430_DSIZE_WORD : MSP430_DSIZE_AWORD; MSP430_DSIZE_WORD : MSP430_DSIZE_AWORD;
ret = 2; ret = 2;
} else if ((op & 0xff80) == 0x1300) { } else if ((op & 0xff00) == 0x1300) {
insn->itype = MSP430_ITYPE_NOARG; ret = decode_13xx(code, offset, len, insn);
insn->op = MSP430_OP_RETI; } else if ((op & 0xf000) == 0x1000) {
ret = 2;
} else if ((op & 0xf000) == 0x1000 && (op & 0xfc00) < 0x1300) {
insn->itype = MSP430_ITYPE_SINGLE; insn->itype = MSP430_ITYPE_SINGLE;
ret = decode_single(code, offset, len, insn); ret = decode_single(code, offset, len, insn);
} else if ((op & 0xff00) >= 0x2000 && } else if ((op & 0xff00) >= 0x2000 &&
@ -601,6 +662,9 @@ static const struct {
{MSP430_OP_SXTX, "SXTX"}, {MSP430_OP_SXTX, "SXTX"},
{MSP430_OP_PUSHX, "PUSHX"}, {MSP430_OP_PUSHX, "PUSHX"},
/* MSP430X group 13xx */
{MSP430_OP_CALLA, "CALLA"},
/* MSP430X group 14xx */ /* MSP430X group 14xx */
{MSP430_OP_PUSHM, "PUSHM"}, {MSP430_OP_PUSHM, "PUSHM"},
{MSP430_OP_POPM, "POPM"}, {MSP430_OP_POPM, "POPM"},

3
dis.h
View File

@ -207,6 +207,9 @@ typedef enum {
MSP430_OP_XORX = 0x2E000, MSP430_OP_XORX = 0x2E000,
MSP430_OP_ANDX = 0x2F000, MSP430_OP_ANDX = 0x2F000,
/* MSP430X group 13xx */
MSP430_OP_CALLA = 0x21300,
/* MSP430X group 14xx */ /* MSP430X group 14xx */
MSP430_OP_PUSHM = 0x1400, MSP430_OP_PUSHM = 0x1400,
MSP430_OP_POPM = 0x1600, MSP430_OP_POPM = 0x1600,