lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UC_HOOK_MEM on arm32 (#2091)

Browse Source
This commit is contained in:
xndcn
2025-01-26 13:28:24 +08:00
committed by GitHub
parent d7c0497ee3
commit 1ba25def8e
2 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qemu/tcg/arm/tcg-target.inc.c
View File

@@ -1601,7 +1601,11 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is64)
/* This a conditional BL only to load a pointer within this opcode into LR
for the slow path. We will not be using the value for a tail call. */
label_ptr = s->code_ptr;
tcg_out_bl(s, COND_NE, 0);
if (!tcg_uc_has_hookmem(s)) {
tcg_out_bl(s, COND_NE, 0);
} else {
tcg_out_bl(s, COND_AL, 0);
}
tcg_out_qemu_ld_index(s, opc, datalo, datahi, addrlo, addend);
@@ -1733,7 +1737,11 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is64)
/* The conditional call must come last, as we're going to return here. */
label_ptr = s->code_ptr;
tcg_out_bl(s, COND_NE, 0);
if (!tcg_uc_has_hookmem(s)) {
tcg_out_bl(s, COND_NE, 0);
} else {
tcg_out_bl(s, COND_AL, 0);
}
add_qemu_ldst_label(s, false, oi, datalo, datahi, addrlo, addrhi,
s->code_ptr, label_ptr);