yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-05 23:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: Fix gdb singlestep handling in arm_debug_excp_handler()

Browse source 
Do not raise a CPU exception if no CPU breakpoint has fired, since
singlestep is also done by generating a debug internal exception. This
fixes a bug with singlestepping in gdbstub.

Backports commit 5c629f4ff4dc9ae79cc732f59a8df15ede796ff7 from qemu
This commit is contained in:
Sergey Fedorov 2018-02-17 17:29:57 -05:00 committed by Lioncash
parent 6bd4bc814f
commit f8c43c69b2
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qemu/target-arm/op_helper.c
View file

@ -911,14 +911,18 @@ void arm_debug_excp_handler(CPUState *cs)
} }
} }
} else { } else {
// Unicorn: commented out uint64_t pc = is_a64(env) ? env->pc : env->regs[15];
//uint64_t pc = is_a64(env) ? env->pc : env->regs[15];
bool same_el = (arm_debug_target_el(env) == arm_current_el(env)); bool same_el = (arm_debug_target_el(env) == arm_current_el(env));
// Unicorn: commented out /* (1) GDB breakpoints should be handled first.
//if (cpu_breakpoint_test(cs, pc, BP_GDB)) { * (2) Do not raise a CPU exception if no CPU breakpoint has fired,
// return; * since singlestep is also done by generating a debug internal
//} * exception.
*/
if (cpu_breakpoint_test(cs, pc, BP_GDB)
|| !cpu_breakpoint_test(cs, pc, BP_CPU)) {
return;
}
if (extended_addresses_enabled(env)) { if (extended_addresses_enabled(env)) {
env->exception.fsr = (1 << 9) | 0x22; env->exception.fsr = (1 << 9) | 0x22;