[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 32/49] semihosting: Split out semihost_sys_rename
From: |
Richard Henderson |
Subject: |
[PATCH v3 32/49] semihosting: Split out semihost_sys_rename |
Date: |
Fri, 20 May 2022 17:03:43 -0700 |
Split out the non-ARM specific portions of SYS_RENAME to a
reusable function.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/syscalls.h | 4 +++
semihosting/arm-compat-semi.c | 21 +------------
semihosting/syscalls.c | 57 ++++++++++++++++++++++++++++++++++
3 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 748a4b5e47..21430aa0ef 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -52,4 +52,8 @@ void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb
fstat_cb,
void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
target_ulong fname, target_ulong fname_len);
+void semihost_sys_rename(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong oname, target_ulong oname_len,
+ target_ulong nname, target_ulong nname_len);
+
#endif /* SEMIHOSTING_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index b4320939a1..f02131aebd 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -478,26 +478,7 @@ void do_common_semihosting(CPUState *cs)
GET_ARG(1);
GET_ARG(2);
GET_ARG(3);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(common_semi_cb, "rename,%s,%s",
- arg0, (int)arg1 + 1, arg2, (int)arg3 + 1);
- } else {
- char *s2;
-
- s = lock_user_string(arg0);
- if (!s) {
- goto do_fault;
- }
- s2 = lock_user_string(arg2);
- if (!s2) {
- unlock_user(s, arg0, 0);
- goto do_fault;
- }
- ret = rename(s, s2);
- unlock_user(s2, arg2, 0);
- unlock_user(s, arg0, 0);
- common_semi_cb(cs, ret, ret ? errno : 0);
- }
+ semihost_sys_rename(cs, common_semi_cb, arg0, arg1 + 1, arg2, arg3 +
1);
break;
case TARGET_SYS_CLOCK:
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index 3464896281..96d823e8b3 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -175,6 +175,26 @@ static void gdb_remove(CPUState *cs,
gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "unlink,%s", fname, len);
}
+static void gdb_rename(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong oname, target_ulong oname_len,
+ target_ulong nname, target_ulong nname_len)
+{
+ int olen, nlen;
+
+ olen = validate_strlen(cs, oname, oname_len);
+ if (olen < 0) {
+ complete(cs, -1, -olen);
+ return;
+ }
+ nlen = validate_strlen(cs, nname, nname_len);
+ if (nlen < 0) {
+ complete(cs, -1, -nlen);
+ return;
+ }
+
+ gdb_do_syscall(complete, "rename,%s,%s", oname, olen, nname, nlen);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -337,6 +357,32 @@ static void host_remove(CPUState *cs,
gdb_syscall_complete_cb complete,
unlock_user(p, fname, 0);
}
+static void host_rename(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong oname, target_ulong oname_len,
+ target_ulong nname, target_ulong nname_len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *ostr, *nstr;
+ int ret;
+
+ ret = validate_lock_user_string(&ostr, cs, oname, oname_len);
+ if (ret < 0) {
+ complete(cs, -1, -ret);
+ return;
+ }
+ ret = validate_lock_user_string(&nstr, cs, nname, nname_len);
+ if (ret < 0) {
+ unlock_user(ostr, oname, 0);
+ complete(cs, -1, -ret);
+ return;
+ }
+
+ ret = rename(ostr, nstr);
+ complete(cs, ret, ret ? errno_for_gdb() : 0);
+ unlock_user(ostr, oname, 0);
+ unlock_user(nstr, nname, 0);
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -592,3 +638,14 @@ void semihost_sys_remove(CPUState *cs,
gdb_syscall_complete_cb complete,
host_remove(cs, complete, fname, fname_len);
}
}
+
+void semihost_sys_rename(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong oname, target_ulong oname_len,
+ target_ulong nname, target_ulong nname_len)
+{
+ if (use_gdb_syscalls()) {
+ gdb_rename(cs, complete, oname, oname_len, nname, nname_len);
+ } else {
+ host_rename(cs, complete, oname, oname_len, nname, nname_len);
+ }
+}
--
2.34.1
- [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h, (continued)
- [PATCH v3 16/49] include/exec: Define errno values in gdbstub.h, Richard Henderson, 2022/05/20
- [PATCH v3 12/49] semihosting: Return void from do_common_semihosting, Richard Henderson, 2022/05/20
- [PATCH v3 18/49] semihosting: Split is_64bit_semihosting per target, Richard Henderson, 2022/05/20
- [PATCH v3 26/49] semihosting: Split out semihost_sys_write, Richard Henderson, 2022/05/20
- [PATCH v3 39/49] semihosting: Expand qemu_semihosting_console_inc to read, Richard Henderson, 2022/05/20
- [PATCH v3 25/49] semihosting: Split out semihost_sys_read, Richard Henderson, 2022/05/20
- [PATCH v3 38/49] semihosting: Pass CPUState to qemu_semihosting_console_inc, Richard Henderson, 2022/05/20
- [PATCH v3 32/49] semihosting: Split out semihost_sys_rename,
Richard Henderson <=
- [PATCH v3 22/49] semihosting: Move GET_ARG/SET_ARG earlier in the file, Richard Henderson, 2022/05/20
- [PATCH v3 30/49] semihosting: Split out semihost_sys_flen, Richard Henderson, 2022/05/20
- [PATCH v3 15/49] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h, Richard Henderson, 2022/05/20
- [PATCH v3 37/49] semihosting: Fix docs comment for qemu_semihosting_console_inc, Richard Henderson, 2022/05/20
- [PATCH v3 29/49] semihosting: Split out semihost_sys_isatty, Richard Henderson, 2022/05/20
- [PATCH v3 31/49] semihosting: Split out semihost_sys_remove, Richard Henderson, 2022/05/20
- [PATCH v3 17/49] semihosting: Use struct gdb_stat in common_semi_flen_cb, Richard Henderson, 2022/05/20