denuvo-ref/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2 synced 2026-08-22 20:23:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Zero-extend 32-bit register writes on x86-64 ##esil

Browse source
This commit is contained in:
potato 2026-08-18 21:44:15 +05:30 • committed by GitHub
parent 5cb27fc352
commit e3d433fb8e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 57 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

44
libr/arch/p/x86/plugin_cs.c
View file

@ -114,6 +114,9 @@ struct Getarg {
cs_insn *insn;
int bits;
int syntax; // R_ARCH_SYNTAX_ATT or R_ARCH_SYNTAX_INTEL
// bare 32-bit register destination in 64-bit mode, and its 64-bit name
char zext32[16];
char zext64[16];
};
// TODO: get rid of this unnecessary wrapper
@ -302,6 +305,20 @@ static char *shift_count(const char *src, ut32 bitsize) {
return r_str_newf ("%s,0x%x,&", src, (bitsize > 32)? 0x3f: 0x1f);
}
static inline bool get64from32(const char *s, char *out, size_t outsz) {
if (*s == 'e') {
snprintf (out, outsz, "r%s", s + 1);
return true;
}
if (*s == 'r' && isdigit (s[1])) {
if (s[2] == 'd' || (s[2] != 0 && isdigit(s[2]) && s[3] == 'd')) {
snprintf (out, outsz, "r%d", atoi (s + 1));
return true;
}
}
return false;
}
static char *getarg(struct Getarg* gop, int n, int set, char *setop, ut32 *bitsize) {
const char *setarg = r_str_get (setop);
cs_insn *insn = gop->insn;
@ -341,6 +358,11 @@ static char *getarg(struct Getarg* gop, int n, int set, char *setop, ut32 *bitsi
rn = stbuf;
}
if (set == 1) {
// writing eax zero-extends into rax, which ESIL wont do on its own
if (gop->bits == 64
&& get64from32 (rn, gop->zext64, sizeof (gop->zext64))) {
r_str_ncpy (gop->zext32, rn, sizeof (gop->zext32));
}
return r_str_newf ("%s,%s=", rn, setarg);
}
return strdup (rn);
@ -454,20 +476,6 @@ static const char *reg32_to_name(ut8 reg) {
}
#endif
static inline bool get64from32(const char *s, char *out, size_t outsz) {
if (*s == 'e') {
snprintf (out, outsz, "r%s", s + 1);
return true;
}
if (*s == 'r' && isdigit (s[1])) {
if (s[2] == 'd' || (s[2] != 0 && isdigit(s[2]) && s[3] == 'd')) {
snprintf (out, outsz, "r%d", atoi (s + 1));
return true;
}
}
return false;
}
static void anop_esil(RArchSession *as, RAnalOp *op, ut64 addr, const ut8 *buf, int len, csh handle, cs_insn *insn) {
RAnalValue *val = NULL;
const int bits = as->config->bits;
@ -498,7 +506,9 @@ static void anop_esil(RArchSession *as, RAnalOp *op, ut64 addr, const ut8 *buf,
.handle = handle,
.insn = insn,
.bits = bits,
.syntax = as->config->syntax
.syntax = as->config->syntax,
.zext32 = {0},
.zext64 = {0}
};
char *src = NULL;
char *src2 = NULL;
@ -2736,6 +2746,10 @@ static void anop_esil(RArchSession *as, RAnalOp *op, ut64 addr, const ut8 *buf,
r_strbuf_prepend (&op->esil, counter);
r_strbuf_appendf (&op->esil, ",%s,--=,zf,?{,BREAK,},0,GOTO", counter);
}
if (*gop.zext64 && r_strbuf_length (&op->esil) > 0) {
// after the flag assignments, so this doesnt disturb the comparison state
r_strbuf_appendf (&op->esil, ",%s,%s,=", gop.zext32, gop.zext64);
}
}
static void set_access_info(RArchSession *as, RAnalOp *op, csh handle, cs_insn *insn, int mode) {

4
test/db/cmd/cmd_pdr
View file

@ -222,7 +222,7 @@ EXPECT=<<EOF
{
"addr": 9,
"val": 253,
"esil": "0,cf,:=,1,253,0x1f,&,-,1,<<,ebx,&,?{,1,cf,:=,},253,0x1f,&,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=",
"esil": "0,cf,:=,1,253,0x1f,&,-,1,<<,ebx,&,?{,1,cf,:=,},253,0x1f,&,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=,ebx,rbx,=",
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 16,
@ -413,7 +413,7 @@ jmp 3
{
"addr": 9,
"val": 253,
"esil": "0,cf,:=,1,253,0x1f,&,-,1,<<,ebx,&,?{,1,cf,:=,},253,0x1f,&,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=",
"esil": "0,cf,:=,1,253,0x1f,&,-,1,<<,ebx,&,?{,1,cf,:=,},253,0x1f,&,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=,ebx,rbx,=",
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 16,

4
test/db/cmd/midbb
View file

@ -176,7 +176,7 @@ EXPECT=<<EOF
{
"addr": 9,
"val": 253,
"esil": "0,cf,:=,1,253,0x1f,&,-,1,<<,ebx,&,?{,1,cf,:=,},253,0x1f,&,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=",
"esil": "0,cf,:=,1,253,0x1f,&,-,1,<<,ebx,&,?{,1,cf,:=,},253,0x1f,&,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=,ebx,rbx,=",
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 16,
@ -457,7 +457,7 @@ EXPECT=<<EOF
{
"addr": 9,
"val": 253,
"esil": "0,cf,:=,1,253,0x1f,&,-,1,<<,ebx,&,?{,1,cf,:=,},253,0x1f,&,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=",
"esil": "0,cf,:=,1,253,0x1f,&,-,1,<<,ebx,&,?{,1,cf,:=,},253,0x1f,&,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=,ebx,rbx,=",
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 16,

26
test/db/esil/x86_64
View file

@ -548,9 +548,9 @@ EXPECT=<<EOF
0x00000001
0x300020100
0x00000001
0x3fffdff00
0xfffdff00
0x00000001
0xfffffffc00020100
0xffffffff00020100
0x00000001
EOF
RUN
@ -680,3 +680,25 @@ EXPECT=<<EOF
0xffffffff
EOF
RUN
NAME=32-bit register write zero-extends
FILE=malloc://0x100
CMDS=<<EOF
e asm.arch=x86
e asm.bits=64
aei
aeim
wx 01c1
ar rcx=0xffffffff00000001
ar rax=1
aes
ar rcx
ar cf
ar of
EOF
EXPECT=<<EOF
0x00000002
0x00000000
0x00000000
EOF
RUN