[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/52] target-xtensa: make cpu-qom.h not target speci
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 22/52] target-xtensa: make cpu-qom.h not target specific |
Date: |
Thu, 19 May 2016 13:18:16 +0200 |
Make XtensaCPU 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. Conversely, move all definitions needed to
define a class to cpu-qom.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>
Signed-off-by: Max Filippov <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-xtensa/cpu-qom.h | 38 +++-----------------------------------
target-xtensa/cpu.h | 37 ++++++++++++++++++++++++++++++++++++-
2 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/target-xtensa/cpu-qom.h b/target-xtensa/cpu-qom.h
index f5d9b9f..403bd95 100644
--- a/target-xtensa/cpu-qom.h
+++ b/target-xtensa/cpu-qom.h
@@ -40,6 +40,8 @@
#define XTENSA_CPU_GET_CLASS(obj) \
OBJECT_GET_CLASS(XtensaCPUClass, (obj), TYPE_XTENSA_CPU)
+typedef struct XtensaConfig XtensaConfig;
+
/**
* XtensaCPUClass:
* @parent_realize: The parent class' realize handler.
@@ -59,40 +61,6 @@ typedef struct XtensaCPUClass {
const XtensaConfig *config;
} XtensaCPUClass;
-/**
- * XtensaCPU:
- * @env: #CPUXtensaState
- *
- * An Xtensa CPU.
- */
-typedef struct XtensaCPU {
- /*< private >*/
- CPUState parent_obj;
- /*< public >*/
-
- CPUXtensaState env;
-} XtensaCPU;
-
-static inline XtensaCPU *xtensa_env_get_cpu(const CPUXtensaState *env)
-{
- return container_of(env, XtensaCPU, env);
-}
-
-#define ENV_GET_CPU(e) CPU(xtensa_env_get_cpu(e))
-
-#define ENV_OFFSET offsetof(XtensaCPU, env)
-
-void xtensa_cpu_do_interrupt(CPUState *cpu);
-bool xtensa_cpu_exec_interrupt(CPUState *cpu, int interrupt_request);
-void xtensa_cpu_do_unassigned_access(CPUState *cpu, hwaddr addr,
- bool is_write, bool is_exec, int opaque,
- unsigned size);
-void xtensa_cpu_dump_state(CPUState *cpu, FILE *f,
- fprintf_function cpu_fprintf, int flags);
-hwaddr xtensa_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
-int xtensa_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
-int xtensa_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
-void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
- int is_write, int is_user, uintptr_t
retaddr);
+typedef struct XtensaCPU XtensaCPU;
#endif
diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h
index 7bfc9c8..98dd3e1 100644
--- a/target-xtensa/cpu.h
+++ b/target-xtensa/cpu.h
@@ -34,6 +34,7 @@
#define CPUArchState struct CPUXtensaState
#include "qemu-common.h"
+#include "cpu-qom.h"
#include "exec/cpu-defs.h"
#include "fpu/softfloat.h"
@@ -379,7 +380,41 @@ typedef struct CPUXtensaState {
CPU_COMMON
} CPUXtensaState;
-#include "cpu-qom.h"
+/**
+ * XtensaCPU:
+ * @env: #CPUXtensaState
+ *
+ * An Xtensa CPU.
+ */
+struct XtensaCPU {
+ /*< private >*/
+ CPUState parent_obj;
+ /*< public >*/
+
+ CPUXtensaState env;
+};
+
+static inline XtensaCPU *xtensa_env_get_cpu(const CPUXtensaState *env)
+{
+ return container_of(env, XtensaCPU, env);
+}
+
+#define ENV_GET_CPU(e) CPU(xtensa_env_get_cpu(e))
+
+#define ENV_OFFSET offsetof(XtensaCPU, env)
+
+void xtensa_cpu_do_interrupt(CPUState *cpu);
+bool xtensa_cpu_exec_interrupt(CPUState *cpu, int interrupt_request);
+void xtensa_cpu_do_unassigned_access(CPUState *cpu, hwaddr addr,
+ bool is_write, bool is_exec, int opaque,
+ unsigned size);
+void xtensa_cpu_dump_state(CPUState *cpu, FILE *f,
+ fprintf_function cpu_fprintf, int flags);
+hwaddr xtensa_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
+int xtensa_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
+int xtensa_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
+void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
+ int is_write, int is_user, uintptr_t
retaddr);
#define cpu_exec cpu_xtensa_exec
#define cpu_signal_handler cpu_xtensa_signal_handler
--
1.8.3.1
- [Qemu-devel] [PULL 25/52] sh4: include cpu-qom.h in files that require SuperHCPU, (continued)
- [Qemu-devel] [PULL 25/52] sh4: include cpu-qom.h in files that require SuperHCPU, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 24/52] m68k: include cpu-qom.h in files that require M68KCPU, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 23/52] arm: include cpu-qom.h in files that require ARMCPU, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 16/52] target-ppc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 11/52] target-m68k: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 26/52] alpha: include cpu-qom.h in files that require AlphaCPU, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 34/52] include: poison symbols in osdep.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 32/52] explicitly include linux/kvm.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 35/52] hw: do not use VMSTATE_*TL, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 28/52] ppc: use PowerPCCPU instead of CPUPPCState, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 22/52] target-xtensa: make cpu-qom.h not target specific,
Paolo Bonzini <=
- [Qemu-devel] [PULL 21/52] target-unicore32: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 19/52] target-sparc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 37/52] hw: cannot include hw/hw.h from user emulation, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 20/52] target-tricore: make cpu-qom.h not target specific, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 27/52] mips: use MIPSCPU instead of CPUMIPSState, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 33/52] apic: move target-dependent definitions to cpu.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 36/52] hw: move CPU state serialization to migration/cpu.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 30/52] explicitly include qom/cpu.h, Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 42/52] dma: do not depend on kvm_enabled(), Paolo Bonzini, 2016/05/19
- [Qemu-devel] [PULL 29/52] arm: remove useless cpu.h inclusion, Paolo Bonzini, 2016/05/19