dis: decode MSP430X group 14xx non-address instructions (RxxM).
This commit is contained in:
parent
940e5f172d
commit
bdeadb5192
19
dis.c
19
dis.c
|
@ -459,7 +459,16 @@ int dis_decode(const uint8_t *code, address_t offset, address_t len,
|
|||
insn->dsize = MSP430_DSIZE_UNKNOWN;
|
||||
}
|
||||
} else {
|
||||
if ((op & 0xfc00) == 0x1400) {
|
||||
if ((op & 0xf0e0) == 0x0040) {
|
||||
insn->itype = MSP430_ITYPE_SINGLE;
|
||||
insn->op = op & 0xf3e0;
|
||||
insn->dst_mode = MSP430_AMODE_REGISTER;
|
||||
insn->dst_reg = op & 0xf;
|
||||
insn->rep_index = (op >> 10) & 3;
|
||||
insn->dsize = (op & 0x0010) ?
|
||||
MSP430_DSIZE_WORD : MSP430_DSIZE_AWORD;
|
||||
ret = 2;
|
||||
} else if ((op & 0xfc00) == 0x1400) {
|
||||
insn->itype = MSP430_ITYPE_SINGLE;
|
||||
insn->op = op & 0xfe00;
|
||||
insn->dst_mode = MSP430_AMODE_REGISTER;
|
||||
|
@ -590,7 +599,13 @@ static const struct {
|
|||
|
||||
/* MSP430X group 14xx */
|
||||
{MSP430_OP_PUSHM, "PUSHM"},
|
||||
{MSP430_OP_POPM, "POPM"}
|
||||
{MSP430_OP_POPM, "POPM"},
|
||||
|
||||
/* MSP430X group 00xx, non-address */
|
||||
{MSP430_OP_RRCM, "RRCM"},
|
||||
{MSP430_OP_RRAM, "RRAM"},
|
||||
{MSP430_OP_RLAM, "RLAM"},
|
||||
{MSP430_OP_RRUM, "RRUM"}
|
||||
};
|
||||
|
||||
/* Return the mnemonic for an operation, if possible. */
|
||||
|
|
8
dis.h
8
dis.h
|
@ -209,7 +209,13 @@ typedef enum {
|
|||
|
||||
/* MSP430X group 14xx */
|
||||
MSP430_OP_PUSHM = 0x1400,
|
||||
MSP430_OP_POPM = 0x1600
|
||||
MSP430_OP_POPM = 0x1600,
|
||||
|
||||
/* MSP430X group 00xx, non-address */
|
||||
MSP430_OP_RRCM = 0x0040,
|
||||
MSP430_OP_RRAM = 0x0140,
|
||||
MSP430_OP_RLAM = 0x0240,
|
||||
MSP430_OP_RRUM = 0x0340
|
||||
} msp430_op_t;
|
||||
|
||||
/* This represents a decoded instruction. All decoded addresses are
|
||||
|
|
Loading…
Reference in New Issue