motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 09:32:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/xtensa: Restrict semihosting tests to system mode

Browse source 
We do not set CONFIG_SEMIHOSTING in
configs/targets/xtensa*-linux-user.mak.

Do not raise SIGILL for user-only unconditionally.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2025-03-17 09:36:32 -07:00
parent 695e7f6026
commit 690793e005
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
target/xtensa/translate.c
View file

@ -35,14 +35,14 @@
#include "tcg/tcg-op.h" #include "tcg/tcg-op.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/qemu-print.h" #include "qemu/qemu-print.h"
#include "semihosting/semihost.h"
#include "exec/translator.h" #include "exec/translator.h"
#include "exec/translation-block.h" #include "exec/translation-block.h"
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "exec/helper-gen.h" #include "exec/helper-gen.h"
#include "exec/log.h" #include "exec/log.h"
#ifndef CONFIG_USER_ONLY
#include "semihosting/semihost.h"
#endif
#define HELPER_H "helper.h" #define HELPER_H "helper.h"
#include "exec/helper-info.c.inc" #include "exec/helper-info.c.inc"
@ -2241,17 +2241,15 @@ static uint32_t test_exceptions_simcall(DisasContext *dc,
const OpcodeArg arg[], const OpcodeArg arg[],
const uint32_t par[]) const uint32_t par[])
{ {
bool is_semi = semihosting_enabled(dc->cring != 0); #ifndef CONFIG_USER_ONLY
#ifdef CONFIG_USER_ONLY if (semihosting_enabled(dc->cring != 0)) {
bool ill = true; return 0;
#else
/* Between RE.2 and RE.3 simcall opcode's become nop for the hardware. */
bool ill = dc->config->hw_version <= 250002 && !is_semi;
#endif
if (ill || !is_semi) {
qemu_log_mask(LOG_GUEST_ERROR, "SIMCALL but semihosting is disabled\n");
} }
return ill ? XTENSA_OP_ILL : 0; #endif
qemu_log_mask(LOG_GUEST_ERROR, "SIMCALL but semihosting is disabled\n");
/* Between RE.2 and RE.3 simcall opcode's become nop for the hardware. */
return dc->config->hw_version <= 250002 ? XTENSA_OP_ILL : 0;
} }
static void translate_simcall(DisasContext *dc, const OpcodeArg arg[], static void translate_simcall(DisasContext *dc, const OpcodeArg arg[],