[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/11] target/m68k: Honour -semihosting-config userspace=on
From: |
Richard Henderson |
Subject: |
[PULL 07/11] target/m68k: Honour -semihosting-config userspace=on |
Date: |
Wed, 14 Sep 2022 14:23:04 +0100 |
From: Peter Maydell <peter.maydell@linaro.org>
Honour the commandline -semihosting-config userspace=on option,
instead of never permitting userspace semihosting calls in system
emulation mode, by passing the correct value to the is_userspace
argument of semihosting_enabled(), instead of manually checking and
always forbidding semihosting if the guest is in userspace.
(Note that target/m68k doesn't support semihosting at all
in the linux-user build.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220822141230.3658237-4-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/op_helper.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c
index 4b3dfec130..a96a034050 100644
--- a/target/m68k/op_helper.c
+++ b/target/m68k/op_helper.c
@@ -203,8 +203,7 @@ static void cf_interrupt_all(CPUM68KState *env, int is_hw)
cf_rte(env);
return;
case EXCP_HALT_INSN:
- if (semihosting_enabled(false)
- && (env->sr & SR_S) != 0
+ if (semihosting_enabled((env->sr & SR_S) == 0)
&& (env->pc & 3) == 0
&& cpu_lduw_code(env, env->pc - 4) == 0x4e71
&& cpu_ldl_code(env, env->pc) == 0x4e7bf000) {
--
2.34.1
- [PULL 00/11] semihosting patch queue, Richard Henderson, 2022/09/14
- [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 <=
- [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, 2022/09/14
- Re: [PULL 00/11] semihosting patch queue, Stefan Hajnoczi, 2022/09/17