* [Qemu-devel] [PATCH] target-arm: Move bank_number() into internals.h
@ 2016-02-12 15:50 Peter Maydell
2016-02-12 17:24 ` Sergey Fedorov
0 siblings, 1 reply; 2+ messages in thread
From: Peter Maydell @ 2016-02-12 15:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Edgar E. Iglesias, Sergey Fedorov, qemu-arm
Move bank_number()'s implementation into internals.h, so
it's available in the user-mode-only compile as well.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Embarrassingly light on testing on that last change.
target-arm/helper.c | 25 -------------------------
target-arm/internals.h | 26 +++++++++++++++++++++++++-
2 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index c46e3d0..a420a2a 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -5378,31 +5378,6 @@ void aarch64_sync_64_to_32(CPUARMState *env)
#else
-/* Map CPU modes onto saved register banks. */
-int bank_number(int mode)
-{
- switch (mode) {
- case ARM_CPU_MODE_USR:
- case ARM_CPU_MODE_SYS:
- return BANK_USRSYS;
- case ARM_CPU_MODE_SVC:
- return BANK_SVC;
- case ARM_CPU_MODE_ABT:
- return BANK_ABT;
- case ARM_CPU_MODE_UND:
- return BANK_UND;
- case ARM_CPU_MODE_IRQ:
- return BANK_IRQ;
- case ARM_CPU_MODE_FIQ:
- return BANK_FIQ;
- case ARM_CPU_MODE_HYP:
- return BANK_HYP;
- case ARM_CPU_MODE_MON:
- return BANK_MON;
- }
- g_assert_not_reached();
-}
-
void switch_mode(CPUARMState *env, int mode)
{
int old_mode;
diff --git a/target-arm/internals.h b/target-arm/internals.h
index 70bec4a..2e70272 100644
--- a/target-arm/internals.h
+++ b/target-arm/internals.h
@@ -109,7 +109,31 @@ static inline unsigned int aarch64_banked_spsr_index(unsigned int el)
return map[el];
}
-int bank_number(int mode);
+/* Map CPU modes onto saved register banks. */
+static inline int bank_number(int mode)
+{
+ switch (mode) {
+ case ARM_CPU_MODE_USR:
+ case ARM_CPU_MODE_SYS:
+ return BANK_USRSYS;
+ case ARM_CPU_MODE_SVC:
+ return BANK_SVC;
+ case ARM_CPU_MODE_ABT:
+ return BANK_ABT;
+ case ARM_CPU_MODE_UND:
+ return BANK_UND;
+ case ARM_CPU_MODE_IRQ:
+ return BANK_IRQ;
+ case ARM_CPU_MODE_FIQ:
+ return BANK_FIQ;
+ case ARM_CPU_MODE_HYP:
+ return BANK_HYP;
+ case ARM_CPU_MODE_MON:
+ return BANK_MON;
+ }
+ g_assert_not_reached();
+}
+
void switch_mode(CPUARMState *, int);
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu);
void arm_translate_init(void);
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] target-arm: Move bank_number() into internals.h
2016-02-12 15:50 [Qemu-devel] [PATCH] target-arm: Move bank_number() into internals.h Peter Maydell
@ 2016-02-12 17:24 ` Sergey Fedorov
0 siblings, 0 replies; 2+ messages in thread
From: Sergey Fedorov @ 2016-02-12 17:24 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Edgar E. Iglesias, qemu-arm
On 12.02.2016 18:50, Peter Maydell wrote:
> Move bank_number()'s implementation into internals.h, so
> it's available in the user-mode-only compile as well.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Sergey Fedorov <serge.fdrv@gmail.com>
> ---
> Embarrassingly light on testing on that last change.
>
> target-arm/helper.c | 25 -------------------------
> target-arm/internals.h | 26 +++++++++++++++++++++++++-
> 2 files changed, 25 insertions(+), 26 deletions(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index c46e3d0..a420a2a 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -5378,31 +5378,6 @@ void aarch64_sync_64_to_32(CPUARMState *env)
>
> #else
>
> -/* Map CPU modes onto saved register banks. */
> -int bank_number(int mode)
> -{
> - switch (mode) {
> - case ARM_CPU_MODE_USR:
> - case ARM_CPU_MODE_SYS:
> - return BANK_USRSYS;
> - case ARM_CPU_MODE_SVC:
> - return BANK_SVC;
> - case ARM_CPU_MODE_ABT:
> - return BANK_ABT;
> - case ARM_CPU_MODE_UND:
> - return BANK_UND;
> - case ARM_CPU_MODE_IRQ:
> - return BANK_IRQ;
> - case ARM_CPU_MODE_FIQ:
> - return BANK_FIQ;
> - case ARM_CPU_MODE_HYP:
> - return BANK_HYP;
> - case ARM_CPU_MODE_MON:
> - return BANK_MON;
> - }
> - g_assert_not_reached();
> -}
> -
> void switch_mode(CPUARMState *env, int mode)
> {
> int old_mode;
> diff --git a/target-arm/internals.h b/target-arm/internals.h
> index 70bec4a..2e70272 100644
> --- a/target-arm/internals.h
> +++ b/target-arm/internals.h
> @@ -109,7 +109,31 @@ static inline unsigned int aarch64_banked_spsr_index(unsigned int el)
> return map[el];
> }
>
> -int bank_number(int mode);
> +/* Map CPU modes onto saved register banks. */
> +static inline int bank_number(int mode)
> +{
> + switch (mode) {
> + case ARM_CPU_MODE_USR:
> + case ARM_CPU_MODE_SYS:
> + return BANK_USRSYS;
> + case ARM_CPU_MODE_SVC:
> + return BANK_SVC;
> + case ARM_CPU_MODE_ABT:
> + return BANK_ABT;
> + case ARM_CPU_MODE_UND:
> + return BANK_UND;
> + case ARM_CPU_MODE_IRQ:
> + return BANK_IRQ;
> + case ARM_CPU_MODE_FIQ:
> + return BANK_FIQ;
> + case ARM_CPU_MODE_HYP:
> + return BANK_HYP;
> + case ARM_CPU_MODE_MON:
> + return BANK_MON;
> + }
> + g_assert_not_reached();
> +}
> +
> void switch_mode(CPUARMState *, int);
> void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu);
> void arm_translate_init(void);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-12 17:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-12 15:50 [Qemu-devel] [PATCH] target-arm: Move bank_number() into internals.h Peter Maydell
2016-02-12 17:24 ` Sergey Fedorov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).