[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target
From: |
Richard Henderson |
Subject: |
[PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target |
Date: |
Fri, 20 May 2022 17:03:29 -0700 |
We already have some larger ifdef blocks for ARM and RISCV;
split the function into multiple implementations per arch.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 7becc14a81..99a1809f27 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -213,6 +213,10 @@ common_semi_sys_exit_extended(CPUState *cs, int nr)
return (nr == TARGET_SYS_EXIT_EXTENDED || is_a64(cs->env_ptr));
}
+static inline bool is_64bit_semihosting(CPUArchState *env)
+{
+ return is_a64(env);
+}
#endif /* TARGET_ARM */
#ifdef TARGET_RISCV
@@ -238,6 +242,10 @@ common_semi_sys_exit_extended(CPUState *cs, int nr)
return (nr == TARGET_SYS_EXIT_EXTENDED || sizeof(target_ulong) == 8);
}
+static inline bool is_64bit_semihosting(CPUArchState *env)
+{
+ return riscv_cpu_mxl(env) != MXL_RV32;
+}
#endif
/*
@@ -587,17 +595,6 @@ static const GuestFDFunctions guestfd_fns[] = {
* call if the memory read fails. Eventually we could use a generic
* CPUState helper function here.
*/
-static inline bool is_64bit_semihosting(CPUArchState *env)
-{
-#if defined(TARGET_ARM)
- return is_a64(env);
-#elif defined(TARGET_RISCV)
- return riscv_cpu_mxl(env) != MXL_RV32;
-#else
-#error un-handled architecture
-#endif
-}
-
#define GET_ARG(n) do { \
if (is_64bit_semihosting(env)) { \
--
2.34.1
- Re: [PATCH v3 05/49] semihosting: Add target_strlen for softmmu-uaccess.h, (continued)
- [PATCH v3 11/49] semihosting: Clean up common_semi_open_cb, Richard Henderson, 2022/05/20
- [PATCH v3 07/49] semihosting: Split out guestfd.c, Richard Henderson, 2022/05/20
- [PATCH v3 04/49] semihosting: Move softmmu-uaccess.h functions out of line, Richard Henderson, 2022/05/20
- [PATCH v3 13/49] semihosting: Move common-semi.h to include/semihosting/, Richard Henderson, 2022/05/20
- [PATCH v3 24/49] semihosting: Split out semihost_sys_close, Richard Henderson, 2022/05/20
- [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h, Richard Henderson, 2022/05/20
- [PATCH v3 12/49] semihosting: Return void from do_common_semihosting, Richard Henderson, 2022/05/20
- [PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target,
Richard Henderson <=
- [PATCH v3 26/49] semihosting: Split out semihost_sys_write, Richard Henderson, 2022/05/20
- [PATCH v3 39/49] semihosting: Expand qemu_semihosting_console_inc to read, Richard Henderson, 2022/05/20
- [PATCH v3 25/49] semihosting: Split out semihost_sys_read, Richard Henderson, 2022/05/20
- [PATCH v3 38/49] semihosting: Pass CPUState to qemu_semihosting_console_inc, Richard Henderson, 2022/05/20
- [PATCH v3 32/49] semihosting: Split out semihost_sys_rename, Richard Henderson, 2022/05/20
- [PATCH v3 22/49] semihosting: Move GET_ARG/SET_ARG earlier in the file, Richard Henderson, 2022/05/20
- [PATCH v3 30/49] semihosting: Split out semihost_sys_flen, Richard Henderson, 2022/05/20