[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 27/74] sparc: convert to cpu_halted
From: |
Robert Foley |
Subject: |
[PATCH v9 27/74] sparc: convert to cpu_halted |
Date: |
Thu, 21 May 2020 12:39:24 -0400 |
From: "Emilio G. Cota" <address@hidden>
Cc: Fabien Chouteau <address@hidden>
Cc: Artyom Tarasenko <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Robert Foley <address@hidden>
---
hw/sparc/leon3.c | 2 +-
hw/sparc/sun4m.c | 8 ++++----
hw/sparc64/sparc64.c | 4 ++--
target/sparc/helper.c | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 8f024dab7b..00d1efd430 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -132,7 +132,7 @@ static void main_cpu_reset(void *opaque)
cpu_reset(cpu);
- cpu->halted = 0;
+ cpu_halted_set(cpu, 0);
env->pc = s->entry;
env->npc = s->entry + 4;
env->regbase[6] = s->sp;
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 8dda3f7292..e189ba5395 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -192,7 +192,7 @@ static void cpu_kick_irq(SPARCCPU *cpu)
CPUSPARCState *env = &cpu->env;
CPUState *cs = CPU(cpu);
- cs->halted = 0;
+ cpu_halted_set(cs, 0);
cpu_check_irqs(env);
qemu_cpu_kick(cs);
}
@@ -223,7 +223,7 @@ static void main_cpu_reset(void *opaque)
CPUState *cs = CPU(cpu);
cpu_reset(cs);
- cs->halted = 0;
+ cpu_halted_set(cs, 0);
}
static void secondary_cpu_reset(void *opaque)
@@ -232,7 +232,7 @@ static void secondary_cpu_reset(void *opaque)
CPUState *cs = CPU(cpu);
cpu_reset(cs);
- cs->halted = 1;
+ cpu_halted_set(cs, 1);
}
static void cpu_halt_signal(void *opaque, int irq, int level)
@@ -831,7 +831,7 @@ static void cpu_devinit(const char *cpu_type, unsigned int
id,
} else {
qemu_register_reset(secondary_cpu_reset, cpu);
cs = CPU(cpu);
- cs->halted = 1;
+ cpu_halted_set(cs, 1);
}
*cpu_irqs = qemu_allocate_irqs(cpu_set_irq, cpu, MAX_PILS);
env->prom_addr = prom_addr;
diff --git a/hw/sparc64/sparc64.c b/hw/sparc64/sparc64.c
index 100b2fab17..fe9c678459 100644
--- a/hw/sparc64/sparc64.c
+++ b/hw/sparc64/sparc64.c
@@ -101,7 +101,7 @@ static void cpu_kick_irq(SPARCCPU *cpu)
CPUState *cs = CPU(cpu);
CPUSPARCState *env = &cpu->env;
- cs->halted = 0;
+ cpu_halted_set(cs, 0);
cpu_check_irqs(env);
qemu_cpu_kick(cs);
}
@@ -116,7 +116,7 @@ void sparc64_cpu_set_ivec_irq(void *opaque, int irq, int
level)
if (!(env->ivec_status & 0x20)) {
trace_sparc64_cpu_ivec_raise_irq(irq);
cs = CPU(cpu);
- cs->halted = 0;
+ cpu_halted_set(cs, 0);
env->interrupt_index = TT_IVEC;
env->ivec_status |= 0x20;
env->ivec_data[0] = (0x1f << 6) | irq;
diff --git a/target/sparc/helper.c b/target/sparc/helper.c
index 07d87efa4e..90dfb1e92f 100644
--- a/target/sparc/helper.c
+++ b/target/sparc/helper.c
@@ -244,7 +244,7 @@ void helper_power_down(CPUSPARCState *env)
{
CPUState *cs = env_cpu(env);
- cs->halted = 1;
+ cpu_halted_set(cs, 1);
cs->exception_index = EXCP_HLT;
env->pc = env->npc;
env->npc = env->pc + 4;
--
2.17.1
- [PATCH v9 19/74] ppc: convert to cpu_halted, (continued)
- [PATCH v9 19/74] ppc: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 21/74] i386: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 23/74] m68k: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 22/74] lm32: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 24/74] mips: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 25/74] riscv: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 28/74] xtensa: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 29/74] gdbstub: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 30/74] openrisc: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 26/74] s390x: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 27/74] sparc: convert to cpu_halted,
Robert Foley <=
- [PATCH v9 31/74] cpu-exec: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 32/74] cpu: convert to cpu_halted, Robert Foley, 2020/05/21
- [PATCH v9 33/74] cpu: define cpu_interrupt_request helpers, Robert Foley, 2020/05/21
- [PATCH v9 34/74] ppc: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 35/74] exec: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 36/74] i386: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 37/74] s390x: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 38/74] openrisc: use cpu_reset_interrupt, Robert Foley, 2020/05/21
- [PATCH v9 39/74] arm: convert to cpu_interrupt_request, Robert Foley, 2020/05/21
- [PATCH v9 40/74] i386: convert to cpu_interrupt_request, Robert Foley, 2020/05/21