fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

semihosting/arm-compat-semi: change common_semi_sys_exit_extended

Browse source 
We now check only is sys_exit is extended.
This allows to break dependency to TARGET_SYS_EXIT_EXTENDED which will
not be available anymore from this code.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-ID: <20250822150058.18692-5-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-ID: <20250922093711.2768983-8-alex.bennee@linaro.org>
This commit is contained in:
Pierrick Bouvier 2025-09-22 10:36:52 +01:00 • committed by Alex Bennée
parent d8028d4ede
commit a92e151bd0
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
semihosting/arm-compat-semi.c
View file

@ -755,7 +755,8 @@ void do_common_semihosting(CPUState *cs)
{
uint32_t ret;
if (common_semi_sys_exit_extended(cs, nr)) {
if (nr == TARGET_SYS_EXIT_EXTENDED ||
common_semi_sys_exit_is_extended(cs)) {
/*
* The A64 version of SYS_EXIT takes a parameter block,
* so the application-exit type can return a subcode which

4
target/arm/common-semi-target.h
View file

@ -34,9 +34,9 @@ static inline void common_semi_set_ret(CPUState *cs, target_ulong ret)
}
}
static inline bool common_semi_sys_exit_extended(CPUState *cs, int nr)
static inline bool common_semi_sys_exit_is_extended(CPUState *cs)
{
return nr == TARGET_SYS_EXIT_EXTENDED || is_a64(cpu_env(cs));
return is_a64(cpu_env(cs));
}
static inline bool is_64bit_semihosting(CPUArchState *env)

4
target/riscv/common-semi-target.h
View file

@ -25,9 +25,9 @@ static inline void common_semi_set_ret(CPUState *cs, target_ulong ret)
env->gpr[xA0] = ret;
}
static inline bool common_semi_sys_exit_extended(CPUState *cs, int nr)
static inline bool common_semi_sys_exit_is_extended(CPUState *cs)
{
return (nr == TARGET_SYS_EXIT_EXTENDED || sizeof(target_ulong) == 8);
return sizeof(target_ulong) == 8;
}
static inline bool is_64bit_semihosting(CPUArchState *env)