[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 29/74] semihosting: Split out semihost_sys_remove
From: |
Richard Henderson |
Subject: |
[PATCH v2 29/74] semihosting: Split out semihost_sys_remove |
Date: |
Tue, 3 May 2022 12:47:58 -0700 |
Split out the non-ARM specific portions of SYS_REMOVE to a
reusable function.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/syscalls.h | 3 +++
semihosting/arm-compat-semi.c | 13 +----------
semihosting/syscalls.c | 40 ++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 1ae5ba6716..748a4b5e47 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -49,4 +49,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_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index ad43bc8b0d..9c98af19ca 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -473,18 +473,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/syscalls.c b/semihosting/syscalls.c
index 1425156bf6..3464896281 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -163,6 +163,18 @@ static void gdb_fstat(CPUState *cs,
gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "fstat,%x,%x", (target_ulong)gf->hostfd, addr);
}
+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);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -307,6 +319,24 @@ static void host_flen(CPUState *cs,
gdb_syscall_complete_cb complete,
}
}
+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_for_gdb() : 0);
+ unlock_user(p, fname, 0);
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -552,3 +582,13 @@ void semihost_sys_flen(CPUState *cs,
gdb_syscall_complete_cb fstat_cb,
g_assert_not_reached();
}
}
+
+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 v2 20/74] semihosting: Move GET_ARG/SET_ARG earlier in the file, (continued)
- [PATCH v2 20/74] semihosting: Move GET_ARG/SET_ARG earlier in the file, Richard Henderson, 2022/05/03
- [PATCH v2 23/74] semihosting: Split out semihost_sys_read, Richard Henderson, 2022/05/03
- [PATCH v2 27/74] semihosting: Split out semihost_sys_isatty, Richard Henderson, 2022/05/03
- [PATCH v2 18/74] semihosting: Split out common_semi_has_synccache, Richard Henderson, 2022/05/03
- [PATCH v2 11/74] semihosting: Move common-semi.h to include/semihosting/, Richard Henderson, 2022/05/03
- [PATCH v2 26/74] semihosting: Split out semihost_sys_lseek, Richard Henderson, 2022/05/03
- [PATCH v2 31/74] semihosting: Split out semihost_sys_system, Richard Henderson, 2022/05/03
- [PATCH v2 24/74] semihosting: Split out semihost_sys_write, Richard Henderson, 2022/05/03
- [PATCH v2 25/74] semihosting: Bound length for semihost_sys_{read, write}, Richard Henderson, 2022/05/03
- [PATCH v2 29/74] semihosting: Split out semihost_sys_remove,
Richard Henderson <=
- [PATCH v2 30/74] semihosting: Split out semihost_sys_rename, Richard Henderson, 2022/05/03
- [PATCH v2 28/74] semihosting: Split out semihost_sys_flen, Richard Henderson, 2022/05/03
- [PATCH v2 34/74] gdbstub: Widen gdb_syscall_complete_cb return value, Richard Henderson, 2022/05/03
- [PATCH v2 32/74] semihosting: Create semihost_sys_{stat,fstat}, Richard Henderson, 2022/05/03
- [PATCH v2 33/74] semihosting: Create semihost_sys_gettimeofday, Richard Henderson, 2022/05/03
- [PATCH v2 35/74] semihosting: Fix docs comment for qemu_semihosting_console_inc, Richard Henderson, 2022/05/03
- [PATCH v2 38/74] semihosting: Cleanup chardev init, Richard Henderson, 2022/05/03
- [PATCH v2 37/74] semihosting: Expand qemu_semihosting_console_inc to read, Richard Henderson, 2022/05/03
- [PATCH v2 36/74] semihosting: Pass CPUState to qemu_semihosting_console_inc, Richard Henderson, 2022/05/03
- [PATCH v2 39/74] semihosting: Create qemu_semihosting_console_write, Richard Henderson, 2022/05/03