yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 17:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-i386: Re-introduce optimal breakpoint removal

Browse source 
Before the last patch, we had an efficient loop that disabled
local breakpoints on task switch. Re-add that, but in a more
general way that handles changes to the global enable bits too.

Backports commit 36eb6e096729f9aade3a6af7dbe4d0a990335d7e from qemu
This commit is contained in:
Richard Henderson 2018-02-16 16:07:30 -05:00 committed by Lioncash
parent 0ad95f8341
commit 77b129a1c6
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
qemu/target-i386/bpt_helper.c
View file

@ -82,13 +82,35 @@ static void hw_breakpoint_remove(CPUX86State *env, int index)
void cpu_x86_update_dr7(CPUX86State *env, uint32_t new_dr7) void cpu_x86_update_dr7(CPUX86State *env, uint32_t new_dr7)
{ {
int i; int i;
target_ulong old_dr7 = env->dr[7];
for (i = 0; i < DR7_MAX_BP; i++) { /* If nothing is changing except the global/local enable bits,
hw_breakpoint_remove(env, i); then we can make the change more efficient. */
} if (((old_dr7 ^ new_dr7) & ~0xff) == 0) {
env->dr[7] = new_dr7; /* Fold the global and local enable bits together into the
for (i = 0; i < DR7_MAX_BP; i++) { global fields, then xor to show which registers have
hw_breakpoint_insert(env, i); changed collective enable state. */
int mod = ((old_dr7 | old_dr7 * 2) ^ (new_dr7 | new_dr7 * 2)) & 0xff;
for (i = 0; i < DR7_MAX_BP; i++) {
if ((mod & (2 << i * 2)) && !hw_breakpoint_enabled(new_dr7, i)) {
hw_breakpoint_remove(env, i);
}
}
env->dr[7] = new_dr7;
for (i = 0; i < DR7_MAX_BP; i++) {
if (mod & (2 << i * 2) && hw_breakpoint_enabled(new_dr7, i)) {
hw_breakpoint_insert(env, i);
}
}
} else {
for (i = 0; i < DR7_MAX_BP; i++) {
hw_breakpoint_remove(env, i);
}
env->dr[7] = new_dr7;
for (i = 0; i < DR7_MAX_BP; i++) {
hw_breakpoint_insert(env, i);
}
} }
} }
#endif #endif