[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/49] target-sh4: make cpu-qom.h not target specifi
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 16/49] target-sh4: make cpu-qom.h not target specific |
Date: |
Wed, 16 Mar 2016 11:46:26 +0100 |
Make SuperHCPU an opaque type within cpu-qom.h, and move all definitions
of private methods, as well as all type definitions that require knowledge
of the layout to cpu.h. This helps making files independent of NEED_CPU_H
if they only need to pass around CPU pointers.
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-sh4/cpu-qom.h | 31 +------------------------------
target-sh4/cpu.h | 32 +++++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/target-sh4/cpu-qom.h b/target-sh4/cpu-qom.h
index 6341238..01abb20 100644
--- a/target-sh4/cpu-qom.h
+++ b/target-sh4/cpu-qom.h
@@ -60,35 +60,6 @@ typedef struct SuperHCPUClass {
uint32_t cvr;
} SuperHCPUClass;
-/**
- * SuperHCPU:
- * @env: #CPUSH4State
- *
- * A SuperH CPU.
- */
-typedef struct SuperHCPU {
- /*< private >*/
- CPUState parent_obj;
- /*< public >*/
-
- CPUSH4State env;
-} SuperHCPU;
-
-static inline SuperHCPU *sh_env_get_cpu(CPUSH4State *env)
-{
- return container_of(env, SuperHCPU, env);
-}
-
-#define ENV_GET_CPU(e) CPU(sh_env_get_cpu(e))
-
-#define ENV_OFFSET offsetof(SuperHCPU, env)
-
-void superh_cpu_do_interrupt(CPUState *cpu);
-bool superh_cpu_exec_interrupt(CPUState *cpu, int int_req);
-void superh_cpu_dump_state(CPUState *cpu, FILE *f,
- fprintf_function cpu_fprintf, int flags);
-hwaddr superh_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
-int superh_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
-int superh_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
+typedef struct SuperHCPU SuperHCPU;
#endif
diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
index 3b23e96..0acb60c 100644
--- a/target-sh4/cpu.h
+++ b/target-sh4/cpu.h
@@ -20,6 +20,7 @@
#define _CPU_SH4_H
#include "qemu-common.h"
+#include "cpu-qom.h"
#define TARGET_LONG_BITS 32
@@ -187,7 +188,36 @@ typedef struct CPUSH4State {
memory_content **movcal_backup_tail;
} CPUSH4State;
-#include "cpu-qom.h"
+/**
+ * SuperHCPU:
+ * @env: #CPUSH4State
+ *
+ * A SuperH CPU.
+ */
+struct SuperHCPU {
+ /*< private >*/
+ CPUState parent_obj;
+ /*< public >*/
+
+ CPUSH4State env;
+};
+
+static inline SuperHCPU *sh_env_get_cpu(CPUSH4State *env)
+{
+ return container_of(env, SuperHCPU, env);
+}
+
+#define ENV_GET_CPU(e) CPU(sh_env_get_cpu(e))
+
+#define ENV_OFFSET offsetof(SuperHCPU, env)
+
+void superh_cpu_do_interrupt(CPUState *cpu);
+bool superh_cpu_exec_interrupt(CPUState *cpu, int int_req);
+void superh_cpu_dump_state(CPUState *cpu, FILE *f,
+ fprintf_function cpu_fprintf, int flags);
+hwaddr superh_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
+int superh_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
+int superh_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
void sh4_translate_init(void);
SuperHCPU *cpu_sh4_init(const char *cpu_model);
--
1.8.3.1
- [Qemu-devel] [PATCH 06/49] target-arm: make cpu-qom.h not target specific, (continued)
- [Qemu-devel] [PATCH 06/49] target-arm: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 10/49] target-m68k: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 07/49] target-cris: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 11/49] target-microblaze: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 09/49] target-lm32: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 08/49] target-i386: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 12/49] target-mips: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 13/49] target-ppc: do not use target_ulong in cpu-qom.h, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 15/49] target-s390x: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 18/49] target-tricore: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 16/49] target-sh4: make cpu-qom.h not target specific,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 14/49] target-ppc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 25/49] mips: use MIPSCPU instead of CPUMIPSState, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 20/49] target-xtensa: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 19/49] target-unicore32: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 22/49] m68k: include cpu-qom.h in files that require M68KCPU, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 17/49] target-sparc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 21/49] arm: include cpu-qom.h in files that require ARMCPU, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 24/49] alpha: include cpu-qom.h in files that require AlphaCPU, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 23/49] sh4: include cpu-qom.h in files that require SuperHCPU, Paolo Bonzini, 2016/03/16
- [Qemu-devel] [PATCH 31/49] apic: move target-dependent definitions to cpu.h, Paolo Bonzini, 2016/03/16