mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -06:00
exec: Change cpu_breakpoint_{insert,remove{,_by_ref,_all}} argument
Use CPUState. Allows to clean up CPUArchState in gdbstub. Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
75a34036d4
commit
b3310ab338
9 changed files with 43 additions and 46 deletions
|
@ -2473,7 +2473,7 @@ static void x86_cpu_reset(CPUState *s)
|
|||
memset(env->dr, 0, sizeof(env->dr));
|
||||
env->dr[6] = DR6_FIXED_1;
|
||||
env->dr[7] = DR7_FIXED_1;
|
||||
cpu_breakpoint_remove_all(env, BP_CPU);
|
||||
cpu_breakpoint_remove_all(s, BP_CPU);
|
||||
cpu_watchpoint_remove_all(s, BP_CPU);
|
||||
|
||||
env->tsc_adjust = 0;
|
||||
|
|
|
@ -999,7 +999,7 @@ void hw_breakpoint_insert(CPUX86State *env, int index)
|
|||
switch (hw_breakpoint_type(env->dr[7], index)) {
|
||||
case DR7_TYPE_BP_INST:
|
||||
if (hw_breakpoint_enabled(env->dr[7], index)) {
|
||||
err = cpu_breakpoint_insert(env, env->dr[index], BP_CPU,
|
||||
err = cpu_breakpoint_insert(cs, env->dr[index], BP_CPU,
|
||||
&env->cpu_breakpoint[index]);
|
||||
}
|
||||
break;
|
||||
|
@ -1036,7 +1036,7 @@ void hw_breakpoint_remove(CPUX86State *env, int index)
|
|||
switch (hw_breakpoint_type(env->dr[7], index)) {
|
||||
case DR7_TYPE_BP_INST:
|
||||
if (hw_breakpoint_enabled(env->dr[7], index)) {
|
||||
cpu_breakpoint_remove_by_ref(env, env->cpu_breakpoint[index]);
|
||||
cpu_breakpoint_remove_by_ref(cs, env->cpu_breakpoint[index]);
|
||||
}
|
||||
break;
|
||||
case DR7_TYPE_DATA_WR:
|
||||
|
|
|
@ -320,7 +320,7 @@ static int cpu_post_load(void *opaque, int version_id)
|
|||
env->fptags[i] = (env->fptag_vmstate >> i) & 1;
|
||||
}
|
||||
|
||||
cpu_breakpoint_remove_all(env, BP_CPU);
|
||||
cpu_breakpoint_remove_all(cs, BP_CPU);
|
||||
cpu_watchpoint_remove_all(cs, BP_CPU);
|
||||
for (i = 0; i < DR7_MAX_BP; i++) {
|
||||
hw_breakpoint_insert(env, i);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue