dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect PPC ESIL and add testcase (#15970) (#15995)

This commit is contained in:
Drew McGowen 2020-02-18 09:08:38 -06:00 committed by GitHub
parent d913c8dbe6
commit 60028dd53d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libr/anal/p/anal_ppc_cs.c
View File

@ -563,6 +563,7 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAn
static int omode = -1, obits = -1;
int n, ret;
cs_insn *insn;
char *op1;
int mode = (a->bits == 64) ? CS_MODE_64 : (a->bits == 32) ? CS_MODE_32 : 0;
mode |= a->big_endian ? CS_MODE_BIG_ENDIAN : CS_MODE_LITTLE_ENDIAN;
@ -713,7 +714,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAn
break;
case PPC_INS_STWU:
op->type = R_ANAL_OP_TYPE_STORE;
esilprintf (op, "%s,%s,4,%s,+=", ARG (0), ARG2 (1, "=[4]"), REG2(1));
op1 = ARG (1);
op1[strlen (op1) - 1] = 0;
esilprintf (op, "%s,%s,=[4],%s=", ARG (0), op1, op1);
break;
case PPC_INS_STWBRX:
op->type = R_ANAL_OP_TYPE_STORE;
@ -724,7 +727,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAn
break;
case PPC_INS_STBU:
op->type = R_ANAL_OP_TYPE_STORE;
esilprintf (op, "%s,%s,1,%s,+=", ARG (0), ARG2 (1, "=[1]"), REG2(1));
op1 = ARG (1);
op1[strlen (op1) - 1] = 0;
esilprintf (op, "%s,%s,=[1],%s=", ARG (0), op1, op1);
break;
case PPC_INS_STH:
op->type = R_ANAL_OP_TYPE_STORE;
@ -732,7 +737,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAn
break;
case PPC_INS_STHU:
op->type = R_ANAL_OP_TYPE_STORE;
esilprintf (op, "%s,%s,2,%s,+=", ARG (0), ARG2 (1, "=[2]"), REG2(1));
op1 = ARG (1);
op1[strlen (op1) - 1] = 0;
esilprintf (op, "%s,%s,=[2],%s=", ARG (0), op1, op1);
break;
case PPC_INS_STD:
op->type = R_ANAL_OP_TYPE_STORE;
@ -740,7 +747,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAn
break;
case PPC_INS_STDU:
op->type = R_ANAL_OP_TYPE_STORE;
esilprintf (op, "%s,%s,8,%s,+=", ARG (0), ARG2 (1, "=[8]"), REG2(1));
op1 = ARG (1);
op1[strlen (op1) - 1] = 0;
esilprintf (op, "%s,%s,=[8],%s=", ARG (0), op1, op1);
break;
case PPC_INS_LBZ:
#if CS_API_MAJOR >= 4
@ -749,7 +758,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAn
case PPC_INS_LBZU:
case PPC_INS_LBZUX:
op->type = R_ANAL_OP_TYPE_LOAD;
esilprintf (op, "%s,%s,=,1,%s,+=", ARG2 (1, "[1]"), ARG (0), REG2(1));
op1 = ARG (1);
op1[strlen (op1) - 1] = 0;
esilprintf (op, "%s,[1],%s,=,%s=", op1, ARG (0), op1);
break;
case PPC_INS_LBZX:
op->type = R_ANAL_OP_TYPE_LOAD;
@ -763,7 +774,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAn
case PPC_INS_LDU:
case PPC_INS_LDUX:
op->type = R_ANAL_OP_TYPE_LOAD;
esilprintf (op, "%s,%s,=,8,%s,+=", ARG2 (1, "[8]"), ARG (0), REG2(1));
op1 = ARG (1);
op1[strlen (op1) - 1] = 0;
esilprintf (op, "%s,[8],%s,=,%s=", op1, ARG (0), op1);
break;
case PPC_INS_LDX:
op->type = R_ANAL_OP_TYPE_LOAD;
@ -792,7 +805,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAn
case PPC_INS_LHZ:
case PPC_INS_LHZU:
op->type = R_ANAL_OP_TYPE_LOAD;
esilprintf (op, "%s,%s,=", ARG2 (1, "[2]"), ARG (0));
op1 = ARG (1);
op1[strlen (op1) - 1] = 0;
esilprintf (op, "%s,[2],%s,=,%s=", op1, ARG (0), op1);
break;
case PPC_INS_LHBRX:
op->type = R_ANAL_OP_TYPE_LOAD;
@ -812,7 +827,9 @@ static int analop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, RAn
case PPC_INS_LWZU:
case PPC_INS_LWZUX:
op->type = R_ANAL_OP_TYPE_LOAD;
esilprintf (op, "%s,%s,=,4,%s,+=", ARG2 (1, "[4]"), ARG (0), REG2 (1));
op1 = ARG (1);
op1[strlen(op1) - 1] = 0;
esilprintf (op, "%s,[4],%s,=,%s=", op1, ARG (0), op1);
break;
case PPC_INS_LWBRX:
op->type = R_ANAL_OP_TYPE_LOAD;

4
test/new/db/anal/ppc
View File

@ -443,9 +443,9 @@ RUN
NAME=ppc-update-suffix-esil
FILE=../bins/elf/a6ppc.out
EXPECT=<<EOF
0x00010013
0x0000ffbf
0x10010107
0x00010015
0x0000ffc1
0x1001010a
EOF
CMDS=<<EOF

25
test/new/db/esil/ppc_32 Normal file
View File

@ -0,0 +1,25 @@
NAME=load with update ppc-32
FILE=-
EXPECT='lwzu r1, -8(r1)
0x00000000 -8,r1,+,[4],r1,=,-8,r1,+='
CMDS=<<EOF
e asm.arch=ppc
e asm.bits=32
e cfg.bigendian=true
"(pi bytes,wx $0,pi 1,pie 1)"
.(pi 8421fff8)
EOF
RUN
NAME=store with update ppc-32
FILE=-
EXPECT='stwu r1, -8(r1)
0x00000000 r1,-8,r1,+,=[4],-8,r1,+='
CMDS=<<EOF
e asm.arch=ppc
e asm.bits=32
e cfg.bigendian=true
"(pi bytes,wx $0,pi 1,pie 1)"
.(pi 9421fff8)
EOF
RUN