freebsd64: Add machine independent portions.

Makefile.inc1

@@ -1834,6 +1834,7 @@ packageworld: .PHONY
 
 _sysent_dirs=	sys/kern
 _sysent_dirs+=	sys/compat/freebsd32
+_sysent_dirs+=	sys/compat/freebsd64
 _sysent_dirs+=	sys/compat/cheriabi
 _sysent_dirs+=	sys/amd64/linux		\
 		sys/amd64/linux32	\

sys/cam/scsi/scsi_cd.c

@@ -214,10 +214,6 @@ static struct cd_quirk_entry cd_quirk_table[] =
 	}
 };
 
-#ifdef COMPAT_CHERIABI
-#define	COMPAT_FREEBSD64
-#endif
-
 #ifdef COMPAT_FREEBSD32
 struct ioc_read_toc_entry32 {
 	u_char	address_format;

sys/compat/freebsd64/Makefile

@@ -0,0 +1,19 @@
+# Makefile for syscall tables
+#
+# $FreeBSD$
+
+# Don't use an OBJDIR
+.OBJDIR: ${.CURDIR}
+
+all:
+	@echo "make sysent only"
+
+sysent:  freebsd64_sysent.c freebsd64_syscall.h freebsd64_proto.h freebsd64_systrace_args.c
+
+freebsd64_sysent.c freebsd64_syscalls.c freebsd64_syscall.h freebsd64_proto.h freebsd64_systrace_args.c : \
+	    ../../kern/makesyscalls.sh ../../kern/syscalls.master syscalls.conf
+	sh ../../kern/makesyscalls.sh ../../kern/syscalls.master syscalls.conf
+
+clean:
+	rm -f freebsd64_sysent.c freebsd64_syscalls.c freebsd64_syscall.h freebsd64_proto.h
+	rm -f freebsd64_systrace_args.c

sys/compat/freebsd64/freebsd64.h

@@ -0,0 +1,223 @@
+/*-
+ * Copyright (c) 2015-2019 SRI International
+ * Copyright (c) 2001 Doug Rabson
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory (Department of Computer Science and
+ * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of
+ * the DARPA SSITH research programme.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _COMPAT_FREEBSD64_FREEBSD64_H_
+#define _COMPAT_FREEBSD64_FREEBSD64_H_
+
+#include "opt_ktrace.h"
+#include <sys/uio.h>
+#include <sys/ktrace.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+
+#define CP(src,dst,fld) do { (dst).fld = (src).fld; } while (0)
+
+struct jail64 {
+	uint32_t	version;
+	char		*path;
+	char		*hostname;
+	char		*jailname;
+	uint32_t	ip4s;
+	uint32_t	ip6s;
+	struct in_addr	*ip4;
+	struct in6_addr	*ip6;
+};
+
+struct thr_param64 {
+	void		*start_func;
+	void		*arg;
+	char		*stack_base;
+	size_t		stack_size;
+	char		*tls_base;
+	size_t		tls_size;
+	long		*child_tid;
+	long		*parent_tid;
+	int		flags;
+	struct rtprio	*rtp;
+	void		*ddc;
+	void		*spare[2];
+};
+
+struct kinfo_proc64 {
+	int	ki_structsize;
+	int	ki_layout;
+	void	*ki_args;		/* struct pargs */
+	void	*ki_paddr;		/* struct proc */
+	void	*ki_addr;		/* struct user */
+	void	*ki_tracep;		/* struct vnode */
+	void	*ki_textvp;		/* struct vnode */
+	void	*ki_fd;			/* struct filedesc */
+	void	*ki_vmspace;		/* struct vmspace */
+	void	*ki_wchan;		/* void */
+	pid_t	ki_pid;
+	pid_t	ki_ppid;
+	pid_t	ki_pgid;
+	pid_t	ki_tpgid;
+	pid_t	ki_sid;
+	pid_t	ki_tsid;
+	short	ki_jobc;
+	short	ki_spare_short1;
+	uint32_t ki_tdev_freebsd11;
+	sigset_t ki_siglist;
+	sigset_t ki_sigmask;
+	sigset_t ki_sigignore;
+	sigset_t ki_sigcatch;
+	uid_t	ki_uid;
+	uid_t	ki_ruid;
+	uid_t	ki_svuid;
+	gid_t	ki_rgid;
+	gid_t	ki_svgid;
+	short	ki_ngroups;
+	short	ki_spare_short2;
+	gid_t	ki_groups[KI_NGROUPS];
+	vm_size_t ki_size;
+	segsz_t ki_rssize;
+	segsz_t ki_swrss;
+	segsz_t ki_tsize;
+	segsz_t ki_dsize;
+	segsz_t ki_ssize;
+	u_short	ki_xstat;
+	u_short	ki_acflag;
+	fixpt_t	ki_pctcpu;
+	u_int	ki_estcpu;
+	u_int	ki_slptime;
+	u_int	ki_swtime;
+	u_int	ki_cow;
+	u_int64_t ki_runtime;
+	struct	timeval ki_start;
+	struct	timeval ki_childtime;
+	long	ki_flag;
+	long	ki_kiflag;
+	int	ki_traceflag;
+	char	ki_stat;
+	signed char ki_nice;
+	char	ki_lock;
+	char	ki_rqindex;
+	u_char	ki_oncpu_old;
+	u_char	ki_lastcpu_old;
+	char	ki_tdname[TDNAMLEN+1];
+	char	ki_wmesg[WMESGLEN+1];
+	char	ki_login[LOGNAMELEN+1];
+	char	ki_lockname[LOCKNAMELEN+1];
+	char	ki_comm[COMMLEN+1];
+	char	ki_emul[KI_EMULNAMELEN+1];
+	char	ki_loginclass[LOGINCLASSLEN+1];
+	char	ki_moretdname[MAXCOMLEN-TDNAMLEN+1];
+	/*
+	 * When adding new variables, take space for char-strings from the
+	 * front of ki_sparestrings, and ints from the end of ki_spareints.
+	 * That way the spare room from both arrays will remain contiguous.
+	 */
+	char	ki_sparestrings[46];
+	int	ki_spareints[KI_NSPARE_INT];
+	uint64_t ki_tdev;
+	int	ki_oncpu;
+	int	ki_lastcpu;
+	int	ki_tracer;
+	int	ki_flag2;
+	int	ki_fibnum;
+	u_int	ki_cr_flags;
+	int	ki_jid;
+	int	ki_numthreads;
+	lwpid_t	ki_tid;
+	struct	priority ki_pri;
+	struct	rusage ki_rusage;
+	/* XXX - most fields in ki_rusage_ch are not (yet) filled in */
+	struct	rusage ki_rusage_ch;
+	void	*ki_pcb;			/* struct pcb */
+	void	*ki_kstack;		/* void	*/
+	void	*ki_udata;		/* void	*/
+	void	*ki_tdaddr;		/* struct thread  */
+	void	*ki_spareptrs[KI_NSPARE_PTR];	/* void */
+	long	ki_sparelongs[KI_NSPARE_LONG];
+	long	ki_sflag;
+	long	ki_tdflags;
+};
+
+struct kld_file_stat64 {
+    int		version;	/* set to sizeof(struct kld_file_stat64) */
+    char        name[MAXPATHLEN];
+    int		refs;
+    int		id;
+    void	*address;	/* load address */
+    size_t	size;		/* size in bytes */
+    char        pathname[MAXPATHLEN];
+};
+
+struct kld_sym_lookup64 {
+	int		version; /* set to sizeof(struct kld_sym_lookup64) */
+	char		*symname; /* Symbol name we are looking up */
+	u_long		symvalue;
+	size_t		symsize;
+};
+
+struct procctl_reaper_pids64 {
+	u_int				rp_count;
+	u_int				rp_pad0[15];
+	struct procctl_reaper_pidinfo	*rp_pids;
+};
+
+union semun64 {
+	int		val;
+	struct semid_ds	*buf;
+	unsigned short 	*array;
+};
+
+#include <sys/ipc.h>
+#include <sys/msg.h>
+
+struct msqid_ds64 {
+	struct ipc_perm			msg_perm;
+	uint64_t			msg_first;	/* struct msg64 * */
+	uint64_t			msg_last;	/* struct msg64 * */
+	msglen_t			msg_cbytes;
+	msgqnum_t			msg_qnum;
+	msglen_t			msg_qbytes;
+	pid_t				msg_lspid;
+	pid_t  				msg_lrpid;
+	time_t				msg_stime;
+	time_t 				msg_rtime;
+	time_t				msg_ctime;
+};
+
+struct iovec64 {
+	void 	*iov_base;
+	int	iov_len;
+};
+
+#endif /* !_COMPAT_CHERIABI_CHERIABI_H_ */

sys/compat/freebsd64/freebsd64_abort2.c

@@ -0,0 +1,67 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2005 Wojciech A. Koszek
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/sbuf.h>
+#include <sys/syscallsubr.h>
+#include <sys/syslog.h>
+
+#include <compat/freebsd64/freebsd64_proto.h>
+
+int
+freebsd64_abort2(struct thread *td, struct freebsd64_abort2_args *uap)
+{
+	void *uargs[16];
+	void *uargsp;
+	long ptr;
+	int i, nargs;
+
+	nargs = uap->nargs;
+	if (nargs < 0 || nargs > nitems(uargs))
+		nargs = -1;
+	uargsp = NULL;
+	if (nargs > 0) {
+		if (uap->args != NULL) {
+			for (i = 0; i < nargs; i++) {
+				if (fueword(uap->args + i, &ptr) != 0) {
+					nargs = -1;
+					break;
+				} else
+					uargs[i] = (void *)(uintptr_t)ptr;
+			}
+			if (nargs > 0)
+				uargsp = &uargs;
+		} else
+			nargs = -1;
+	}
+	return (kern_abort2(td, __USER_CAP_STR(uap->why), nargs, uargsp));
+}