[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v3 07/56] target/m68k: rename cpu_halted to cpu_halt
From: |
Emilio G. Cota |
Subject: |
[Qemu-devel] [RFC v3 07/56] target/m68k: rename cpu_halted to cpu_halt |
Date: |
Thu, 18 Oct 2018 21:05:36 -0400 |
To avoid a name clash with the soon-to-be-defined cpu_halted() helper.
Cc: Laurent Vivier <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
---
target/m68k/translate.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index ae3651b867..86491048f8 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -43,7 +43,7 @@
#undef DEFO32
#undef DEFO64
-static TCGv_i32 cpu_halted;
+static TCGv_i32 cpu_halt;
static TCGv_i32 cpu_exception_index;
static char cpu_reg_names[2 * 8 * 3 + 5 * 4];
@@ -79,7 +79,7 @@ void m68k_tcg_init(void)
#undef DEFO32
#undef DEFO64
- cpu_halted = tcg_global_mem_new_i32(cpu_env,
+ cpu_halt = tcg_global_mem_new_i32(cpu_env,
-offsetof(M68kCPU, env) +
offsetof(CPUState, halted), "HALTED");
cpu_exception_index = tcg_global_mem_new_i32(cpu_env,
@@ -4646,7 +4646,7 @@ DISAS_INSN(stop)
ext = read_im16(env, s);
gen_set_sr_im(s, ext, 0);
- tcg_gen_movi_i32(cpu_halted, 1);
+ tcg_gen_movi_i32(cpu_halt, 1);
gen_exception(s, s->pc, EXCP_HLT);
}
--
2.17.1
- [Qemu-devel] [RFC v3 13/56] lm32: convert to cpu_halted, (continued)
- [Qemu-devel] [RFC v3 13/56] lm32: convert to cpu_halted, Emilio G. Cota, 2018/10/18
- [Qemu-devel] [RFC v3 01/56] cpu: convert queued work to a QSIMPLEQ, Emilio G. Cota, 2018/10/18
- [Qemu-devel] [RFC v3 08/56] cpu: define cpu_halted helpers, Emilio G. Cota, 2018/10/18
- [Qemu-devel] [RFC v3 09/56] arm: convert to cpu_halted, Emilio G. Cota, 2018/10/18
- [Qemu-devel] [RFC v3 16/56] riscv: convert to cpu_halted, Emilio G. Cota, 2018/10/18
- [Qemu-devel] [RFC v3 07/56] target/m68k: rename cpu_halted to cpu_halt,
Emilio G. Cota <=
- [Qemu-devel] [RFC v3 20/56] gdbstub: convert to cpu_halted, Emilio G. Cota, 2018/10/18
- [Qemu-devel] [RFC v3 23/56] cpu: define cpu_interrupt_request helpers, Emilio G. Cota, 2018/10/18
- [Qemu-devel] [RFC v3 19/56] xtensa: convert to cpu_halted, Emilio G. Cota, 2018/10/18
- [Qemu-devel] [RFC v3 26/56] i386: use cpu_reset_interrupt, Emilio G. Cota, 2018/10/18