SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add a flag for edge TB so we can unlink it completely (#53)

Browse Source 
* add a flag for edge TB so we can unlink it completely

* Call tb_phys_invalidate on edge's TBs. Added libafl code comments

* Edge flag is now applied to cflags instead of flags

---------

Co-authored-by: Romain Malmain <romain.malmain@pm.me>
This commit is contained in:
cube0x8 2024-04-26 17:49:38 +03:00 committed by Romain Malmain
parent 9ae713913e
commit ddbe5be01f
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accel/tcg/tb-maint.c
View File

@ -866,6 +866,11 @@ static inline void tb_jmp_unlink(TranslationBlock *dest)
TB_FOR_EACH_JMP(dest, tb, n) { TB_FOR_EACH_JMP(dest, tb, n) {
tb_reset_jump(tb, n); tb_reset_jump(tb, n);
//// --- Begin LibAFL code ---
if (tb->cflags & CF_IS_EDGE) {
tb_phys_invalidate(tb, -1);
}
//// --- End LibAFL code ---
qatomic_and(&tb->jmp_dest[n], (uintptr_t)NULL | 1); qatomic_and(&tb->jmp_dest[n], (uintptr_t)NULL | 1);
/* No need to clear the list entry; setting the dest ptr is enough */ /* No need to clear the list entry; setting the dest ptr is enough */
} }

2
accel/tcg/translate-all.c
View File

@ -403,7 +403,7 @@ TranslationBlock *libafl_gen_edge(CPUState *cpu, target_ulong src_block,
} }
tb->cs_base = cs_base; tb->cs_base = cs_base;
tb->flags = flags; tb->flags = flags;
tb->cflags = cflags; tb->cflags = cflags | CF_IS_EDGE;
//tb_set_page_addr0(tb, phys_pc); //tb_set_page_addr0(tb, phys_pc);
//tb_set_page_addr1(tb, -1); //tb_set_page_addr1(tb, -1);
tcg_ctx->gen_tb = tb; tcg_ctx->gen_tb = tb;

3
include/exec/translation-block.h
View File

@ -77,6 +77,9 @@ struct TranslationBlock {
#define CF_PARALLEL 0x00008000 /* Generate code for a parallel context */ #define CF_PARALLEL 0x00008000 /* Generate code for a parallel context */
#define CF_NOIRQ 0x00010000 /* Generate an uninterruptible TB */ #define CF_NOIRQ 0x00010000 /* Generate an uninterruptible TB */
#define CF_PCREL 0x00020000 /* Opcodes in TB are PC-relative */ #define CF_PCREL 0x00020000 /* Opcodes in TB are PC-relative */
//// --- Begin LibAFL code ---
#define CF_IS_EDGE 0x00800000 /* The current TB is an edge */
//// --- End LibAFL code ---
#define CF_CLUSTER_MASK 0xff000000 /* Top 8 bits are cluster ID */ #define CF_CLUSTER_MASK 0xff000000 /* Top 8 bits are cluster ID */
#define CF_CLUSTER_SHIFT 24 #define CF_CLUSTER_SHIFT 24