Access CPUState::@singlestep_enabled field with a helper.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Message-ID: <[email protected]>
---
include/hw/core/cpu.h | 11 +++++++++++
accel/kvm/kvm-all.c | 2 +-
accel/tcg/cpu-exec-common.c | 2 +-
accel/tcg/cpu-exec.c | 8 ++++----
linux-user/riscv/cpu_loop.c | 2 +-
linux-user/s390x/cpu_loop.c | 2 +-
system/cpus.c | 2 +-
target/arm/hvf/hvf.c | 8 ++++----
target/arm/kvm.c | 2 +-
target/i386/kvm/kvm.c | 2 +-
target/i386/whpx/whpx-all.c | 6 +++---
target/loongarch/kvm/kvm.c | 2 +-
target/microblaze/translate.c | 2 +-
target/ppc/kvm.c | 2 +-
target/s390x/kvm/kvm.c | 2 +-
15 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index e5b68bced3d..00f6c5d5de7 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -1138,6 +1138,17 @@ void qemu_init_vcpu(CPUState *cpu);
*/
void cpu_single_step(CPUState *cpu, int enabled);
+/**
+ * cpu_single_stepping:
+ * @cpu: The vCPU to check
+ *
+ * Returns whether the vCPU has single-stepping enabled.
+ */
+static inline bool cpu_single_stepping(const CPUState *cpu)
+{
+ return cpu->singlestep_enabled;
+}
+
int cpu_breakpoint_insert(CPUState *cpu, vaddr pc, int flags,
CPUBreakpoint **breakpoint);
int cpu_breakpoint_remove(CPUState *cpu, vaddr pc, int flags);
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index feffca0d82d..963a4edd262 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -3812,7 +3812,7 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long
reinject_trap)
data.dbg.control = reinject_trap;
- if (cpu->singlestep_enabled) {
+ if (cpu_single_stepping(cpu)) {
data.dbg.control |= KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_SINGLESTEP;
if (cpu->singlestep_enabled & SSTEP_NOIRQ) {
diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c
index e48ea31373f..44e84344f3b 100644
--- a/accel/tcg/cpu-exec-common.c
+++ b/accel/tcg/cpu-exec-common.c
@@ -47,7 +47,7 @@ uint32_t curr_cflags(CPUState *cpu)
* For singlestep and -d nochain, suppress goto_tb so that
* we can log -d cpu,exec after every TB.
*/
- if (unlikely(cpu->singlestep_enabled)) {
+ if (unlikely(cpu_single_stepping(cpu))) {
cflags |= CF_NO_GOTO_TB | CF_NO_GOTO_PTR | CF_SINGLE_STEP | 1;
} else if (qatomic_read(&one_insn_per_tb)) {
cflags |= CF_NO_GOTO_TB | 1;
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index d7f91dce9db..0386ac49551 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -308,7 +308,7 @@ static bool check_for_breakpoints_slow(CPUState *cpu, vaddr
pc,
* so that one could (gdb) singlestep into the guest kernel's
* architectural breakpoint handler.
*/
- if (cpu->singlestep_enabled) {
+ if (cpu_single_stepping(cpu)) {
return false;
}
@@ -485,7 +485,7 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int
*tb_exit)
* raise a debug exception. Single-step with another exception
* is handled in cpu_handle_exception.
*/
- if (unlikely(cpu->singlestep_enabled) && cpu->exception_index == -1) {
+ if (unlikely(cpu_single_stepping(cpu)) && cpu->exception_index == -1) {
cpu->exception_index = EXCP_DEBUG;
cpu_loop_exit(cpu);
}
@@ -732,7 +732,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int
*ret)
bql_unlock();
cpu->exception_index = -1;
- if (unlikely(cpu->singlestep_enabled)) {
+ if (unlikely(cpu_single_stepping(cpu))) {
/*
* After processing the exception, ensure an EXCP_DEBUG is
* raised when single-stepping so that GDB doesn't miss the
@@ -849,7 +849,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,
* raised when single-stepping so that GDB doesn't miss the
* next instruction.
*/
- if (unlikely(cpu->singlestep_enabled)) {
+ if (unlikely(cpu_single_stepping(cpu))) {
cpu->exception_index = EXCP_DEBUG;
bql_unlock();
return true;
diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
index eecc8d15178..6f27a06da49 100644
--- a/linux-user/riscv/cpu_loop.c
+++ b/linux-user/riscv/cpu_loop.c
@@ -68,7 +68,7 @@ void cpu_loop(CPURISCVState *env)
} else if (ret != -QEMU_ESIGRETURN && ret != -QEMU_ESETPC) {
env->gpr[xA0] = ret;
}
- if (cs->singlestep_enabled) {
+ if (cpu_single_stepping(cs)) {
goto gdbstep;
}
break;
diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c
index 67d2a803fbc..25f19f725e7 100644
--- a/linux-user/s390x/cpu_loop.c
+++ b/linux-user/s390x/cpu_loop.c
@@ -87,7 +87,7 @@ void cpu_loop(CPUS390XState *env)
env->regs[2] = ret;
}
- if (unlikely(cs->singlestep_enabled)) {
+ if (unlikely(cpu_single_stepping(cs))) {
/*
* cpu_tb_exec() did not raise EXCP_DEBUG, because it has seen
* that EXCP_SVC was already pending.
diff --git a/system/cpus.c b/system/cpus.c
index b31c825b464..97e5a5edee2 100644
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -344,7 +344,7 @@ bool cpu_can_run(CPUState *cpu)
void cpu_handle_guest_debug(CPUState *cpu)
{
if (replay_running_debug()) {
- if (!cpu->singlestep_enabled) {
+ if (!cpu_single_stepping(cpu)) {
/*
* Report about the breakpoint and
* make a single step to skip it
diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index d5b1966a867..640ef665593 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -2340,7 +2340,7 @@ static int hvf_handle_exception(CPUState *cpu,
hv_vcpu_exit_exception_t *excp)
case EC_SOFTWARESTEP: {
ret = EXCP_DEBUG;
- if (!cpu->singlestep_enabled) {
+ if (!cpu_single_stepping(cpu)) {
error_report("EC_SOFTWARESTEP but single-stepping not enabled");
}
break;
@@ -2549,7 +2549,7 @@ static int hvf_handle_exception(CPUState *cpu,
hv_vcpu_exit_exception_t *excp)
assert_hvf_ok(r);
/* Handle single-stepping over instructions which trigger a VM exit */
- if (cpu->singlestep_enabled) {
+ if (cpu_single_stepping(cpu)) {
ret = EXCP_DEBUG;
}
}
@@ -2868,7 +2868,7 @@ void hvf_arch_update_guest_debug(CPUState *cpu)
CPUARMState *env = &arm_cpu->env;
/* Check whether guest debugging is enabled */
- cpu->accel->guest_debug_enabled = cpu->singlestep_enabled ||
+ cpu->accel->guest_debug_enabled = cpu_single_stepping(cpu) ||
hvf_sw_breakpoints_active(cpu) ||
hvf_arm_hw_debug_active(cpu);
@@ -2882,7 +2882,7 @@ void hvf_arch_update_guest_debug(CPUState *cpu)
cpu_synchronize_state(cpu);
/* Enable/disable single-stepping */
- if (cpu->singlestep_enabled) {
+ if (cpu_single_stepping(cpu)) {
env->cp15.mdscr_el1 =
deposit64(env->cp15.mdscr_el1, MDSCR_EL1_SS_SHIFT, 1, 1);
pstate_write(env, pstate_read(env) | PSTATE_SS);
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 01f42f42538..d40a6a98591 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -1492,7 +1492,7 @@ static bool kvm_arm_handle_debug(ARMCPU *cpu,
switch (hsr_ec) {
case EC_SOFTWARESTEP:
- if (cs->singlestep_enabled) {
+ if (cpu_single_stepping(cs)) {
return true;
} else {
/*
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 1e09155e92c..4272b6770c7 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -6250,7 +6250,7 @@ static int kvm_handle_debug(X86CPU *cpu,
if (arch_info->exception == EXCP01_DB) {
if (arch_info->dr6 & DR6_BS) {
- if (cs->singlestep_enabled) {
+ if (cpu_single_stepping(cs)) {
ret = EXCP_DEBUG;
}
} else {
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 11b5d1fc607..634d5428219 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -2266,7 +2266,7 @@ int whpx_vcpu_run(CPUState *cpu)
}
}
- if (exclusive_step_mode != WHPX_STEP_NONE || cpu->singlestep_enabled) {
+ if (exclusive_step_mode != WHPX_STEP_NONE || cpu_single_stepping(cpu))
{
whpx_vcpu_configure_single_stepping(cpu, true, NULL);
}
@@ -2283,7 +2283,7 @@ int whpx_vcpu_run(CPUState *cpu)
break;
}
- if (exclusive_step_mode != WHPX_STEP_NONE || cpu->singlestep_enabled) {
+ if (exclusive_step_mode != WHPX_STEP_NONE || cpu_single_stepping(cpu))
{
whpx_vcpu_configure_single_stepping(cpu,
false,
&vcpu->exit_ctx.VpContext.Rflags);
@@ -2648,7 +2648,7 @@ int whpx_vcpu_run(CPUState *cpu)
cpu->exception_index = EXCP_DEBUG;
} else if ((vcpu->exit_ctx.VpException.ExceptionType ==
WHvX64ExceptionTypeDebugTrapOrFault) &&
- !cpu->singlestep_enabled) {
+ !cpu_single_stepping(cpu)) {
/*
* Just finished stepping over a breakpoint, but the
* gdb does not expect us to do single-stepping.
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
index beda6965f8c..48cdb78a4ca 100644
--- a/target/loongarch/kvm/kvm.c
+++ b/target/loongarch/kvm/kvm.c
@@ -1440,7 +1440,7 @@ static bool kvm_loongarch_handle_debug(CPUState *cs,
struct kvm_run *run)
CPULoongArchState *env = &cpu->env;
kvm_cpu_synchronize_state(cs);
- if (cs->singlestep_enabled) {
+ if (cpu_single_stepping(cs)) {
return true;
}
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index a93f14d6e09..8b219afb5dd 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -1772,7 +1772,7 @@ static void mb_tr_tb_stop(DisasContextBase *dcb, CPUState
*cs)
}
/* Finish DISAS_EXIT_* */
- if (unlikely(cs->singlestep_enabled)) {
+ if (unlikely(cpu_single_stepping(cs))) {
gen_raise_exception(dc, EXCP_DEBUG);
} else {
tcg_gen_exit_tb(NULL, 0);
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 93ec0cf6a72..19d41c8e91a 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -1615,7 +1615,7 @@ static int kvm_handle_debug(PowerPCCPU *cpu, struct
kvm_run *run)
CPUPPCState *env = &cpu->env;
struct kvm_debug_exit_arch *arch_info = &run->debug.arch;
- if (cs->singlestep_enabled) {
+ if (cpu_single_stepping(cs)) {
return kvm_handle_singlestep();
}
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index 195e39df032..19ddf59e002 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -1874,7 +1874,7 @@ static int kvm_arch_handle_debug_exit(S390CPU *cpu)
}
break;
case KVM_SINGLESTEP:
- if (cs->singlestep_enabled) {
+ if (cpu_single_stepping(cs)) {
ret = EXCP_DEBUG;
}
break;
--
2.53.0
