[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 31/74] semihosting: Split out semihost_sys_system
From: |
Richard Henderson |
Subject: |
[PATCH v2 31/74] semihosting: Split out semihost_sys_system |
Date: |
Tue, 3 May 2022 12:48:00 -0700 |
Split out the non-ARM specific portions of SYS_SYSTEM to a
reusable function.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/syscalls.h | 3 +++
semihosting/arm-compat-semi.c | 12 +---------
semihosting/syscalls.c | 40 ++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/include/semihosting/syscalls.h b/include/semihosting/syscalls.h
index 21430aa0ef..c9f9e66be1 100644
--- a/include/semihosting/syscalls.h
+++ b/include/semihosting/syscalls.h
@@ -56,4 +56,7 @@ 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);
+void semihost_sys_system(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong cmd, target_ulong cmd_len);
+
#endif /* SEMIHOSTING_SYSCALLS_H */
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index f554f4761f..a7520d6f41 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -496,17 +496,7 @@ void do_common_semihosting(CPUState *cs)
case TARGET_SYS_SYSTEM:
GET_ARG(0);
GET_ARG(1);
- if (use_gdb_syscalls()) {
- gdb_do_syscall(common_semi_cb, "system,%s", arg0, (int)arg1 + 1);
- break;
- }
- s = lock_user_string(arg0);
- if (!s) {
- goto do_fault;
- }
- ret = system(s);
- unlock_user(s, arg0, 0);
- common_semi_cb(cs, ret, ret == -1 ? errno : 0);
+ semihost_sys_system(cs, common_semi_cb, arg0, arg1 + 1);
break;
case TARGET_SYS_ERRNO:
diff --git a/semihosting/syscalls.c b/semihosting/syscalls.c
index 96d823e8b3..b6c395af22 100644
--- a/semihosting/syscalls.c
+++ b/semihosting/syscalls.c
@@ -195,6 +195,18 @@ static void gdb_rename(CPUState *cs,
gdb_syscall_complete_cb complete,
gdb_do_syscall(complete, "rename,%s,%s", oname, olen, nname, nlen);
}
+static void gdb_system(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong cmd, target_ulong cmd_len)
+{
+ int len = validate_strlen(cs, cmd, cmd_len);
+ if (len < 0) {
+ complete(cs, -1, -len);
+ return;
+ }
+
+ gdb_do_syscall(complete, "system,%s", cmd, len);
+}
+
/*
* Host semihosting syscall implementations.
*/
@@ -383,6 +395,24 @@ static void host_rename(CPUState *cs,
gdb_syscall_complete_cb complete,
unlock_user(nstr, nname, 0);
}
+static void host_system(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong cmd, target_ulong cmd_len)
+{
+ CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;
+ char *p;
+ int ret;
+
+ ret = validate_lock_user_string(&p, cs, cmd, cmd_len);
+ if (ret < 0) {
+ complete(cs, -1, -ret);
+ return;
+ }
+
+ ret = system(p);
+ complete(cs, ret, ret == -1 ? errno_for_gdb() : 0);
+ unlock_user(p, cmd, 0);
+}
+
/*
* Static file semihosting syscall implementations.
*/
@@ -649,3 +679,13 @@ void semihost_sys_rename(CPUState *cs,
gdb_syscall_complete_cb complete,
host_rename(cs, complete, oname, oname_len, nname, nname_len);
}
}
+
+void semihost_sys_system(CPUState *cs, gdb_syscall_complete_cb complete,
+ target_ulong cmd, target_ulong cmd_len)
+{
+ if (use_gdb_syscalls()) {
+ gdb_system(cs, complete, cmd, cmd_len);
+ } else {
+ host_system(cs, complete, cmd, cmd_len);
+ }
+}
--
2.34.1
- [PATCH v2 19/74] semihosting: Use env more often in do_common_semihosting, (continued)
- [PATCH v2 19/74] semihosting: Use env more often in do_common_semihosting, Richard Henderson, 2022/05/03
- [PATCH v2 22/74] semihosting: Split out semihost_sys_close, Richard Henderson, 2022/05/03
- [PATCH v2 21/74] semihosting: Split out semihost_sys_open, Richard Henderson, 2022/05/03
- [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 <=
- [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, 2022/05/03
- [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