PERFORCE change 122984 for review
Marko Zec
zec at FreeBSD.org
Fri Jul 6 01:16:22 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=122984
Change 122984 by zec at zec_tpx32 on 2007/07/06 01:15:18
IFC @ 122940
NOTE: this change backs out all the previous virtualization
changes to pf, so we now have the freshly imported pf 4.1
in the tree, but without any virtualization support.
Affected files ...
.. //depot/projects/vimage/src/sys/Makefile#5 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#10 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#6 integrate
.. //depot/projects/vimage/src/sys/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#11 integrate
.. //depot/projects/vimage/src/sys/conf/files#13 integrate
.. //depot/projects/vimage/src/sys/conf/files.amd64#5 integrate
.. //depot/projects/vimage/src/sys/conf/files.arm#3 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#5 integrate
.. //depot/projects/vimage/src/sys/conf/files.ia64#3 integrate
.. //depot/projects/vimage/src/sys/conf/files.pc98#5 integrate
.. //depot/projects/vimage/src/sys/conf/files.powerpc#5 integrate
.. //depot/projects/vimage/src/sys/conf/files.sparc64#6 integrate
.. //depot/projects/vimage/src/sys/conf/files.sun4v#4 integrate
.. //depot/projects/vimage/src/sys/conf/kern.pre.mk#4 integrate
.. //depot/projects/vimage/src/sys/conf/options#13 integrate
.. //depot/projects/vimage/src/sys/conf/options.amd64#2 integrate
.. //depot/projects/vimage/src/sys/conf/options.i386#2 integrate
.. //depot/projects/vimage/src/sys/conf/options.pc98#2 integrate
.. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_cbq.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_priq.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_red.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/if_pflog.c#3 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/if_pflog.h#3 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.c#6 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/if_pfsync.h#4 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#7 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#4 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#8 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_mtag.h#1 add
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_norm.c#3 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_osfp.c#3 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ruleset.c#1 add
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#3 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_table.c#3 edit
.. //depot/projects/vimage/src/sys/contrib/pf/net/pfvar.h#3 edit
.. //depot/projects/vimage/src/sys/contrib/pf/netinet/in4_cksum.c#2 edit
.. //depot/projects/vimage/src/sys/crypto/via/padlock.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_library.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/isp/ispvar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/rp/rp.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sbni/if_sbni.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/snp/snp.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/es137x.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ubser.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/umass.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uvisor.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uvscom.c#5 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_int.h#2 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#6 integrate
.. //depot/projects/vimage/src/sys/i386/conf/NOTES#10 integrate
.. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/include/pc/vesa.h#2 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#7 integrate
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_ing.c#2 integrate
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_ipr.c#3 integrate
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_isppp.c#2 integrate
.. //depot/projects/vimage/src/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate
.. //depot/projects/vimage/src/sys/i4b/layer4/i4b_l4.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/Make.tags.inc#5 integrate
.. //depot/projects/vimage/src/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_conf.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/kern_descrip.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/kern_lockf.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_priv.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/vimage/src/sys/kern/subr_smp.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/subr_unit.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/sys_generic.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.master#2 integrate
.. //depot/projects/vimage/src/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/sysv_sem.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/tty_pts.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/tty_pty.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/tty_tty.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/vimage/src/sys/modules/ipfw/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/pf/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#6 integrate
.. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.h#5 integrate
.. //depot/projects/vimage/src/sys/net/if_ethersubr.c#12 integrate
.. //depot/projects/vimage/src/sys/net/if_lagg.c#6 integrate
.. //depot/projects/vimage/src/sys/net/if_lagg.h#5 integrate
.. //depot/projects/vimage/src/sys/net/if_ppp.c#6 integrate
.. //depot/projects/vimage/src/sys/net/pfkeyv2.h#3 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/in_proto.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#17 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#15 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#5 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_output.c#10 integrate
.. //depot/projects/vimage/src/sys/netinet/raw_ip.c#12 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.h#5 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#11 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#12 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_var.h#8 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#15 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_output.c#12 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#20 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#5 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_var.h#12 integrate
.. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet6/esp_output.c#2 delete
.. //depot/projects/vimage/src/sys/netinet6/icmp6.c#11 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6.h#4 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#11 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#8 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#6 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#12 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#8 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6.c#14 integrate
.. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#11 integrate
.. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#11 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#5 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/vimage/src/sys/opencrypto/cast.c#2 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/conf.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/mbuf.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.mk#2 integrate
.. //depot/projects/vimage/src/sys/sys/sysproto.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/systm.h#7 integrate
.. //depot/projects/vimage/src/sys/vm/vm_mmap.c#4 integrate
Differences ...
==== //depot/projects/vimage/src/sys/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.43 2007/07/01 11:38:26 gnn Exp $
+# $FreeBSD: src/sys/Makefile,v 1.44 2007/07/05 08:55:13 bz Exp $
.include <bsd.own.mk>
@@ -10,7 +10,7 @@
# Directories to include in cscope name file and TAGS.
CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \
i4b isa kern libkern modules net net80211 netatalk netatm \
- netgraph netinet netinet6 netipx netnatm netncp \
+ netgraph netinet netinet6 netipsec netipx netnatm netncp \
netsmb nfs nfsclient nfs4client rpc pccard pci security sys \
ufs vm ${ARCHDIR}
@@ -24,12 +24,14 @@
HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
+# You need the devel/cscope port for this.
cscope: ${.CURDIR}/cscopenamefile
cd ${.CURDIR}; cscope -k -p4 -i cscopenamefile
${.CURDIR}/cscopenamefile:
cd ${.CURDIR}; find ${CSCOPEDIRS} -name "*.[csh]" > ${.TARGET}
+# You need the devel/global and one of editor/emacs* ports for that.
TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscopenamefile
rm -f ${.CURDIR}/TAGS
cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscopenamefile
==== //depot/projects/vimage/src/sys/amd64/conf/NOTES#5 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.67 2007/07/01 22:19:20 njl Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.68 2007/07/04 00:18:38 bz Exp $
#
#
@@ -542,9 +542,9 @@
#XXX#device i4bipr
#XXX#options NI4BIPR=4
# enable VJ header compression detection for ipr i/f
-options IPR_VJ
+#XXX#options IPR_VJ
# enable logging of the first n IP packets to isdnd (n=32 here)
-options IPR_LOG=32
+#XXX#options IPR_LOG=32
#
# network driver for sync PPP over ISDN; requires an equivalent
# number of sppp device to be configured
==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#10 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.44 2007/06/05 00:00:50 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.45 2007/07/04 23:06:43 peter Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -927,7 +927,6 @@
bsd_args.len = linux_args->len;
}
bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE;
- bsd_args.pad = 0;
#ifdef DEBUG
if (ldebug(mmap))
@@ -1153,7 +1152,6 @@
#endif
sa.fd = args->fd;
- sa.pad = 0;
sa.length = args->length;
return ftruncate(td, &sa);
}
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.65 2007/06/17 04:37:57 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.66 2007/07/04 23:04:41 peter Exp $");
#include "opt_compat.h"
@@ -475,6 +475,24 @@
return (mmap(td, &ap));
}
+#ifdef COMPAT_FREEBSD6
+int
+freebsd6_freebsd32_mmap(struct thread *td, struct freebsd6_freebsd32_mmap_args *uap)
+{
+ struct freebsd32_mmap_args ap;
+
+ ap.addr = uap->addr;
+ ap.len = uap->len;
+ ap.prot = uap->prot;
+ ap.flags = uap->flags;
+ ap.fd = uap->fd;
+ ap.poslo = uap->poslo;
+ ap.poshi = uap->poshi;
+
+ return (freebsd32_mmap(td, &ap));
+}
+#endif
+
struct itimerval32 {
struct timeval32 it_interval;
struct timeval32 it_value;
@@ -1616,6 +1634,71 @@
return (ftruncate(td, &ap));
}
+#ifdef COMPAT_FREEBSD6
+/* versions with the 'int pad' argument */
+int
+freebsd6_freebsd32_pread(struct thread *td, struct freebsd6_freebsd32_pread_args *uap)
+{
+ struct pread_args ap;
+
+ ap.fd = uap->fd;
+ ap.buf = uap->buf;
+ ap.nbyte = uap->nbyte;
+ ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32));
+ return (pread(td, &ap));
+}
+
+int
+freebsd6_freebsd32_pwrite(struct thread *td, struct freebsd6_freebsd32_pwrite_args *uap)
+{
+ struct pwrite_args ap;
+
+ ap.fd = uap->fd;
+ ap.buf = uap->buf;
+ ap.nbyte = uap->nbyte;
+ ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32));
+ return (pwrite(td, &ap));
+}
+
+int
+freebsd6_freebsd32_lseek(struct thread *td, struct freebsd6_freebsd32_lseek_args *uap)
+{
+ int error;
+ struct lseek_args ap;
+ off_t pos;
+
+ ap.fd = uap->fd;
+ ap.offset = (uap->offsetlo | ((off_t)uap->offsethi << 32));
+ ap.whence = uap->whence;
+ error = lseek(td, &ap);
+ /* Expand the quad return into two parts for eax and edx */
+ pos = *(off_t *)(td->td_retval);
+ td->td_retval[0] = pos & 0xffffffff; /* %eax */
+ td->td_retval[1] = pos >> 32; /* %edx */
+ return error;
+}
+
+int
+freebsd6_freebsd32_truncate(struct thread *td, struct freebsd6_freebsd32_truncate_args *uap)
+{
+ struct truncate_args ap;
+
+ ap.path = uap->path;
+ ap.length = (uap->lengthlo | ((off_t)uap->lengthhi << 32));
+ return (truncate(td, &ap));
+}
+
+int
+freebsd6_freebsd32_ftruncate(struct thread *td, struct freebsd6_freebsd32_ftruncate_args *uap)
+{
+ struct ftruncate_args ap;
+
+ ap.fd = uap->fd;
+ ap.length = (uap->lengthlo | ((off_t)uap->lengthhi << 32));
+ return (ftruncate(td, &ap));
+}
+#endif /* COMPAT_FREEBSD6 */
+
struct sf_hdtr32 {
uint32_t headers;
int hdr_cnt;
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.76 2006/12/20 19:39:10 jkim Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.77 2007/07/04 23:03:50 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -134,22 +134,6 @@
char a3_l_[PADL_(uint32_t)]; uint32_t a3; char a3_r_[PADR_(uint32_t)];
char a4_l_[PADL_(uint32_t)]; uint32_t a4; char a4_r_[PADR_(uint32_t)];
};
-struct freebsd32_pread_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
- char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
- char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
- char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
- char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
-};
-struct freebsd32_pwrite_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
- char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
- char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
- char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
- char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
-};
struct freebsd32_stat_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)];
@@ -162,35 +146,6 @@
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)];
};
-struct freebsd32_mmap_args {
- char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
- char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
- char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
- char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
- char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)];
- char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)];
-};
-struct freebsd32_lseek_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
- char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
- char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
- char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
-};
-struct freebsd32_truncate_args {
- char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
- char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
- char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
-};
-struct freebsd32_ftruncate_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
- char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
- char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
-};
struct freebsd32_sysctl_args {
char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)];
char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)];
@@ -322,6 +277,45 @@
char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)];
char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)];
};
+struct freebsd32_pread_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
+ char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
+ char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+ char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+};
+struct freebsd32_pwrite_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
+ char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
+ char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+ char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+};
+struct freebsd32_mmap_args {
+ char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
+ char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
+ char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
+ char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)];
+ char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)];
+};
+struct freebsd32_lseek_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+ char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+ char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
+};
+struct freebsd32_truncate_args {
+ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+ char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
+ char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
+};
+struct freebsd32_ftruncate_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
+ char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
+};
int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *);
int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *);
int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *);
@@ -341,15 +335,9 @@
int freebsd32_semsys(struct thread *, struct freebsd32_semsys_args *);
int freebsd32_msgsys(struct thread *, struct freebsd32_msgsys_args *);
int freebsd32_shmsys(struct thread *, struct freebsd32_shmsys_args *);
-int freebsd32_pread(struct thread *, struct freebsd32_pread_args *);
-int freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *);
int freebsd32_stat(struct thread *, struct freebsd32_stat_args *);
int freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *);
int freebsd32_lstat(struct thread *, struct freebsd32_lstat_args *);
-int freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *);
-int freebsd32_lseek(struct thread *, struct freebsd32_lseek_args *);
-int freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *);
-int freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *);
int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *);
int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *);
int freebsd32_msgsnd(struct thread *, struct freebsd32_msgsnd_args *);
@@ -377,6 +365,12 @@
int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *);
int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *);
int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *);
+int freebsd32_pread(struct thread *, struct freebsd32_pread_args *);
+int freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *);
+int freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *);
+int freebsd32_lseek(struct thread *, struct freebsd32_lseek_args *);
+int freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *);
+int freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *);
#ifdef COMPAT_43
@@ -466,6 +460,63 @@
#endif /* COMPAT_FREEBSD4 */
+
+#ifdef COMPAT_FREEBSD6
+
+struct freebsd6_freebsd32_pread_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
+ char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
+ char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+ char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+ char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+};
+struct freebsd6_freebsd32_pwrite_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
+ char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
+ char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+ char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+ char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+};
+struct freebsd6_freebsd32_mmap_args {
+ char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
+ char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
+ char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
+ char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+ char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)];
+ char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)];
+};
+struct freebsd6_freebsd32_lseek_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+ char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
+ char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
+ char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
+};
+struct freebsd6_freebsd32_truncate_args {
+ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+ char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+ char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
+ char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
+};
+struct freebsd6_freebsd32_ftruncate_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+ char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
+ char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
+};
+int freebsd6_freebsd32_pread(struct thread *, struct freebsd6_freebsd32_pread_args *);
+int freebsd6_freebsd32_pwrite(struct thread *, struct freebsd6_freebsd32_pwrite_args *);
+int freebsd6_freebsd32_mmap(struct thread *, struct freebsd6_freebsd32_mmap_args *);
+int freebsd6_freebsd32_lseek(struct thread *, struct freebsd6_freebsd32_lseek_args *);
+int freebsd6_freebsd32_truncate(struct thread *, struct freebsd6_freebsd32_truncate_args *);
+int freebsd6_freebsd32_ftruncate(struct thread *, struct freebsd6_freebsd32_ftruncate_args *);
+
+#endif /* COMPAT_FREEBSD6 */
+
#define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4
#define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG
#define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG
@@ -485,15 +536,9 @@
#define FREEBSD32_SYS_AUE_freebsd32_semsys AUE_SEMSYS
#define FREEBSD32_SYS_AUE_freebsd32_msgsys AUE_MSGSYS
#define FREEBSD32_SYS_AUE_freebsd32_shmsys AUE_SHMSYS
-#define FREEBSD32_SYS_AUE_freebsd32_pread AUE_PREAD
-#define FREEBSD32_SYS_AUE_freebsd32_pwrite AUE_PWRITE
#define FREEBSD32_SYS_AUE_freebsd32_stat AUE_STAT
#define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT
#define FREEBSD32_SYS_AUE_freebsd32_lstat AUE_LSTAT
-#define FREEBSD32_SYS_AUE_freebsd32_mmap AUE_MMAP
-#define FREEBSD32_SYS_AUE_freebsd32_lseek AUE_LSEEK
-#define FREEBSD32_SYS_AUE_freebsd32_truncate AUE_TRUNCATE
-#define FREEBSD32_SYS_AUE_freebsd32_ftruncate AUE_FTRUNCATE
#define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL
#define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES
#define FREEBSD32_SYS_AUE_freebsd32_msgsnd AUE_MSGSND
@@ -521,6 +566,12 @@
#define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_pread AUE_PREAD
+#define FREEBSD32_SYS_AUE_freebsd32_pwrite AUE_PWRITE
+#define FREEBSD32_SYS_AUE_freebsd32_mmap AUE_MMAP
+#define FREEBSD32_SYS_AUE_freebsd32_lseek AUE_LSEEK
+#define FREEBSD32_SYS_AUE_freebsd32_truncate AUE_TRUNCATE
+#define FREEBSD32_SYS_AUE_freebsd32_ftruncate AUE_FTRUNCATE
#undef PAD_
#undef PADL_
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.74 2006/12/20 19:39:10 jkim Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.75 2007/07/04 23:03:50 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp
*/
#define FREEBSD32_SYS_syscall 0
@@ -24,7 +24,7 @@
#define FREEBSD32_SYS_chmod 15
#define FREEBSD32_SYS_chown 16
#define FREEBSD32_SYS_break 17
- /* 18 is old freebsd32_getfsstat */
+#define FREEBSD32_SYS_freebsd4_freebsd32_getfsstat 18
/* 19 is obsolete olseek */
#define FREEBSD32_SYS_getpid 20
#define FREEBSD32_SYS_mount 21
@@ -153,8 +153,8 @@
/* 149 is obsolete oquota */
/* 150 is obsolete ogetsockname */
/* 156 is obsolete ogetdirentries */
- /* 157 is old freebsd32_statfs */
- /* 158 is old freebsd32_fstatfs */
+#define FREEBSD32_SYS_freebsd4_freebsd32_statfs 157
+#define FREEBSD32_SYS_freebsd4_freebsd32_fstatfs 158
#define FREEBSD32_SYS_getfh 161
#define FREEBSD32_SYS_getdomainname 162
#define FREEBSD32_SYS_setdomainname 163
@@ -164,8 +164,8 @@
#define FREEBSD32_SYS_freebsd32_semsys 169
#define FREEBSD32_SYS_freebsd32_msgsys 170
#define FREEBSD32_SYS_freebsd32_shmsys 171
-#define FREEBSD32_SYS_freebsd32_pread 173
-#define FREEBSD32_SYS_freebsd32_pwrite 174
+#define FREEBSD32_SYS_freebsd6_freebsd32_pread 173
+#define FREEBSD32_SYS_freebsd6_freebsd32_pwrite 174
#define FREEBSD32_SYS_ntp_adjtime 176
#define FREEBSD32_SYS_setgid 181
#define FREEBSD32_SYS_setegid 182
@@ -178,11 +178,11 @@
#define FREEBSD32_SYS_getrlimit 194
#define FREEBSD32_SYS_setrlimit 195
#define FREEBSD32_SYS_getdirentries 196
-#define FREEBSD32_SYS_freebsd32_mmap 197
+#define FREEBSD32_SYS_freebsd6_freebsd32_mmap 197
#define FREEBSD32_SYS___syscall 198
-#define FREEBSD32_SYS_freebsd32_lseek 199
-#define FREEBSD32_SYS_freebsd32_truncate 200
-#define FREEBSD32_SYS_freebsd32_ftruncate 201
+#define FREEBSD32_SYS_freebsd6_freebsd32_lseek 199
+#define FREEBSD32_SYS_freebsd6_freebsd32_truncate 200
+#define FREEBSD32_SYS_freebsd6_freebsd32_ftruncate 201
#define FREEBSD32_SYS_freebsd32_sysctl 202
#define FREEBSD32_SYS_mlock 203
#define FREEBSD32_SYS_munlock 204
@@ -220,7 +220,7 @@
#define FREEBSD32_SYS_nlstat 280
#define FREEBSD32_SYS_freebsd32_preadv 289
#define FREEBSD32_SYS_freebsd32_pwritev 290
- /* 297 is old freebsd32_fhstatfs */
+#define FREEBSD32_SYS_freebsd4_freebsd32_fhstatfs 297
#define FREEBSD32_SYS_fhopen 298
#define FREEBSD32_SYS_fhstat 299
#define FREEBSD32_SYS_modnext 300
@@ -252,14 +252,14 @@
#define FREEBSD32_SYS_sched_get_priority_min 333
#define FREEBSD32_SYS_sched_rr_get_interval 334
#define FREEBSD32_SYS_utrace 335
- /* 336 is old freebsd32_sendfile */
+#define FREEBSD32_SYS_freebsd4_freebsd32_sendfile 336
#define FREEBSD32_SYS_kldsym 337
#define FREEBSD32_SYS_jail 338
#define FREEBSD32_SYS_sigprocmask 340
#define FREEBSD32_SYS_sigsuspend 341
- /* 342 is old freebsd32_sigaction */
+#define FREEBSD32_SYS_freebsd4_freebsd32_sigaction 342
#define FREEBSD32_SYS_sigpending 343
- /* 344 is old freebsd32_sigreturn */
+#define FREEBSD32_SYS_freebsd4_freebsd32_sigreturn 344
#define FREEBSD32_SYS_freebsd32_sigtimedwait 345
#define FREEBSD32_SYS_freebsd32_sigwaitinfo 346
#define FREEBSD32_SYS___acl_get_file 347
@@ -331,4 +331,10 @@
#define FREEBSD32_SYS_sctp_generic_sendmsg 472
#define FREEBSD32_SYS_sctp_generic_sendmsg_iov 473
#define FREEBSD32_SYS_sctp_generic_recvmsg 474
-#define FREEBSD32_SYS_MAXSYSCALL 475
+#define FREEBSD32_SYS_freebsd32_pread 475
+#define FREEBSD32_SYS_freebsd32_pwrite 476
+#define FREEBSD32_SYS_freebsd32_mmap 477
+#define FREEBSD32_SYS_freebsd32_lseek 478
+#define FREEBSD32_SYS_freebsd32_truncate 479
+#define FREEBSD32_SYS_freebsd32_ftruncate 480
+#define FREEBSD32_SYS_MAXSYSCALL 481
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.65 2006/12/20 19:39:10 jkim Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.66 2007/07/04 23:03:50 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp
*/
const char *freebsd32_syscallnames[] = {
@@ -25,7 +25,7 @@
"chmod", /* 15 = chmod */
"chown", /* 16 = chown */
"break", /* 17 = break */
- "old.freebsd32_getfsstat", /* 18 = old freebsd32_getfsstat */
+ "compat4.freebsd32_getfsstat", /* 18 = old freebsd32_getfsstat */
"obs_olseek", /* 19 = obsolete olseek */
"getpid", /* 20 = getpid */
"mount", /* 21 = mount */
@@ -53,13 +53,13 @@
"getegid", /* 43 = getegid */
"profil", /* 44 = profil */
"ktrace", /* 45 = ktrace */
- "old.freebsd32_sigaction", /* 46 = old freebsd32_sigaction */
+ "compat.freebsd32_sigaction", /* 46 = old freebsd32_sigaction */
"getgid", /* 47 = getgid */
- "old.freebsd32_sigprocmask", /* 48 = old freebsd32_sigprocmask */
+ "compat.freebsd32_sigprocmask", /* 48 = old freebsd32_sigprocmask */
"getlogin", /* 49 = getlogin */
"setlogin", /* 50 = setlogin */
"acct", /* 51 = acct */
- "old.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */
+ "compat.freebsd32_sigpending", /* 52 = old freebsd32_sigpending */
"freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */
"ioctl", /* 54 = ioctl */
"reboot", /* 55 = reboot */
@@ -115,11 +115,11 @@
"setsockopt", /* 105 = setsockopt */
"listen", /* 106 = listen */
"obs_vtimes", /* 107 = obsolete vtimes */
- "old.freebsd32_sigvec", /* 108 = old freebsd32_sigvec */
- "old.freebsd32_sigblock", /* 109 = old freebsd32_sigblock */
- "old.freebsd32_sigsetmask", /* 110 = old freebsd32_sigsetmask */
- "old.freebsd32_sigsuspend", /* 111 = old freebsd32_sigsuspend */
- "old.freebsd32_sigstack", /* 112 = old freebsd32_sigstack */
+ "compat.freebsd32_sigvec", /* 108 = old freebsd32_sigvec */
+ "compat.freebsd32_sigblock", /* 109 = old freebsd32_sigblock */
+ "compat.freebsd32_sigsetmask", /* 110 = old freebsd32_sigsetmask */
+ "compat.freebsd32_sigsuspend", /* 111 = old freebsd32_sigsuspend */
+ "compat.freebsd32_sigstack", /* 112 = old freebsd32_sigstack */
"obs_orecvmsg", /* 113 = obsolete orecvmsg */
"obs_osendmsg", /* 114 = obsolete osendmsg */
"obs_vtrace", /* 115 = obsolete vtrace */
@@ -164,8 +164,8 @@
"#154", /* 154 = nosys */
"#155", /* 155 = nfssvc */
"obs_ogetdirentries", /* 156 = obsolete ogetdirentries */
- "old.freebsd32_statfs", /* 157 = old freebsd32_statfs */
- "old.freebsd32_fstatfs", /* 158 = old freebsd32_fstatfs */
+ "compat4.freebsd32_statfs", /* 157 = old freebsd32_statfs */
+ "compat4.freebsd32_fstatfs", /* 158 = old freebsd32_fstatfs */
"#159", /* 159 = nosys */
"#160", /* 160 = lgetfh */
"getfh", /* 161 = getfh */
@@ -180,8 +180,8 @@
"freebsd32_msgsys", /* 170 = freebsd32_msgsys */
"freebsd32_shmsys", /* 171 = freebsd32_shmsys */
"#172", /* 172 = nosys */
- "freebsd32_pread", /* 173 = freebsd32_pread */
- "freebsd32_pwrite", /* 174 = freebsd32_pwrite */
+ "compat6.freebsd32_pread", /* 173 = old freebsd32_pread */
+ "compat6.freebsd32_pwrite", /* 174 = old freebsd32_pwrite */
"#175", /* 175 = nosys */
"ntp_adjtime", /* 176 = ntp_adjtime */
"#177", /* 177 = sfork */
@@ -204,11 +204,11 @@
"getrlimit", /* 194 = getrlimit */
"setrlimit", /* 195 = setrlimit */
"getdirentries", /* 196 = getdirentries */
- "freebsd32_mmap", /* 197 = freebsd32_mmap */
+ "compat6.freebsd32_mmap", /* 197 = old freebsd32_mmap */
"__syscall", /* 198 = __syscall */
- "freebsd32_lseek", /* 199 = freebsd32_lseek */
- "freebsd32_truncate", /* 200 = freebsd32_truncate */
- "freebsd32_ftruncate", /* 201 = freebsd32_ftruncate */
+ "compat6.freebsd32_lseek", /* 199 = old freebsd32_lseek */
+ "compat6.freebsd32_truncate", /* 200 = old freebsd32_truncate */
+ "compat6.freebsd32_ftruncate", /* 201 = old freebsd32_ftruncate */
"freebsd32_sysctl", /* 202 = freebsd32_sysctl */
"mlock", /* 203 = mlock */
"munlock", /* 204 = munlock */
@@ -304,7 +304,7 @@
"#294", /* 294 = nosys */
"#295", /* 295 = nosys */
"#296", /* 296 = nosys */
- "old.freebsd32_fhstatfs", /* 297 = old freebsd32_fhstatfs */
+ "compat4.freebsd32_fhstatfs", /* 297 = old freebsd32_fhstatfs */
"fhopen", /* 298 = fhopen */
"fhstat", /* 299 = fhstat */
"modnext", /* 300 = modnext */
@@ -343,15 +343,15 @@
"sched_get_priority_min", /* 333 = sched_get_priority_min */
"sched_rr_get_interval", /* 334 = sched_rr_get_interval */
"utrace", /* 335 = utrace */
- "old.freebsd32_sendfile", /* 336 = old freebsd32_sendfile */
+ "compat4.freebsd32_sendfile", /* 336 = old freebsd32_sendfile */
"kldsym", /* 337 = kldsym */
"jail", /* 338 = jail */
"#339", /* 339 = pioctl */
"sigprocmask", /* 340 = sigprocmask */
"sigsuspend", /* 341 = sigsuspend */
- "old.freebsd32_sigaction", /* 342 = old freebsd32_sigaction */
+ "compat4.freebsd32_sigaction", /* 342 = old freebsd32_sigaction */
"sigpending", /* 343 = sigpending */
- "old.freebsd32_sigreturn", /* 344 = old freebsd32_sigreturn */
+ "compat4.freebsd32_sigreturn", /* 344 = old freebsd32_sigreturn */
"freebsd32_sigtimedwait", /* 345 = freebsd32_sigtimedwait */
"freebsd32_sigwaitinfo", /* 346 = freebsd32_sigwaitinfo */
"__acl_get_file", /* 347 = __acl_get_file */
@@ -482,4 +482,10 @@
"sctp_generic_sendmsg", /* 472 = sctp_generic_sendmsg */
"sctp_generic_sendmsg_iov", /* 473 = sctp_generic_sendmsg_iov */
"sctp_generic_recvmsg", /* 474 = sctp_generic_recvmsg */
+ "freebsd32_pread", /* 475 = freebsd32_pread */
+ "freebsd32_pwrite", /* 476 = freebsd32_pwrite */
+ "freebsd32_mmap", /* 477 = freebsd32_mmap */
+ "freebsd32_lseek", /* 478 = freebsd32_lseek */
+ "freebsd32_truncate", /* 479 = freebsd32_truncate */
+ "freebsd32_ftruncate", /* 480 = freebsd32_ftruncate */
};
==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.75 2006/12/20 19:39:10 jkim Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.88 2006/12/20 19:36:03 jkim Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.76 2007/07/04 23:03:50 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp
*/
#include "opt_compat.h"
@@ -30,6 +30,12 @@
#define compat4(n, name) 0, (sy_call_t *)nosys
#endif
+#ifdef COMPAT_FREEBSD6
+#define compat6(n, name) n, (sy_call_t *)__CONCAT(freebsd6_,name)
+#else
+#define compat6(n, name) 0, (sy_call_t *)nosys
+#endif
+
/* The casts are bogus but will do for now. */
struct sysent freebsd32_sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = syscall */
@@ -205,8 +211,8 @@
{ AS(freebsd32_msgsys_args), (sy_call_t *)freebsd32_msgsys, AUE_MSGSYS, NULL, 0, 0 }, /* 170 = freebsd32_msgsys */
{ AS(freebsd32_shmsys_args), (sy_call_t *)freebsd32_shmsys, AUE_SHMSYS, NULL, 0, 0 }, /* 171 = freebsd32_shmsys */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 172 = nosys */
- { AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0 }, /* 173 = freebsd32_pread */
- { AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 174 = freebsd32_pwrite */
+ { compat6(AS(freebsd6_freebsd32_pread_args),freebsd32_pread), AUE_PREAD, NULL, 0, 0 }, /* 173 = old freebsd32_pread */
+ { compat6(AS(freebsd6_freebsd32_pwrite_args),freebsd32_pwrite), AUE_PWRITE, NULL, 0, 0 }, /* 174 = old freebsd32_pwrite */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 175 = nosys */
{ AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 177 = sfork */
@@ -229,11 +235,11 @@
{ AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 194 = getrlimit */
{ AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 195 = setrlimit */
{ AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 196 = getdirentries */
- { AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap, AUE_MMAP, NULL, 0, 0 }, /* 197 = freebsd32_mmap */
+ { compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0 }, /* 197 = old freebsd32_mmap */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 198 = __syscall */
- { AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 199 = freebsd32_lseek */
- { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 200 = freebsd32_truncate */
- { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 201 = freebsd32_ftruncate */
+ { compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0 }, /* 199 = old freebsd32_lseek */
+ { compat6(AS(freebsd6_freebsd32_truncate_args),freebsd32_truncate), AUE_TRUNCATE, NULL, 0, 0 }, /* 200 = old freebsd32_truncate */
+ { compat6(AS(freebsd6_freebsd32_ftruncate_args),freebsd32_ftruncate), AUE_FTRUNCATE, NULL, 0, 0 }, /* 201 = old freebsd32_ftruncate */
{ AS(freebsd32_sysctl_args), (sy_call_t *)freebsd32_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 202 = freebsd32_sysctl */
{ AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 203 = mlock */
{ AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 204 = munlock */
@@ -507,4 +513,10 @@
{ AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0 }, /* 472 = sctp_generic_sendmsg */
{ AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0 }, /* 473 = sctp_generic_sendmsg_iov */
{ AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0 }, /* 474 = sctp_generic_recvmsg */
+ { AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0 }, /* 475 = freebsd32_pread */
+ { AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 476 = freebsd32_pwrite */
+ { AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap, AUE_MMAP, NULL, 0, 0 }, /* 477 = freebsd32_mmap */
+ { AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 478 = freebsd32_lseek */
+ { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 479 = freebsd32_truncate */
+ { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 480 = freebsd32_ftruncate */
};
==== //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#4 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.89 2007/06/15 21:54:26 emaste Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.90 2007/07/04 23:02:40 peter Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -303,11 +303,11 @@
171 AUE_SHMSYS STD { int freebsd32_shmsys(uint32_t which, uint32_t a2, \
uint32_t a3, uint32_t a4); }
172 AUE_NULL UNIMPL nosys
-173 AUE_PREAD STD { ssize_t freebsd32_pread(int fd, void *buf, \
+173 AUE_PREAD COMPAT6 { ssize_t freebsd32_pread(int fd, void *buf, \
size_t nbyte, int pad, \
u_int32_t offsetlo, u_int32_t offsethi); }
; XXX note - bigendian is different
-174 AUE_PWRITE STD { ssize_t freebsd32_pwrite(int fd, \
+174 AUE_PWRITE COMPAT6 { ssize_t freebsd32_pwrite(int fd, \
const void *buf, size_t nbyte, int pad, \
u_int32_t offsetlo, u_int32_t offsethi); }
; XXX note - bigendian is different
@@ -343,22 +343,22 @@
__setrlimit_args int
196 AUE_GETDIRENTRIES NOPROTO { int getdirentries(int fd, char *buf, \
u_int count, long *basep); }
-197 AUE_MMAP STD { caddr_t freebsd32_mmap(caddr_t addr, \
+197 AUE_MMAP COMPAT6 { caddr_t freebsd32_mmap(caddr_t addr, \
size_t len, int prot, int flags, int fd, \
int pad, u_int32_t poslo, \
u_int32_t poshi); }
198 AUE_NULL NOPROTO { int nosys(void); } __syscall \
__syscall_args int
; XXX note - bigendian is different
-199 AUE_LSEEK STD { off_t freebsd32_lseek(int fd, int pad, \
+199 AUE_LSEEK COMPAT6 { off_t freebsd32_lseek(int fd, int pad, \
u_int32_t offsetlo, u_int32_t offsethi, \
int whence); }
; XXX note - bigendian is different
-200 AUE_TRUNCATE STD { int freebsd32_truncate(char *path, \
+200 AUE_TRUNCATE COMPAT6 { int freebsd32_truncate(char *path, \
int pad, u_int32_t lengthlo, \
u_int32_t lengthhi); }
; XXX note - bigendian is different
-201 AUE_FTRUNCATE STD { int freebsd32_ftruncate(int fd, int pad, \
+201 AUE_FTRUNCATE COMPAT6 { int freebsd32_ftruncate(int fd, int pad, \
u_int32_t lengthlo, u_int32_t lengthhi); }
202 AUE_SYSCTL STD { int freebsd32_sysctl(int *name, \
u_int namelen, void *old, \
@@ -778,3 +778,19 @@
474 AUE_NULL NOPROTO { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
struct sockaddr * from, __socklen_t *fromlenaddr, \
struct sctp_sndrcvinfo *sinfo, int *msg_flags); }
+475 AUE_PREAD STD { ssize_t freebsd32_pread(int fd, \
+ void *buf,size_t nbyte, \
+ u_int32_t offsetlo, u_int32_t offsethi); }
+476 AUE_PWRITE STD { ssize_t freebsd32_pwrite(int fd, \
+ const void *buf, size_t nbyte, \
+ u_int32_t offsetlo, u_int32_t offsethi); }
+477 AUE_MMAP STD { caddr_t freebsd32_mmap(caddr_t addr, \
+ size_t len, int prot, int flags, int fd, \
+ u_int32_t poslo, u_int32_t poshi); }
+478 AUE_LSEEK STD { off_t freebsd32_lseek(int fd, \
+ u_int32_t offsetlo, u_int32_t offsethi, \
+ int whence); }
+479 AUE_TRUNCATE STD { int freebsd32_truncate(char *path, \
+ u_int32_t lengthlo, u_int32_t lengthhi); }
+480 AUE_FTRUNCATE STD { int freebsd32_ftruncate(int fd, \
+ u_int32_t lengthlo, u_int32_t lengthhi); }
==== //depot/projects/vimage/src/sys/compat/linux/linux_file.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.104 2007/06/10 04:37:22 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.105 2007/07/04 23:06:43 peter Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -835,7 +835,6 @@
} */ nuap;
nuap.fd = args->fd;
- nuap.pad = 0;
nuap.length = args->length;
return (ftruncate(td, &nuap));
}
==== //depot/projects/vimage/src/sys/compat/pecoff/imgact_pecoff.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.39 2005/02/22 01:26:48 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.40 2007/07/05 07:38:17 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -405,7 +405,7 @@
int prot;
u_long text_size = 0, data_size = 0, dsize;
u_long text_addr = 0, data_addr = VM_MAXUSER_ADDRESS;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list