Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-06 21:39:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix avr's rjmp disasm, analysis and esil

Browse Source
This commit is contained in:
pancake 2016-07-25 03:19:16 +02:00
parent 0cffcb981e
commit 91fe80f4ca
3 changed files with 14 additions and 10 deletions

15
libr/anal/p/anal_avr.c

@ -18,11 +18,14 @@ https://en.wikipedia.org/wiki/Atmel_AVR_instruction_set
#define AVR_SOFTCAST(x,y) (x+(y*0x100))
static ut64 rjmp_dest(ut64 addr, const ut8* b) {
ut64 dst = 2 + addr + ((st8)b[0] * 2);
if ((st8)b[0] > 0) {
dst += ((b[1] & 0xf) * 2) << 8;
uint16_t data = (b[0] + (b[1] << 8)) & 0xfff;
int32_t op = data;
op <<= 1;
if (op & 0x1000) {
short val = (~op) & 0xfff;
return (ut64)(addr - val + 1);
}
return dst;
return addr + op + 2;
}
static int avr_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len) {
@ -31,7 +34,7 @@ static int avr_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
ut8 kbuf[4];
ut16 ins = AVR_SOFTCAST (buf[0], buf[1]);
char *arg, str[32];
if (op == NULL) {
if (!op) {
return 2;
}
memset (op, '\0', sizeof (RAnalOp));
@ -242,7 +245,7 @@ static int avr_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *buf, int len)
ut64 dst = rjmp_dest (addr, buf);
op->jump = dst;
op->fail = UT64_MAX;
r_strbuf_setf (&op->esil, "%d,PC,=", (int)dst);
r_strbuf_setf (&op->esil, "%"PFMT64d",PC,=", dst);
return op->size;
}
switch (buf[1]) {

3
libr/anal/p/anal_x86_cs.c

@ -2071,9 +2071,8 @@ static void anop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, csh
case X86_INS_DIV:
op->type = R_ANAL_OP_TYPE_DIV;
break;
case X86_INS_AAM:
case X86_INS_IMUL:
op->type = R_ANAL_OP_TYPE_MUL;
break;
case X86_INS_MUL:
case X86_INS_MULX:
case X86_INS_MULPD:

6
libr/asm/arch/avr/avr_disasm.c

@ -257,8 +257,10 @@ static int disassembleOperands(disassembledInstruction *dInstruction) {
* is 16 bits, and the operand data's signedness only starts at 0x1000.
* Therefore we must convert to the positive value and then make the entire
* short negative. */
dInstruction->operands[i] = (~dInstruction->operands[i]+1)&0xFFF;
dInstruction->operands[i] = -dInstruction->operands[i]+2;
short val = ((~dInstruction->operands[i]) ) & 0xFFF;
//dInstruction->operands[i] = (~dInstruction->operands[i])&0xFFF;
dInstruction->operands[i] = -val + 1;
//dInstruction->operands[i] += 2;
} else {
dInstruction->operands[i] += 2;
}