Move the system call table, and FreeBSD helper routines out of strace.c.
We do not support multiple BSD-types in one binary, so simplify things
by moving it.
Signed-off-by: Warner Losh <i...@bsdimp.com>
Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
---
bsd-user/freebsd/os-syscall.c | 19 +++++++++++++++++++
bsd-user/qemu.h | 5 -----
bsd-user/strace.c | 17 -----------------
3 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index c8f998ecec1..354a38943e5 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -517,6 +517,25 @@ static abi_long freebsd_syscall(void *cpu_env, int num,
abi_long arg1,
return ret;
}
+static const struct syscallname freebsd_scnames[] = {
+#include "freebsd/strace.list"
+};
+
+static void print_freebsd_syscall(int num, abi_long arg1, abi_long arg2,
+ abi_long arg3, abi_long arg4, abi_long arg5,
+ abi_long arg6)
+{
+
+ print_syscall(num, freebsd_scnames, ARRAY_SIZE(freebsd_scnames), arg1,
arg2,
+ arg3, arg4, arg5, arg6);
+}
+
+static void print_freebsd_syscall_ret(int num, abi_long ret)
+{
+
+ print_syscall_ret(num, ret, freebsd_scnames, ARRAY_SIZE(freebsd_scnames));
+}
+
/*
* do_freebsd_syscall() should always have a single exit point at the end so
* that actions, such as logging of syscall results, can be performed. This
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 22e16816a9e..c5240938da7 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -196,11 +196,6 @@ struct syscallname {
void (*result)(const struct syscallname *, abi_long);
};
-void
-print_freebsd_syscall(int num,
- abi_long arg1, abi_long arg2, abi_long arg3,
- abi_long arg4, abi_long arg5, abi_long arg6);
-void print_freebsd_syscall_ret(int num, abi_long ret);
void
print_netbsd_syscall(int num,
abi_long arg1, abi_long arg2, abi_long arg3,
diff --git a/bsd-user/strace.c b/bsd-user/strace.c
index e45909b8688..7d0117fd3cf 100644
--- a/bsd-user/strace.c
+++ b/bsd-user/strace.c
@@ -146,9 +146,6 @@ void print_syscall_ret_addr(const struct syscallname *name,
abi_long ret)
* An array of all of the syscalls we know about
*/
-static const struct syscallname freebsd_scnames[] = {
-#include "freebsd/strace.list"
-};
static const struct syscallname netbsd_scnames[] = {
#include "netbsd/strace.list"
};
@@ -212,20 +209,6 @@ void print_syscall_ret(int num, abi_long ret, const struct
syscallname *scnames,
/*
* The public interface to this module.
*/
-void print_freebsd_syscall(int num, abi_long arg1, abi_long arg2, abi_long
arg3,
- abi_long arg4, abi_long arg5, abi_long arg6)
-{
-
- print_syscall(num, freebsd_scnames, ARRAY_SIZE(freebsd_scnames), arg1,
arg2,
- arg3, arg4, arg5, arg6);
-}
-
-void print_freebsd_syscall_ret(int num, abi_long ret)
-{
-
- print_syscall_ret(num, ret, freebsd_scnames, ARRAY_SIZE(freebsd_scnames));
-}
-
void print_netbsd_syscall(int num, abi_long arg1, abi_long arg2, abi_long arg3,
abi_long arg4, abi_long arg5, abi_long arg6)
{
--
2.40.0
