[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/60] semihosting: Inline set_swi_errno into common_semi_cb
From: |
Richard Henderson |
Subject: |
[PULL 09/60] semihosting: Inline set_swi_errno into common_semi_cb |
Date: |
Tue, 28 Jun 2022 10:23:12 +0530 |
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>
---
semihosting/arm-compat-semi.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 2fa7f23d8b..9d1f13ea8b 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -290,28 +290,29 @@ static target_ulong common_semi_syscall_len;
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) {
- errno = err;
- set_swi_errno(cs, -1);
- reg0 = ret;
+#ifdef CONFIG_USER_ONLY
+ TaskState *ts = cs->opaque;
+ ts->swi_errno = err;
+#else
+ syscall_err = err;
+#endif
} else {
/* Fixup syscalls that use nonstardard return conventions. */
+ target_ulong reg0 = common_semi_arg(cs, 0);
switch (reg0) {
case TARGET_SYS_WRITE:
case TARGET_SYS_READ:
- reg0 = common_semi_syscall_len - ret;
+ ret = common_semi_syscall_len - ret;
break;
case TARGET_SYS_SEEK:
- reg0 = 0;
+ ret = 0;
break;
default:
- reg0 = ret;
break;
}
}
- common_semi_set_ret(cs, reg0);
+ common_semi_set_ret(cs, ret);
}
static target_ulong common_semi_flen_buf(CPUState *cs)
--
2.34.1
- [PULL 00/60] semihosting patch queue, Richard Henderson, 2022/06/28
- [PULL 01/60] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h, Richard Henderson, 2022/06/28
- [PULL 02/60] semihosting: Return failure from softmmu-uaccess.h functions, Richard Henderson, 2022/06/28
- [PULL 04/60] semihosting: Move softmmu-uaccess.h functions out of line, Richard Henderson, 2022/06/28
- [PULL 05/60] accel/stubs: Add tcg stub for probe_access_flags, Richard Henderson, 2022/06/28
- [PULL 03/60] semihosting: Improve condition for config.c and console.c, Richard Henderson, 2022/06/28
- [PULL 06/60] semihosting: Add target_strlen for softmmu-uaccess.h, Richard Henderson, 2022/06/28
- [PULL 07/60] semihosting: Simplify softmmu_lock_user_string, Richard Henderson, 2022/06/28
- [PULL 08/60] semihosting: Split out guestfd.c, Richard Henderson, 2022/06/28
- [PULL 09/60] semihosting: Inline set_swi_errno into common_semi_cb,
Richard Henderson <=
- [PULL 10/60] semihosting: Adjust error checking in common_semi_cb, Richard Henderson, 2022/06/28
- [PULL 11/60] semihosting: Clean up common_semi_flen_cb, Richard Henderson, 2022/06/28
- [PULL 12/60] semihosting: Clean up common_semi_open_cb, Richard Henderson, 2022/06/28
- [PULL 13/60] semihosting: Return void from do_common_semihosting, Richard Henderson, 2022/06/28
- [PULL 14/60] semihosting: Move common-semi.h to include/semihosting/, Richard Henderson, 2022/06/28
- [PULL 15/60] semihosting: Remove GDB_O_BINARY, Richard Henderson, 2022/06/28
- [PULL 16/60] include/exec: Move gdb open flags to gdbstub.h, Richard Henderson, 2022/06/28
- [PULL 17/60] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h, Richard Henderson, 2022/06/28
- [PULL 19/60] gdbstub: Convert GDB error numbers to host error numbers, Richard Henderson, 2022/06/28
- [PULL 22/60] semihosting: Split common_semi_flen_buf per target, Richard Henderson, 2022/06/28