Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-13 18:32:56 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix #5874 - Implement asm.relsub for arm.cs

Browse Source
This commit is contained in:
pancake 2016-09-29 11:25:18 +02:00
parent c02be8da7d
commit bfbc5c2f7f
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libr/parse/p/parse_arm_pseudo.c
View File

@ -159,12 +159,13 @@ static int parse(RParse *p, const char *data, char *str) {
int i, len = strlen (data);
char *buf, *ptr, *optr;
if (len>=sizeof (w0))
if (len >= sizeof (w0))
return false;
// malloc can be slow here :?
if (!(buf = malloc (len+1)))
if (!(buf = malloc (len + 1))) {
return false;
memcpy (buf, data, len+1);
}
memcpy (buf, data, len + 1);
if (*buf) {
*w0 = *w1 = *w2 = *w3 = '\0';
@ -236,6 +237,27 @@ static bool varsub(RParse *p, RAnalFunction *f, ut64 addr, int oplen, char *data
free (tstr);
return false;
}
if (p->relsub) {
char *rip = strstr (tstr, "[pc, ");
if (rip) {
rip += 4;
char *tstr_new, *ripend = strchr (rip, ']');
const char *neg = strchr (rip, '-');
ut64 repl_num = (2 * oplen) + addr;
if (!ripend) {
ripend = "]";
}
if (neg) {
repl_num -= r_num_get (NULL, neg + 1);
} else {
repl_num += r_num_get (NULL, rip);
}
rip[1] = '\0';
tstr_new = r_str_newf ("%s0x%08"PFMT64x"%s", tstr, repl_num, ripend);
free (tstr);
tstr = tstr_new;
}
}
regargs = p->varlist (p->anal, f, 'r');
bpargs = p->varlist (p->anal, f, 'b');