[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 28/43] semihosting: Split out semihost_sys_remove
From: |
Richard Henderson |
Subject: |
[PATCH 28/43] semihosting: Split out semihost_sys_remove |
Date: |
Sat, 30 Apr 2022 06:29:17 -0700 |
Split out the non-ARM specific portions of SYS_REMOVE to a
reusable function. This doesn't use GuestFD, but it does
reuse validate_strlen() from semihost_sys_open.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/guestfd.h | 3 +++
semihosting/arm-compat-semi.c | 13 +-----------
semihosting/guestfd.c | 40 +++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/include/semihosting/guestfd.h b/include/semihosting/guestfd.h
index d362b7ccf0..c31a48598a 100644
--- a/include/semihosting/guestfd.h
+++ b/include/semihosting/guestfd.h
@@ -72,4 +72,7 @@ void semihost_sys_flen(CPUState *cs, gdb_syscall_complete_cb
fstat_cb,
gdb_syscall_complete_cb flen_cb,
int fd, target_ulong fstat_addr);
+void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len);
+
#endif /* SEMIHOSTING_GUESTFD_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index f9938ac879..d460754ea0 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -472,18 +472,7 @@ void do_common_semihosting(CPUState *cs)
case TARGET_SYS_REMOVE:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(common_semi_cb, "unlink,%s",
- arg0, (int)arg1 + 1);
- break;
- }
- s = lock_user_string(arg0);
- if (!s) {
- goto do_fault;
- }
- ret = remove(s);
- unlock_user(s, arg0, 0);
- common_semi_cb(cs, ret, ret ? errno : 0);
+ semihost_sys_remove(cs, common_semi_cb, arg0, arg1 + 1);
break;
case TARGET_SYS_RENAME:
diff --git a/semihosting/guestfd.c b/semihosting/guestfd.c
index 3a2100585d..17d43e83d3 100644
--- a/semihosting/guestfd.c
+++ b/semihosting/guestfd.c
@@ -617,3 +617,43 @@ void semihost_sys_flen(CPUState *cs,
gdb_syscall_complete_cb fstat_cb,
g_assert_not_reached();
}
}
+
+static void gdb_remove(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len)
+{
+ int len = validate_strlen(cs, fname, fname_len);
+ if (len < 0) {
+ complete(cs, -1, -len);
+ return;
+ }
+
+ gdb_do_syscall(complete, "unlink,%s", fname, len);
+}
+
+static void host_remove(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *p;
+ int ret;
+
+ ret = validate_lock_user_string(&p, cs, fname, fname_len);
+ if (ret < 0) {
+ complete(cs, -1, -ret);
+ return;
+ }
+
+ ret = remove(p);
+ complete(cs, ret, ret ? errno : 0);
+ unlock_user(p, fname, 0);
+}
+
+void semihost_sys_remove(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong fname, target_ulong fname_len)
+{
+ if (use_gdb_syscalls()) {
+ gdb_remove(cs, complete, fname, fname_len);
+ } else {
+ host_remove(cs, complete, fname, fname_len);
+ }
+}
--
2.34.1
- [PATCH 22/43] semihosting: Split out semihost_sys_read, (continued)
- [PATCH 22/43] semihosting: Split out semihost_sys_read, Richard Henderson, 2022/04/30
- [PATCH 21/43] semihosting: Split out semihost_sys_close, Richard Henderson, 2022/04/30
- [PATCH 26/43] semihosting: Split out semihost_sys_isatty, Richard Henderson, 2022/04/30
- [PATCH 27/43] semihosting: Split out semihost_sys_flen, Richard Henderson, 2022/04/30
- [PATCH 30/43] semihosting: Split out semihost_sys_system, Richard Henderson, 2022/04/30
- [PATCH 31/43] semihosting: Create semihost_sys_{stat,fstat}, Richard Henderson, 2022/04/30
- [PATCH 38/43] target/m68k: Enable semihosting for non-coldfire, Richard Henderson, 2022/04/30
- [PATCH 34/43] target/m68k: Eliminate m68k_semi_is_fseek, Richard Henderson, 2022/04/30
- [PATCH 16/43] semihosting: Split common_semi_flen_buf per target, Richard Henderson, 2022/04/30
- [PATCH 23/43] semihosting: Split out semihost_sys_write, Richard Henderson, 2022/04/30
- [PATCH 28/43] semihosting: Split out semihost_sys_remove,
Richard Henderson <=
- [PATCH 29/43] semihosting: Split out semihost_sys_rename, Richard Henderson, 2022/04/30
- [PATCH 37/43] target/m68k: Do semihosting call as a normal helper, Richard Henderson, 2022/04/30
- [PATCH 32/43] semihosting: Create semihost_sys_gettimeofday, Richard Henderson, 2022/04/30
- [PATCH 08/43] semihosting: Generalize GuestFDFeatureFile, Richard Henderson, 2022/04/30
- [PATCH 18/43] semihosting: Use env more often in do_common_semihosting, Richard Henderson, 2022/04/30
- [PATCH 06/43] semihosting: Simplify softmmu_lock_user_string, Richard Henderson, 2022/04/30
- [PATCH 36/43] target/m68k: Use guestfd.h to implement syscalls., Richard Henderson, 2022/04/30
- [PATCH 40/43] target/nios2: Eliminate nios2_semi_is_lseek, Richard Henderson, 2022/04/30
- [PATCH 41/43] target/nios2: Move nios2-semi.c to nios2_softmmu_ss, Richard Henderson, 2022/04/30
- [PATCH 42/43] target/nios2: Use guestfd.h to implement syscalls., Richard Henderson, 2022/04/30