[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 30/47] target-m68k: Return M68kCPU from cpu_m68k_ini
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 30/47] target-m68k: Return M68kCPU from cpu_m68k_init() |
Date: |
Sat, 16 Feb 2013 16:45:25 +0100 |
Turn cpu_init() into a static inline function for backwards
compatibility.
Signed-off-by: Andreas Färber <address@hidden>
---
target-m68k/cpu.h | 12 ++++++++++--
target-m68k/helper.c | 4 ++--
2 Dateien geändert, 12 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index 94937c4..ed9be80 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -117,7 +117,7 @@ typedef struct CPUM68KState {
void m68k_tcg_init(void);
void m68k_cpu_init_gdb(M68kCPU *cpu);
-CPUM68KState *cpu_m68k_init(const char *cpu_model);
+M68kCPU *cpu_m68k_init(const char *cpu_model);
int cpu_m68k_exec(CPUM68KState *s);
void do_interrupt(CPUM68KState *env1);
void do_interrupt_m68k_hardirq(CPUM68KState *env1);
@@ -215,7 +215,15 @@ void register_m68k_insns (CPUM68KState *env);
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
-#define cpu_init cpu_m68k_init
+static inline CPUM68KState *cpu_init(const char *cpu_model)
+{
+ M68kCPU *cpu = cpu_m68k_init(cpu_model);
+ if (cpu == NULL) {
+ return NULL;
+ }
+ return &cpu->env;
+}
+
#define cpu_exec cpu_m68k_exec
#define cpu_gen_code cpu_m68k_gen_code
#define cpu_signal_handler cpu_m68k_signal_handler
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 6030807..7d3fd94 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -98,7 +98,7 @@ static int fpu_gdb_set_reg(CPUM68KState *env, uint8_t
*mem_buf, int n)
return 0;
}
-CPUM68KState *cpu_m68k_init(const char *cpu_model)
+M68kCPU *cpu_m68k_init(const char *cpu_model)
{
M68kCPU *cpu;
CPUM68KState *env;
@@ -116,7 +116,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model)
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
- return env;
+ return cpu;
}
void m68k_cpu_init_gdb(M68kCPU *cpu)
--
1.7.10.4
- [Qemu-devel] [PATCH 24/47] target-s390x: Move TCG initialization to S390CPU initfn, (continued)
- [Qemu-devel] [PATCH 24/47] target-s390x: Move TCG initialization to S390CPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 22/47] target-mips: Move TCG initialization to MIPSCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 25/47] target-sh4: Move TCG initialization to SuperHCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 23/47] target-ppc: Move TCG initialization to PowerPCCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 26/47] target-sparc: Move TCG initialization to SPARCCPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 43/47] spapr_hcall: Replace open-coded CPU loop with qemu_get_cpu(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 36/47] cpu: Move running field to CPUState, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 29/47] ppc405_uc: Pass PowerPCCPU to ppc40x_{core, chip, system}_reset(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 27/47] target-unicore32: Move TCG initialization to UniCore32CPU initfn, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 45/47] target-lm32: Drop unused cpu_lm32_close() prototype, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 30/47] target-m68k: Return M68kCPU from cpu_m68k_init(),
Andreas Färber <=
- [Qemu-devel] [PATCH 47/47] target-i386: Split command line parsing out of cpu_x86_register(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 31/47] mcf5206: Pass M68kCPU to mcf5206_init(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 46/47] target-i386: Move cpu_x86_init(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 33/47] target-m68k: Pass M68kCPU to m68k_set_irq_level(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 41/47] e500: Replace open-coded loop with qemu_get_cpu(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 35/47] cpu: Move host_tid field to CPUState, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 39/47] cputlb: Pass CPUState to cpu_unlink_tb(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 37/47] cpu: Move exit_request field to CPUState, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 44/47] target-s390x: Drop unused cpu_s390x_close() prototype, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 34/47] target-cris: Introduce CRISCPU subclasses, Andreas Färber, 2013/02/16