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

restore breakpoint_invalidate

Browse Source
This commit is contained in:
Andrea Fioraldi 2021-08-24 15:37:01 +02:00
parent f3b17f95ac
commit eff38adb3b
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cpu.c
View File

@ -105,7 +105,7 @@ int libafl_qemu_num_regs(void)
return cc->gdb_num_core_regs; return cc->gdb_num_core_regs;
} }
static void breakpoint_invalidate(CPUState *cpu, target_ulong pc); void libafl_breakpoint_invalidate(CPUState *cpu, target_ulong pc);
int libafl_qemu_set_breakpoint(uint64_t addr) int libafl_qemu_set_breakpoint(uint64_t addr)
{ {
@ -113,7 +113,7 @@ int libafl_qemu_set_breakpoint(uint64_t addr)
target_ulong pc = (target_ulong) addr; target_ulong pc = (target_ulong) addr;
CPU_FOREACH(cpu) { CPU_FOREACH(cpu) {
breakpoint_invalidate(cpu, pc); libafl_breakpoint_invalidate(cpu, pc);
} }
struct libafl_breakpoint* bp = malloc(sizeof(struct libafl_breakpoint)); struct libafl_breakpoint* bp = malloc(sizeof(struct libafl_breakpoint));
@ -132,7 +132,7 @@ int libafl_qemu_remove_breakpoint(uint64_t addr)
while (*bp) { while (*bp) {
if ((*bp)->addr == pc) { if ((*bp)->addr == pc) {
CPU_FOREACH(cpu) { CPU_FOREACH(cpu) {
breakpoint_invalidate(cpu, pc); libafl_breakpoint_invalidate(cpu, pc);
} }
*bp = (*bp)->next; *bp = (*bp)->next;
@ -330,6 +330,15 @@ void tb_invalidate_phys_addr(target_ulong addr)
tb_invalidate_phys_page_range(addr, addr + 1); tb_invalidate_phys_page_range(addr, addr + 1);
mmap_unlock(); mmap_unlock();
} }
//// --- Begin LibAFL code ---
void libafl_breakpoint_invalidate(CPUState *cpu, target_ulong pc)
{
tb_invalidate_phys_addr(pc);
}
//// --- End LibAFL code ---
#else #else
void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs) void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs)
{ {
@ -350,6 +359,15 @@ void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs)
ram_addr = memory_region_get_ram_addr(mr) + addr; ram_addr = memory_region_get_ram_addr(mr) + addr;
tb_invalidate_phys_page_range(ram_addr, ram_addr + 1); tb_invalidate_phys_page_range(ram_addr, ram_addr + 1);
} }
//// --- Begin LibAFL code ---
void libafl_breakpoint_invalidate(CPUState *cpu, target_ulong pc)
{
tb_flush(cpu);
}
//// --- End LibAFL code ---
#endif #endif
/* Add a breakpoint. */ /* Add a breakpoint. */