Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-06 13:18:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

msp430: Fix some bugs

Browse Source
This commit is contained in:
Fedor Sakharov 2015-02-17 21:49:38 +03:00 committed by pancake
parent 7a29312eeb
commit 1c49aad91d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libr/asm/arch/msp430/msp430_disas.c
View File

@ -137,7 +137,7 @@ static int decode_emulation (ut16 instr, ut16 dst, struct msp430_cmd *cmd)
} else if (opcode == MSP430_ADD && as == 2 && get_src (instr) == MSP430_R3) {
snprintf (cmd->instr, MSP430_INSTR_MAXLEN - 1, "%s",
get_bw (instr) ? "incd.b" : "incd");
remove_second_operand (cmd);
remove_first_operand (cmd);
} else if (opcode == MSP430_XOR && as == 3 && get_src (instr) != MSP430_R3
&& get_src (instr) != MSP430_SR && (dst == 0xFFFF || dst == 0xFF)) {
snprintf (cmd->instr, MSP430_INSTR_MAXLEN - 1, "%s",
@ -285,7 +285,8 @@ static int decode_addressing_mode (ut16 instr, ut16 dst, ut16 op2, struct msp430
ret = 4;
break;
case MSP430_SR:
if (as == 1 && get_src (instr) == 2) {
if ((as == 1 || as == 3) && (get_src (instr) == MSP430_PC
|| get_src (instr) == 2)) {
snprintf (dstbuf, 15, ", &0x%04x", op2);
ret = 6;
} else {
@ -294,8 +295,7 @@ static int decode_addressing_mode (ut16 instr, ut16 dst, ut16 op2, struct msp430
}
break;
default:
if (as == 1 && get_src (instr) != 0 && get_src (instr) != 2
&& get_src (instr) != 3) {
if ((as == 1 || as == 3) && get_src (instr) == MSP430_PC) {
snprintf (dstbuf, 15, ", 0x%x(r%d)", op2, get_dst (instr));
ret = 6;
} else {

6
libr/asm/p/asm_msp430.c
View File

@ -14,7 +14,11 @@ static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len)
ret = msp430_decode_command (buf, &cmd);
if (ret > 0) {
snprintf (op->buf_asm, R_ASM_BUFSIZE, "%s %s", cmd.instr, cmd.operands);
if (cmd.operands[0]) {
snprintf (op->buf_asm, R_ASM_BUFSIZE, "%s %s", cmd.instr, cmd.operands);
} else {
snprintf (op->buf_asm, R_ASM_BUFSIZE, "%s", cmd.instr, cmd.operands);
}
}
op->size = ret;