diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-08-22 15:12:28 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2022-09-13 17:18:21 +0100 |
| commit | cab9f19370b5e26afbc7f62e08293507bf2a5f6b (patch) | |
| tree | ce8c86859242ad87dea9f8996cf4b262fe8f37b8 /target/nios2 | |
| parent | b35d74015b0262260b7dbb75c80ea85aeebab89b (diff) | |
| download | qemu-cab9f19370b5e26afbc7f62e08293507bf2a5f6b.zip qemu-cab9f19370b5e26afbc7f62e08293507bf2a5f6b.tar.gz qemu-cab9f19370b5e26afbc7f62e08293507bf2a5f6b.tar.bz2 | |
target/nios2: Honour -semihosting-config userspace=on
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.
nios2 semihosting is not implemented for linux-user builds.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220822141230.3658237-6-peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/nios2')
| -rw-r--r-- | target/nios2/translate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/nios2/translate.c b/target/nios2/translate.c index ff631a4..8dc0a32 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -817,8 +817,9 @@ static void gen_break(DisasContext *dc, uint32_t code, uint32_t flags) { #ifndef CONFIG_USER_ONLY /* The semihosting instruction is "break 1". */ + bool is_user = FIELD_EX32(dc->tb_flags, TBFLAGS, U); R_TYPE(instr, code); - if (semihosting_enabled(false) && instr.imm5 == 1) { + if (semihosting_enabled(is_user) && instr.imm5 == 1) { t_gen_helper_raise_exception(dc, EXCP_SEMIHOST); return; } |