[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/11] target/xtensa: Honour -semihosting-config userspace=on
From: |
Richard Henderson |
Subject: |
[PULL 10/11] target/xtensa: Honour -semihosting-config userspace=on |
Date: |
Wed, 14 Sep 2022 14:23:07 +0100 |
From: Peter Maydell <peter.maydell@linaro.org>
Honour the commandline -semihosting-config userspace=on option,
instead of always permitting userspace semihosting calls in system
emulation mode, by passing the correct value to the is_userspace
argument of semihosting_enabled().
Note that this is a behaviour change: if the user wants to
do semihosting calls from userspace they must now specifically
enable them on the command line.
xtensa semihosting is not implemented for linux-user builds.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220822141230.3658237-7-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/xtensa/translate.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index afae8a1bea..bdd4690a5c 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -2362,13 +2362,14 @@ static uint32_t test_exceptions_simcall(DisasContext
*dc,
const OpcodeArg arg[],
const uint32_t par[])
{
+ bool is_semi = semihosting_enabled(dc->cring != 0);
#ifdef CONFIG_USER_ONLY
bool ill = true;
#else
/* Between RE.2 and RE.3 simcall opcode's become nop for the hardware. */
- bool ill = dc->config->hw_version <= 250002 && !semihosting_enabled(false);
+ bool ill = dc->config->hw_version <= 250002 && !is_semi;
#endif
- if (ill || !semihosting_enabled(false)) {
+ if (ill || !is_semi) {
qemu_log_mask(LOG_GUEST_ERROR, "SIMCALL but semihosting is
disabled\n");
}
return ill ? XTENSA_OP_ILL : 0;
@@ -2378,7 +2379,7 @@ static void translate_simcall(DisasContext *dc, const
OpcodeArg arg[],
const uint32_t par[])
{
#ifndef CONFIG_USER_ONLY
- if (semihosting_enabled(false)) {
+ if (semihosting_enabled(dc->cring != 0)) {
gen_helper_simcall(cpu_env);
}
#endif
--
2.34.1
- [PULL 01/11] target/nios2: Use semihosting/syscalls.h, (continued)
- [PULL 01/11] target/nios2: Use semihosting/syscalls.h, Richard Henderson, 2022/09/14
- [PULL 02/11] target/nios2: Convert semihosting errno to gdb remote errno, Richard Henderson, 2022/09/14
- [PULL 03/11] target/m68k: Use semihosting/syscalls.h, Richard Henderson, 2022/09/14
- [PULL 05/11] semihosting: Allow optional use of semihosting from userspace, Richard Henderson, 2022/09/14
- [PULL 07/11] target/m68k: Honour -semihosting-config userspace=on, Richard Henderson, 2022/09/14
- [PULL 08/11] target/mips: Honour -semihosting-config userspace=on, Richard Henderson, 2022/09/14
- [PULL 06/11] target/arm: Honour -semihosting-config userspace=on, Richard Henderson, 2022/09/14
- [PULL 09/11] target/nios2: Honour -semihosting-config userspace=on, Richard Henderson, 2022/09/14
- [PULL 04/11] target/m68k: Convert semihosting errno to gdb remote errno, Richard Henderson, 2022/09/14
- [PULL 11/11] target/riscv: Honour -semihosting-config userspace=on and enable=on, Richard Henderson, 2022/09/14
- [PULL 10/11] target/xtensa: Honour -semihosting-config userspace=on,
Richard Henderson <=
- Re: [PULL 00/11] semihosting patch queue, Stefan Hajnoczi, 2022/09/17