[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 3/6] arm: cpu: static inline cpu_arm_init()
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v1 3/6] arm: cpu: static inline cpu_arm_init() |
Date: |
Mon, 26 Oct 2015 08:27:25 -0700 |
Move this implementation up to the header so it is visible from system
level code once the architecture is converted to arch-obj-y. Alternative
would be to create init.c in target-arm/hw but this implementation is
trivial enough for static inline.
Cc: Peter Maydell <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
---
target-arm/cpu.h | 6 +++++-
target-arm/helper.c | 5 -----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 4b702df..6b6485b 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -509,7 +509,11 @@ typedef struct CPUARMState {
#include "cpu-qom.h"
-ARMCPU *cpu_arm_init(const char *cpu_model);
+static inline ARMCPU *cpu_arm_init(const char *cpu_model)
+{
+ return ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model));
+}
+
target_ulong do_arm_semihosting(CPUARMState *env);
void aarch64_sync_32_to_64(CPUARMState *env);
void aarch64_sync_64_to_32(CPUARMState *env);
diff --git a/target-arm/helper.c b/target-arm/helper.c
index e7fda37..3118267 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -4501,11 +4501,6 @@ void register_cp_regs_for_features(ARMCPU *cpu)
}
}
-ARMCPU *cpu_arm_init(const char *cpu_model)
-{
- return ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model));
-}
-
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
{
CPUState *cs = CPU(cpu);
--
1.9.1
- [Qemu-devel] [PATCH v1 0/6] Multi-Arch Phase 2, Peter Crosthwaite, 2015/10/26
- [Qemu-devel] [PATCH v1 2/6] target-*: cpu.h: Undefine core code symbols, Peter Crosthwaite, 2015/10/26
- [Qemu-devel] [PATCH v1 3/6] arm: cpu: static inline cpu_arm_init(),
Peter Crosthwaite <=
- [Qemu-devel] [PATCH v1 6/6] hw: mb: boot Explicitly include cpu.h for consumers, Peter Crosthwaite, 2015/10/26
- [Qemu-devel] [PATCH v1 4/6] target-arm: Split cp helper API to new C file, Peter Crosthwaite, 2015/10/26
- [Qemu-devel] [PATCH v1 1/6] target-*: Don't redefine cpu_exec(), Peter Crosthwaite, 2015/10/26
- [Qemu-devel] [PATCH v1 5/6] hw: arm: Explicitly include cpu.h for consumers, Peter Crosthwaite, 2015/10/26
- Re: [Qemu-devel] [PATCH v1 0/6] Multi-Arch Phase 2, Paolo Bonzini, 2015/10/26
- Re: [Qemu-devel] [PATCH v1 0/6] Multi-Arch Phase 2, Peter Maydell, 2015/10/26