Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-24 06:48:46 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix ROR/ROL ESIL expressions for x86-64 capstone

Browse Source
This commit is contained in:
pancake 2016-03-16 12:51:26 +01:00
parent 8f2c20ded6
commit ec895d787c
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/anal/p/anal_x86_cs.c
View File

@ -596,8 +596,8 @@ SETL/SETNGE
op->type = R_ANAL_OP_TYPE_ROL;
if (a->decode) {
char *src = getarg (&gop, 1, 0, NULL);
char *dst = getarg (&gop, 0, 0, NULL);
esilprintf (op, "%s,%s,<<<,%s,=", src, dst, dst);
char *dst = getarg (&gop, 0, 1, NULL);
esilprintf (op, "%s,%s,<<<,%s", src, dst, dst);
free (src);
free (dst);
}
@ -609,8 +609,8 @@ SETL/SETNGE
op->type = R_ANAL_OP_TYPE_ROR;
if (a->decode) {
char *src = getarg (&gop, 1, 0, NULL);
char *dst = getarg (&gop, 0, 0, NULL);
esilprintf (op, "%s,%s,>>>,%s,=", src, dst, dst);
char *dst = getarg (&gop, 0, 1, NULL);
esilprintf (op, "%s,%s,>>>,%s", src, dst, dst);
free (src);
free (dst);
}
@ -1314,7 +1314,7 @@ SETL/SETNGE
{
char *src = getarg (&gop, 1, 0, NULL);
char *dst = getarg (&gop, 0, 1, NULL);
esilprintf (op, "%s,%s,%s,=,%s,=", src, dst, src, dst);
esilprintf (op, "%s,%s,%s,=,%s", src, dst, src, dst);
free (src);
free (dst);
}

26
libr/core/anal.c
View File

@ -2427,7 +2427,14 @@ R_API void r_core_anal_esil (RCore *core, const char *str) {
}
}
iend = end - addr;
if (iend < 0) {
return;
}
buf = malloc (iend+2);
if (buf == NULL) {
perror ("malloc");
return;
}
r_io_read_at (core->io, addr, buf, iend+1);
if (!ESIL) {
r_core_cmd0 (core, "aei");
@ -2485,26 +2492,15 @@ R_API void r_core_anal_esil (RCore *core, const char *str) {
ut64 dst = esilbreak_last_read;
if (myvalid (dst) && r_io_is_valid_offset (mycore->io, dst, 0)) {
r_anal_ref_add (core->anal, dst, cur, 'd');
//eprintf ("0x%08"PFMT64x" DATA 0x%08"PFMT64x"\n", cur, dst);
//r_core_cmdf (core, "axd 0x%08"PFMT64x" 0x%"PFMT64x, cur, dst);
} else {
//eprintf ("Unknown LOAD at 0x%08"PFMT64x"\n", cur);
}
}
break;
case R_ANAL_OP_TYPE_UJMP:
case R_ANAL_OP_TYPE_UCALL:
{
if (pcname && *pcname) {
ut64 dst = r_reg_getv (core->anal->reg, pcname);
if (myvalid (dst) && r_io_is_valid_offset (mycore->io, dst, 0)) {
// get pc
//eprintf ("0x%08"PFMT64x" UCALL 0x%08"PFMT64x"\n", cur, dst);
//r_core_cmdf (core, "axc 0x%08"PFMT64x" 0x%"PFMT64x, cur, dst);
r_anal_ref_add (core->anal, dst, cur, 'c');
} else {
//eprintf ("Unknown JMP/CALL at 0x%08"PFMT64x"\n", cur);
}
if (pcname && *pcname) {
ut64 dst = r_reg_getv (core->anal->reg, pcname);
if (myvalid (dst) && r_io_is_valid_offset (mycore->io, dst, 0)) {
r_anal_ref_add (core->anal, dst, cur, 'c');
}
}
break;

1
libr/core/cmd_anal.c
View File

@ -2147,6 +2147,7 @@ static void cmd_anal_esil(RCore *core, const char *input) {
switch (input[1]) {
case '\0':
input = "123*";
/* fall through */
case ' ':
if (esil && esil->stats) {
char *out = sdb_querys (esil->stats, NULL, 0, input + 2);