mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

semihosting: Split out semihost_sys_remove

Browse Source 
Split out the non-ARM specific portions of SYS_REMOVE to a
reusable function.

Reviewed-by: Luc Michel <lmichel@kalray.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-29 09:29:27 -07:00
parent a6300ed6b7
commit d49e79b8e2
3 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/semihosting/syscalls.h
View File

@ -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 */

13
semihosting/arm-compat-semi.c
View File

@ -484,18 +484,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:

40
semihosting/syscalls.c
View File

@ -133,6 +133,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.
*/
@ -277,6 +289,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 : 0);
unlock_user(p, fname, 0);
}
/*
* Static file semihosting syscall implementations.
*/
@ -522,3 +552,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);
}
}