[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 09/53] semihosting: Inline set_swi_errno into common_semi_cb
From: |
Richard Henderson |
Subject: |
[PATCH v4 09/53] semihosting: Inline set_swi_errno into common_semi_cb |
Date: |
Tue, 7 Jun 2022 13:45:13 -0700 |
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
- [PATCH v4 00/53] semihosting cleanup, Richard Henderson, 2022/06/07
- [PATCH v4 01/53] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h, Richard Henderson, 2022/06/07
- [PATCH v4 06/53] semihosting: Add target_strlen for softmmu-uaccess.h, Richard Henderson, 2022/06/07
- [PATCH v4 09/53] semihosting: Inline set_swi_errno into common_semi_cb,
Richard Henderson <=
- [PATCH v4 12/53] semihosting: Clean up common_semi_open_cb, Richard Henderson, 2022/06/07
- [PATCH v4 04/53] semihosting: Move softmmu-uaccess.h functions out of line, Richard Henderson, 2022/06/07
- [PATCH v4 13/53] semihosting: Return void from do_common_semihosting, Richard Henderson, 2022/06/07
- [PATCH v4 18/53] include/exec: Define errno values in gdbstub.h, Richard Henderson, 2022/06/07
- [PATCH v4 17/53] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h, Richard Henderson, 2022/06/07
- [PATCH v4 03/53] semihosting: Improve condition for config.c and console.c, Richard Henderson, 2022/06/07
- [PATCH v4 07/53] semihosting: Simplify softmmu_lock_user_string, Richard Henderson, 2022/06/07