[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/16] bsd-user: Move system call include to os-syscall.h
From: |
Warner Losh |
Subject: |
[PATCH 07/16] bsd-user: Move system call include to os-syscall.h |
Date: |
Wed, 5 Apr 2023 15:36:03 -0600 |
Move the include of the system calls to os-syscall.h. Include that from
syscall_defs.h. Use target_time_t and target_suseconds_t instead of the
variant that has _freebsd_ in the name. Define these for OpenBSD and
NetBSD based on comments in the file.
Signed-off-by: Warner Losh <imp@bsdimp.com>
---
bsd-user/freebsd/os-syscall.h | 21 +++++++++++++++++++++
bsd-user/netbsd/os-syscall.h | 16 ++++++++++++++++
bsd-user/openbsd/os-syscall.h | 16 ++++++++++++++++
bsd-user/syscall_defs.h | 33 ++++-----------------------------
4 files changed, 57 insertions(+), 29 deletions(-)
create mode 100644 bsd-user/freebsd/os-syscall.h
create mode 100644 bsd-user/netbsd/os-syscall.h
create mode 100644 bsd-user/openbsd/os-syscall.h
diff --git a/bsd-user/freebsd/os-syscall.h b/bsd-user/freebsd/os-syscall.h
new file mode 100644
index 00000000000..1f2c0acb1c5
--- /dev/null
+++ b/bsd-user/freebsd/os-syscall.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023 Warner Losh <imp@bsdimp.com>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * OS-Specific portion of syscall_defs.h
+ */
+
+#include "freebsd/syscall_nr.h"
+
+/*
+ * FreeBSD uses a 64bits time_t except on i386 so we have to add a special case
+ * here.
+ */
+#if (!defined(TARGET_I386))
+typedef int64_t target_time_t;
+#else
+typedef int32_t target_time_t;
+#endif
+
+typedef abi_long target_suseconds_t;
diff --git a/bsd-user/netbsd/os-syscall.h b/bsd-user/netbsd/os-syscall.h
new file mode 100644
index 00000000000..7507350d8d2
--- /dev/null
+++ b/bsd-user/netbsd/os-syscall.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2023 Warner Losh <imp@bsdimp.com>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * OS-Specific portion of syscall_defs.h
+ */
+
+#include "netbsd/syscall_nr.h"
+
+/*
+ * time_t seems to be very inconsistly defined for the different *BSD's...
+ *
+ * NetBSD always uses int64_t.
+ */
+typedef int64_t target_time_t;
diff --git a/bsd-user/openbsd/os-syscall.h b/bsd-user/openbsd/os-syscall.h
new file mode 100644
index 00000000000..191a76fa935
--- /dev/null
+++ b/bsd-user/openbsd/os-syscall.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2023 Warner Losh <imp@bsdimp.com>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * OS-Specific portion of syscall_defs.h
+ */
+
+#include "openbsd/syscall_nr.h"
+
+/*
+ * time_t seems to be very inconsistly defined for the different *BSD's...
+ *
+ * OpenBSD always uses int.
+ */
+typedef int target_time_t;
diff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h
index b6d113d24a7..489d3a2e292 100644
--- a/bsd-user/syscall_defs.h
+++ b/bsd-user/syscall_defs.h
@@ -25,30 +25,7 @@
#include "errno_defs.h"
-#include "freebsd/syscall_nr.h"
-#include "netbsd/syscall_nr.h"
-#include "openbsd/syscall_nr.h"
-
-/*
- * machine/_types.h
- * or x86/_types.h
- */
-
-/*
- * time_t seems to be very inconsistly defined for the different *BSD's...
- *
- * FreeBSD uses a 64bits time_t except on i386
- * so we have to add a special case here.
- *
- * On NetBSD time_t is always defined as an int64_t. On OpenBSD time_t
- * is always defined as an int.
- *
- */
-#if (!defined(TARGET_I386))
-typedef int64_t target_freebsd_time_t;
-#else
-typedef int32_t target_freebsd_time_t;
-#endif
+#include "os-syscall.h"
struct target_iovec {
abi_long iov_base; /* Starting address */
@@ -98,11 +75,9 @@ struct target_iovec {
* sys/timex.h
*/
-typedef abi_long target_freebsd_suseconds_t;
-
/* compare to sys/timespec.h */
struct target_freebsd_timespec {
- target_freebsd_time_t tv_sec; /* seconds */
+ target_time_t tv_sec; /* seconds */
abi_long tv_nsec; /* and nanoseconds */
#if !defined(TARGET_I386) && TARGET_ABI_BITS == 32
abi_long _pad;
@@ -120,8 +95,8 @@ struct target_freebsd__umtx_time {
};
struct target_freebsd_timeval {
- target_freebsd_time_t tv_sec; /* seconds */
- target_freebsd_suseconds_t tv_usec;/* and microseconds */
+ target_time_t tv_sec; /* seconds */
+ target_suseconds_t tv_usec;/* and microseconds */
#if !defined(TARGET_I386) && TARGET_ABI_BITS == 32
abi_long _pad;
#endif
--
2.40.0
- [PATCH 03/16] bsd-user: Cleanup style., (continued)
- [PATCH 03/16] bsd-user: Cleanup style., Warner Losh, 2023/04/05
- [PATCH 05/16] bsd-user: Remove NetBSD specific syscall printing, Warner Losh, 2023/04/05
- [PATCH 06/16] bsd-user: Remove OpenBSD specific syscall printing, Warner Losh, 2023/04/05
- [PATCH 13/16] bsd-user: Implement sysctl kern.proc, except kern.proc.full_path, Warner Losh, 2023/04/05
- [PATCH 11/16] bsd-user: Implement do_sysctl_kern_proc_filedesc, Warner Losh, 2023/04/05
- [PATCH 07/16] bsd-user: Move system call include to os-syscall.h,
Warner Losh <=
- [PATCH 10/16] bsd-user: Implmenet do_sysctl_kern_getprocs, Warner Losh, 2023/04/05
- [PATCH 12/16] bsd-user: Implement do_sysctl_kern_proc_vmmap, Warner Losh, 2023/04/05
- [PATCH 16/16] bsd-user: Implement SIGSYS on arm, Warner Losh, 2023/04/05
- [PATCH 15/16] bsd-user: Add SIGSYS to core dump signals., Warner Losh, 2023/04/05