[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/35] target/xtensa: Restrict has_work() handler to sysemu
From: |
Richard Henderson |
Subject: |
[PULL 30/35] target/xtensa: Restrict has_work() handler to sysemu |
Date: |
Thu, 16 Sep 2021 08:30:20 -0700 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Restrict has_work() to sysemu.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210912172731.789788-30-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/xtensa/cpu.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index c1cbd03595..5cb19a8881 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -43,18 +43,17 @@ static void xtensa_cpu_set_pc(CPUState *cs, vaddr value)
cpu->env.pc = value;
}
+#ifndef CONFIG_USER_ONLY
+
static bool xtensa_cpu_has_work(CPUState *cs)
{
-#ifndef CONFIG_USER_ONLY
XtensaCPU *cpu = XTENSA_CPU(cs);
return !cpu->env.runstall && cpu->env.pending_irq_level;
-#else
- return true;
-#endif
}
-#ifdef CONFIG_USER_ONLY
+#else /* CONFIG_USER_ONLY*/
+
static bool abi_call0;
void xtensa_set_abi_call0(void)
@@ -66,7 +65,8 @@ bool xtensa_abi_call0(void)
{
return abi_call0;
}
-#endif
+
+#endif /* CONFIG_USER_ONLY */
static void xtensa_cpu_reset(DeviceState *dev)
{
@@ -196,6 +196,7 @@ static const struct TCGCPUOps xtensa_tcg_ops = {
.debug_excp_handler = xtensa_breakpoint_handler,
#ifndef CONFIG_USER_ONLY
+ .has_work = xtensa_cpu_has_work,
.cpu_exec_interrupt = xtensa_cpu_exec_interrupt,
.do_interrupt = xtensa_cpu_do_interrupt,
.do_transaction_failed = xtensa_cpu_do_transaction_failed,
@@ -215,7 +216,6 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void
*data)
device_class_set_parent_reset(dc, xtensa_cpu_reset, &xcc->parent_reset);
cc->class_by_name = xtensa_cpu_class_by_name;
- cc->has_work = xtensa_cpu_has_work;
cc->dump_state = xtensa_cpu_dump_state;
cc->set_pc = xtensa_cpu_set_pc;
cc->gdb_read_register = xtensa_cpu_gdb_read_register;
--
2.25.1
- [PULL 12/35] target/cris: Restrict has_work() handler to sysemu, (continued)
- [PULL 12/35] target/cris: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 09/35] target/alpha: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 10/35] target/arm: Restrict has_work() handler to sysemu and TCG, Richard Henderson, 2021/09/16
- [PULL 14/35] target/hppa: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 19/35] target/nios2: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 22/35] target/ppc: Restrict has_work() handlers to sysemu and TCG, Richard Henderson, 2021/09/16
- [PULL 29/35] target/tricore: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 16/35] target/m68k: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 23/35] target/riscv: Restrict has_work() handler to sysemu and TCG, Richard Henderson, 2021/09/16
- [PULL 15/35] target/i386: Restrict has_work() handler to sysemu and TCG, Richard Henderson, 2021/09/16
- [PULL 30/35] target/xtensa: Restrict has_work() handler to sysemu,
Richard Henderson <=
- [PULL 17/35] target/microblaze: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 21/35] target/ppc: Introduce PowerPCCPUClass::has_work(), Richard Henderson, 2021/09/16
- [PULL 24/35] target/rx: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 28/35] target/sparc: Restrict has_work() handler to sysemu, Richard Henderson, 2021/09/16
- [PULL 27/35] target/sparc: Remove pointless use of CONFIG_TCG definition, Richard Henderson, 2021/09/16
- [PULL 33/35] tcg/mips: Allow JAL to be out of range in tcg_out_bswap_subr, Richard Henderson, 2021/09/16
- [PULL 35/35] tcg/mips: Drop special alignment for code_gen_buffer, Richard Henderson, 2021/09/16
- [PULL 31/35] accel: Add missing AccelOpsClass::has_work() and drop SysemuCPUOps one, Richard Henderson, 2021/09/16
- [PULL 18/35] target/mips: Restrict has_work() handler to sysemu and TCG, Richard Henderson, 2021/09/16
- [PULL 25/35] target/s390x: Restrict has_work() handler to sysemu and TCG, Richard Henderson, 2021/09/16