mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

semihosting: Inline set_swi_errno into common_semi_cb

Browse Source 
Do not store 'err' into errno only to read it back immediately.
Use 'ret' for the return value, not 'reg0'.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-05-16 19:25:19 -07:00
parent 1c6ff7205b
commit 5aadd18299
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
semihosting/arm-compat-semi.c
View File

@ -290,28 +290,29 @@ static target_ulong common_semi_syscall_len;
static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err) static void common_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
{ {
target_ulong reg0 = common_semi_arg(cs, 0);
if (ret == (target_ulong)-1) { if (ret == (target_ulong)-1) {
errno = err; #ifdef CONFIG_USER_ONLY
set_swi_errno(cs, -1); TaskState *ts = cs->opaque;
reg0 = ret; ts->swi_errno = err;
#else
syscall_err = err;
#endif
} else { } else {
/* Fixup syscalls that use nonstardard return conventions. */ /* Fixup syscalls that use nonstardard return conventions. */
target_ulong reg0 = common_semi_arg(cs, 0);
switch (reg0) { switch (reg0) {
case TARGET_SYS_WRITE: case TARGET_SYS_WRITE:
case TARGET_SYS_READ: case TARGET_SYS_READ:
reg0 = common_semi_syscall_len - ret; ret = common_semi_syscall_len - ret;
break; break;
case TARGET_SYS_SEEK: case TARGET_SYS_SEEK:
reg0 = 0; ret = 0;
break; break;
default: default:
reg0 = ret;
break; break;
} }
} }
common_semi_set_ret(cs, reg0); common_semi_set_ret(cs, ret);
} }
static target_ulong common_semi_flen_buf(CPUState *cs) static target_ulong common_semi_flen_buf(CPUState *cs)