svn commit: r206586 - user/jmallett/octeon/sys/compat/freebsd32
Juli Mallett
jmallett at FreeBSD.org
Wed Apr 14 03:58:23 UTC 2010
Author: jmallett
Date: Wed Apr 14 03:58:21 2010
New Revision: 206586
URL: http://svn.freebsd.org/changeset/base/206586
Log:
Don't split 64-bit quantities into 2 32-bit quantities on MIPS, since the
compat framework right now is used for running n32 binaries, which happily
fit 64-bit quantities in a single register.
Modified:
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_misc.c
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_proto.h
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscall.h
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscalls.c
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_sysent.c
user/jmallett/octeon/sys/compat/freebsd32/syscalls.master
Modified: user/jmallett/octeon/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- user/jmallett/octeon/sys/compat/freebsd32/freebsd32_misc.c Wed Apr 14 03:13:02 2010 (r206585)
+++ user/jmallett/octeon/sys/compat/freebsd32/freebsd32_misc.c Wed Apr 14 03:58:21 2010 (r206586)
@@ -119,6 +119,7 @@ CTASSERT(sizeof(struct sigaction32) == 2
static int freebsd32_kevent_copyout(void *arg, struct kevent *kevp, int count);
static int freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count);
+#ifdef QUAD_SPLIT_REQUIRED
#if BYTE_ORDER == BIG_ENDIAN
#define PAIR32TO64(type, name) ((name ## 2) | ((type)(name ## 1) << 32))
#define RETVAL_HI 0
@@ -128,6 +129,9 @@ static int freebsd32_kevent_copyin(void
#define RETVAL_HI 1
#define RETVAL_LO 0
#endif
+#else
+#define PAIR32TO64(type, name) (name)
+#endif
int
freebsd32_wait4(struct thread *td, struct freebsd32_wait4_args *uap)
@@ -1429,16 +1433,20 @@ freebsd32_lseek(struct thread *td, struc
{
int error;
struct lseek_args ap;
+#ifdef QUAD_SPLIT_REQUIRED
off_t pos;
+#endif
ap.fd = uap->fd;
ap.offset = PAIR32TO64(off_t,uap->offset);
ap.whence = uap->whence;
error = lseek(td, &ap);
/* Expand the quad return into two parts for eax and edx */
+#ifdef QUAD_SPLIT_REQUIRED
pos = *(off_t *)(td->td_retval);
td->td_retval[RETVAL_LO] = pos & 0xffffffff; /* %eax */
td->td_retval[RETVAL_HI] = pos >> 32; /* %edx */
+#endif
return error;
}
@@ -1511,16 +1519,20 @@ freebsd6_freebsd32_lseek(struct thread *
{
int error;
struct lseek_args ap;
+#ifdef QUAD_SPLIT_REQUIRED
off_t pos;
+#endif
ap.fd = uap->fd;
ap.offset = PAIR32TO64(off_t,uap->offset);
ap.whence = uap->whence;
error = lseek(td, &ap);
/* Expand the quad return into two parts for eax and edx */
+#ifdef QUAD_SPLIT_REQUIRED
pos = *(off_t *)(td->td_retval);
td->td_retval[RETVAL_LO] = pos & 0xffffffff; /* %eax */
td->td_retval[RETVAL_HI] = pos >> 32; /* %edx */
+#endif
return error;
}
Modified: user/jmallett/octeon/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- user/jmallett/octeon/sys/compat/freebsd32/freebsd32_proto.h Wed Apr 14 03:13:02 2010 (r206585)
+++ user/jmallett/octeon/sys/compat/freebsd32/freebsd32_proto.h Wed Apr 14 03:58:21 2010 (r206586)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 205325 2010-03-19 11:10:24Z kib
+ * created from FreeBSD: user/jmallett/octeon/sys/compat/freebsd32/syscalls.master 205510 2010-03-23 06:42:52Z jmallett
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -35,6 +35,9 @@ struct thread;
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
#endif
+#if !defined(QUAD_SPLIT_REQUIRED) && !defined(__mips__)
+#define QUAD_SPLIT_REQUIRED
+#endif
struct freebsd32_wait4_args {
char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
@@ -147,6 +150,9 @@ struct freebsd32_shmsys_args {
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)];
};
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
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 *)];
@@ -165,6 +171,12 @@ struct freebsd32_getdirentries_args {
char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)];
char basep_l_[PADL_(int32_t *)]; int32_t * basep; char basep_r_[PADR_(int32_t *)];
};
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
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)];
@@ -222,6 +234,7 @@ struct freebsd32_lutimes_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)];
};
+#ifdef QUAD_SPLIT_REQUIRED
struct freebsd32_preadv_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
@@ -236,6 +249,20 @@ struct freebsd32_pwritev_args {
char offset1_l_[PADL_(u_int32_t)]; u_int32_t offset1; char offset1_r_[PADR_(u_int32_t)];
char offset2_l_[PADL_(u_int32_t)]; u_int32_t offset2; char offset2_r_[PADR_(u_int32_t)];
};
+#else
+struct freebsd32_preadv_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
+ char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
+ char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
+};
+struct freebsd32_pwritev_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
+ char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
+ char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
+};
+#endif
struct freebsd32_modstat_args {
char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)];
char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)];
@@ -267,6 +294,9 @@ struct freebsd32_olio_listio_args {
char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)];
char sig_l_[PADL_(struct osigevent32 *)]; struct osigevent32 * sig; char sig_r_[PADR_(struct osigevent32 *)];
};
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
struct freebsd32_jail_args {
char jail_l_[PADL_(struct jail32 *)]; struct jail32 * jail; char jail_r_[PADR_(struct jail32 *)];
};
@@ -296,6 +326,7 @@ struct freebsd32_nmount_args {
char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)];
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
};
+#ifdef QUAD_SPLIT_REQUIRED
struct freebsd32_sendfile_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
@@ -306,6 +337,17 @@ struct freebsd32_sendfile_args {
char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)];
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
};
+#else
+struct freebsd32_sendfile_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
+ char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
+ char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
+ char hdtr_l_[PADL_(struct sf_hdtr32 *)]; struct sf_hdtr32 * hdtr; char hdtr_r_[PADR_(struct sf_hdtr32 *)];
+ char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)];
+ char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+};
+#endif
struct freebsd32_ksem_init_args {
char idp_l_[PADL_(semid_t *)]; semid_t * idp; char idp_r_[PADR_(semid_t *)];
char value_l_[PADL_(unsigned int)]; unsigned int value; char value_r_[PADR_(unsigned int)];
@@ -435,6 +477,7 @@ struct freebsd32_ftruncate_args {
char length2_l_[PADL_(u_int32_t)]; u_int32_t length2; char length2_r_[PADR_(u_int32_t)];
};
#else
+#ifdef QUAD_SPLIT_REQUIRED
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 *)];
@@ -474,6 +517,41 @@ struct freebsd32_ftruncate_args {
char length1_l_[PADL_(u_int32_t)]; u_int32_t length1; char length1_r_[PADR_(u_int32_t)];
char length2_l_[PADL_(u_int32_t)]; u_int32_t length2; char length2_r_[PADR_(u_int32_t)];
};
+#else
+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 offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_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 offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_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 pos_l_[PADL_(off_t)]; off_t pos; char pos_r_[PADR_(off_t)];
+};
+struct freebsd32_lseek_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_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 length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)];
+};
+struct freebsd32_ftruncate_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)];
+};
+#endif
#endif
#ifdef PAD64_REQUIRED
struct freebsd32_cpuset_setid_args {
@@ -484,13 +562,22 @@ struct freebsd32_cpuset_setid_args {
char setid_l_[PADL_(cpusetid_t)]; cpusetid_t setid; char setid_r_[PADR_(cpusetid_t)];
};
#else
+#ifdef QUAD_SPLIT_REQUIRED
struct freebsd32_cpuset_setid_args {
char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
char id1_l_[PADL_(u_int32_t)]; u_int32_t id1; char id1_r_[PADR_(u_int32_t)];
char id2_l_[PADL_(u_int32_t)]; u_int32_t id2; char id2_r_[PADR_(u_int32_t)];
char setid_l_[PADL_(cpusetid_t)]; cpusetid_t setid; char setid_r_[PADR_(cpusetid_t)];
};
+#else
+struct freebsd32_cpuset_setid_args {
+ char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
+ char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
+ char setid_l_[PADL_(cpusetid_t)]; cpusetid_t setid; char setid_r_[PADR_(cpusetid_t)];
+};
+#endif
#endif
+#ifdef QUAD_SPLIT_REQUIRED
struct freebsd32_cpuset_getid_args {
char level_l_[PADL_(cpulevel_t)]; cpulevel_t level; char level_r_[PADR_(cpulevel_t)];
char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
@@ -514,6 +601,28 @@ struct freebsd32_cpuset_setaffinity_args
char cpusetsize_l_[PADL_(size_t)]; size_t cpusetsize; char cpusetsize_r_[PADR_(size_t)];
char mask_l_[PADL_(const cpuset_t *)]; const cpuset_t * mask; char mask_r_[PADR_(const cpuset_t *)];
};
+#else
+struct freebsd32_cpuset_getid_args {
+ char level_l_[PADL_(cpulevel_t)]; cpulevel_t level; char level_r_[PADR_(cpulevel_t)];
+ char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
+ char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
+ char setid_l_[PADL_(cpusetid_t *)]; cpusetid_t * setid; char setid_r_[PADR_(cpusetid_t *)];
+};
+struct freebsd32_cpuset_getaffinity_args {
+ char level_l_[PADL_(cpulevel_t)]; cpulevel_t level; char level_r_[PADR_(cpulevel_t)];
+ char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
+ char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
+ char cpusetsize_l_[PADL_(size_t)]; size_t cpusetsize; char cpusetsize_r_[PADR_(size_t)];
+ char mask_l_[PADL_(cpuset_t *)]; cpuset_t * mask; char mask_r_[PADR_(cpuset_t *)];
+};
+struct freebsd32_cpuset_setaffinity_args {
+ char level_l_[PADL_(cpulevel_t)]; cpulevel_t level; char level_r_[PADR_(cpulevel_t)];
+ char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
+ char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
+ char cpusetsize_l_[PADL_(size_t)]; size_t cpusetsize; char cpusetsize_r_[PADR_(size_t)];
+ char mask_l_[PADL_(const cpuset_t *)]; const cpuset_t * mask; char mask_r_[PADR_(const cpuset_t *)];
+};
+#endif
struct freebsd32_fexecve_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)];
@@ -567,6 +676,9 @@ struct freebsd32_pselect_args {
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
#endif
+#if !defined(QUAD_SPLIT_REQUIRED) && !defined(__mips__)
+#define QUAD_SPLIT_REQUIRED
+#endif
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 *);
@@ -588,10 +700,19 @@ int freebsd32_sysarch(struct thread *, s
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 *);
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
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_getdirentries(struct thread *, struct freebsd32_getdirentries_args *);
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
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 *);
@@ -604,8 +725,13 @@ int freebsd32_aio_read(struct thread *,
int freebsd32_aio_write(struct thread *, struct freebsd32_aio_write_args *);
int freebsd32_lio_listio(struct thread *, struct freebsd32_lio_listio_args *);
int freebsd32_lutimes(struct thread *, struct freebsd32_lutimes_args *);
+#ifdef QUAD_SPLIT_REQUIRED
+int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *);
+int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *);
+#else
int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *);
int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *);
+#endif
int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *);
int freebsd32_aio_return(struct thread *, struct freebsd32_aio_return_args *);
int freebsd32_aio_suspend(struct thread *, struct freebsd32_aio_suspend_args *);
@@ -614,13 +740,20 @@ int freebsd32_aio_error(struct thread *,
int freebsd32_oaio_read(struct thread *, struct freebsd32_oaio_read_args *);
int freebsd32_oaio_write(struct thread *, struct freebsd32_oaio_write_args *);
int freebsd32_olio_listio(struct thread *, struct freebsd32_olio_listio_args *);
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
int freebsd32_jail(struct thread *, struct freebsd32_jail_args *);
int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *);
int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *);
int freebsd32_aio_waitcomplete(struct thread *, struct freebsd32_aio_waitcomplete_args *);
int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *);
int freebsd32_nmount(struct thread *, struct freebsd32_nmount_args *);
+#ifdef QUAD_SPLIT_REQUIRED
int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *);
+#else
+int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *);
+#endif
int freebsd32_ksem_init(struct thread *, struct freebsd32_ksem_init_args *);
int freebsd32_ksem_open(struct thread *, struct freebsd32_ksem_open_args *);
int freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *);
@@ -647,6 +780,14 @@ int freebsd32_lseek(struct thread *, str
int freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *);
int freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *);
#else
+#ifdef QUAD_SPLIT_REQUIRED
+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 *);
+#else
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 *);
@@ -654,14 +795,25 @@ int freebsd32_lseek(struct thread *, str
int freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *);
int freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *);
#endif
+#endif
#ifdef PAD64_REQUIRED
int freebsd32_cpuset_setid(struct thread *, struct freebsd32_cpuset_setid_args *);
#else
+#ifdef QUAD_SPLIT_REQUIRED
+int freebsd32_cpuset_setid(struct thread *, struct freebsd32_cpuset_setid_args *);
+#else
int freebsd32_cpuset_setid(struct thread *, struct freebsd32_cpuset_setid_args *);
#endif
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+int freebsd32_cpuset_getid(struct thread *, struct freebsd32_cpuset_getid_args *);
+int freebsd32_cpuset_getaffinity(struct thread *, struct freebsd32_cpuset_getaffinity_args *);
+int freebsd32_cpuset_setaffinity(struct thread *, struct freebsd32_cpuset_setaffinity_args *);
+#else
int freebsd32_cpuset_getid(struct thread *, struct freebsd32_cpuset_getid_args *);
int freebsd32_cpuset_getaffinity(struct thread *, struct freebsd32_cpuset_getaffinity_args *);
int freebsd32_cpuset_setaffinity(struct thread *, struct freebsd32_cpuset_setaffinity_args *);
+#endif
int freebsd32_fexecve(struct thread *, struct freebsd32_fexecve_args *);
int freebsd32_fstatat(struct thread *, struct freebsd32_fstatat_args *);
int freebsd32_futimesat(struct thread *, struct freebsd32_futimesat_args *);
@@ -677,6 +829,9 @@ int freebsd32_pselect(struct thread *, s
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
#endif
+#if !defined(QUAD_SPLIT_REQUIRED) && !defined(__mips__)
+#define QUAD_SPLIT_REQUIRED
+#endif
struct ofreebsd32_sigaction_args {
char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
char nsa_l_[PADL_(struct osigaction32 *)]; struct osigaction32 * nsa; char nsa_r_[PADR_(struct osigaction32 *)];
@@ -704,11 +859,38 @@ struct ofreebsd32_sigstack_args {
char nss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * nss; char nss_r_[PADR_(struct sigstack32 *)];
char oss_l_[PADL_(struct sigstack32 *)]; struct sigstack32 * oss; char oss_r_[PADR_(struct sigstack32 *)];
};
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
#ifdef PAD64_REQUIRED
#else
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
#endif
#ifdef PAD64_REQUIRED
#else
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
#endif
int ofreebsd32_sigaction(struct thread *, struct ofreebsd32_sigaction_args *);
int ofreebsd32_sigprocmask(struct thread *, struct ofreebsd32_sigprocmask_args *);
@@ -727,6 +909,9 @@ int ofreebsd32_sigstack(struct thread *,
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
#endif
+#if !defined(QUAD_SPLIT_REQUIRED) && !defined(__mips__)
+#define QUAD_SPLIT_REQUIRED
+#endif
struct freebsd4_freebsd32_getfsstat_args {
char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)];
char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)];
@@ -740,10 +925,23 @@ struct freebsd4_freebsd32_fstatfs_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)];
};
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
struct freebsd4_freebsd32_fhstatfs_args {
char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)];
};
+#ifdef QUAD_SPLIT_REQUIRED
struct freebsd4_freebsd32_sendfile_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
@@ -754,6 +952,17 @@ struct freebsd4_freebsd32_sendfile_args
char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)];
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
};
+#else
+struct freebsd4_freebsd32_sendfile_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
+ char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
+ char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
+ char hdtr_l_[PADL_(struct sf_hdtr32 *)]; struct sf_hdtr32 * hdtr; char hdtr_r_[PADR_(struct sf_hdtr32 *)];
+ char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)];
+ char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+};
+#endif
struct freebsd4_freebsd32_sigaction_args {
char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)];
char act_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * act; char act_r_[PADR_(struct sigaction32 *)];
@@ -762,17 +971,30 @@ struct freebsd4_freebsd32_sigaction_args
struct freebsd4_freebsd32_sigreturn_args {
char sigcntxp_l_[PADL_(const struct freebsd4_freebsd32_ucontext *)]; const struct freebsd4_freebsd32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct freebsd4_freebsd32_ucontext *)];
};
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
#ifdef PAD64_REQUIRED
#else
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
#endif
#ifdef PAD64_REQUIRED
#else
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
#endif
int freebsd4_freebsd32_getfsstat(struct thread *, struct freebsd4_freebsd32_getfsstat_args *);
int freebsd4_freebsd32_statfs(struct thread *, struct freebsd4_freebsd32_statfs_args *);
int freebsd4_freebsd32_fstatfs(struct thread *, struct freebsd4_freebsd32_fstatfs_args *);
int freebsd4_freebsd32_fhstatfs(struct thread *, struct freebsd4_freebsd32_fhstatfs_args *);
int freebsd4_freebsd32_sendfile(struct thread *, struct freebsd4_freebsd32_sendfile_args *);
+int freebsd4_freebsd32_sendfile(struct thread *, struct freebsd4_freebsd32_sendfile_args *);
int freebsd4_freebsd32_sigaction(struct thread *, struct freebsd4_freebsd32_sigaction_args *);
int freebsd4_freebsd32_sigreturn(struct thread *, struct freebsd4_freebsd32_sigreturn_args *);
@@ -784,6 +1006,10 @@ int freebsd4_freebsd32_sigreturn(struct
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
#endif
+#if !defined(QUAD_SPLIT_REQUIRED) && !defined(__mips__)
+#define QUAD_SPLIT_REQUIRED
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
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 *)];
@@ -800,6 +1026,23 @@ struct freebsd6_freebsd32_pwrite_args {
char offset1_l_[PADL_(u_int32_t)]; u_int32_t offset1; char offset1_r_[PADR_(u_int32_t)];
char offset2_l_[PADL_(u_int32_t)]; u_int32_t offset2; char offset2_r_[PADR_(u_int32_t)];
};
+#else
+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 offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_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 offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
+};
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
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)];
@@ -810,6 +1053,18 @@ struct freebsd6_freebsd32_mmap_args {
char pos1_l_[PADL_(u_int32_t)]; u_int32_t pos1; char pos1_r_[PADR_(u_int32_t)];
char pos2_l_[PADL_(u_int32_t)]; u_int32_t pos2; char pos2_r_[PADR_(u_int32_t)];
};
+#else
+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 pos_l_[PADL_(off_t)]; off_t pos; char pos_r_[PADR_(off_t)];
+};
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
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)];
@@ -829,15 +1084,57 @@ struct freebsd6_freebsd32_ftruncate_args
char length1_l_[PADL_(u_int32_t)]; u_int32_t length1; char length1_r_[PADR_(u_int32_t)];
char length2_l_[PADL_(u_int32_t)]; u_int32_t length2; char length2_r_[PADR_(u_int32_t)];
};
+#else
+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 offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_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 length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_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 length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)];
+};
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
#ifdef PAD64_REQUIRED
#else
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
#endif
#ifdef PAD64_REQUIRED
#else
+#ifdef QUAD_SPLIT_REQUIRED
+#else
#endif
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+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_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_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 *);
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 *);
@@ -850,6 +1147,18 @@ int freebsd6_freebsd32_ftruncate(struct
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
#endif
+#if !defined(QUAD_SPLIT_REQUIRED) && !defined(__mips__)
+#define QUAD_SPLIT_REQUIRED
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
struct freebsd7_freebsd32_semctl_args {
char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)];
char semnum_l_[PADL_(int)]; int semnum; char semnum_r_[PADR_(int)];
@@ -866,11 +1175,29 @@ struct freebsd7_freebsd32_shmctl_args {
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
char buf_l_[PADL_(struct shmid_ds32_old *)]; struct shmid_ds32_old * buf; char buf_r_[PADR_(struct shmid_ds32_old *)];
};
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
#ifdef PAD64_REQUIRED
#else
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
#endif
#ifdef PAD64_REQUIRED
#else
+#ifdef QUAD_SPLIT_REQUIRED
+#else
+#endif
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
+#else
#endif
int freebsd7_freebsd32_semctl(struct thread *, struct freebsd7_freebsd32_semctl_args *);
int freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *);
@@ -912,11 +1239,17 @@ int freebsd7_freebsd32_shmctl(struct thr
#define FREEBSD32_SYS_AUE_freebsd32_shmsys AUE_SHMSYS
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_pread AUE_PREAD
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_pwrite AUE_PWRITE
+#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_pread AUE_PREAD
+#define FREEBSD32_SYS_AUE_freebsd6_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_getdirentries AUE_GETDIRENTRIES
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_mmap AUE_MMAP
+#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_mmap AUE_MMAP
+#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_lseek AUE_LSEEK
+#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_truncate AUE_TRUNCATE
+#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_ftruncate AUE_FTRUNCATE
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_lseek AUE_LSEEK
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_truncate AUE_TRUNCATE
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_ftruncate AUE_FTRUNCATE
@@ -937,6 +1270,8 @@ int freebsd7_freebsd32_shmctl(struct thr
#define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES
#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV
+#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
+#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV
#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_fhstatfs AUE_FHSTATFS
#define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_aio_return AUE_NULL
@@ -947,6 +1282,7 @@ int freebsd7_freebsd32_shmctl(struct thr
#define FREEBSD32_SYS_AUE_freebsd32_oaio_write AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_olio_listio AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_sendfile AUE_SENDFILE
+#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_sendfile AUE_SENDFILE
#define FREEBSD32_SYS_AUE_freebsd32_jail AUE_JAIL
#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_sigaction AUE_SIGACTION
#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_sigreturn AUE_SIGRETURN
@@ -956,6 +1292,7 @@ int freebsd7_freebsd32_shmctl(struct thr
#define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_nmount AUE_NMOUNT
#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE
+#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE
#define FREEBSD32_SYS_AUE_freebsd32_ksem_init AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_ksem_open AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION
@@ -986,8 +1323,18 @@ int freebsd7_freebsd32_shmctl(struct thr
#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_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
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_setid AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_setid AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_cpuset_setid AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_cpuset_getid AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_cpuset_getaffinity AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_cpuset_setaffinity AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_getid AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_getaffinity AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_setaffinity AUE_NULL
Modified: user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscall.h Wed Apr 14 03:13:02 2010 (r206585)
+++ user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscall.h Wed Apr 14 03:58:21 2010 (r206586)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 205325 2010-03-19 11:10:24Z kib
+ * created from FreeBSD: user/jmallett/octeon/sys/compat/freebsd32/syscalls.master 205510 2010-03-23 06:42:52Z jmallett
*/
#define FREEBSD32_SYS_syscall 0
@@ -166,6 +166,8 @@
#define FREEBSD32_SYS_freebsd32_shmsys 171
#define FREEBSD32_SYS_freebsd6_freebsd32_pread 173
#define FREEBSD32_SYS_freebsd6_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
@@ -179,10 +181,14 @@
#define FREEBSD32_SYS_setrlimit 195
#define FREEBSD32_SYS_freebsd32_getdirentries 196
#define FREEBSD32_SYS_freebsd6_freebsd32_mmap 197
+#define FREEBSD32_SYS_freebsd6_freebsd32_mmap 197
#define FREEBSD32_SYS___syscall 198
#define FREEBSD32_SYS_freebsd6_freebsd32_lseek 199
#define FREEBSD32_SYS_freebsd6_freebsd32_truncate 200
#define FREEBSD32_SYS_freebsd6_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
@@ -223,6 +229,8 @@
#define FREEBSD32_SYS_nlstat 280
#define FREEBSD32_SYS_freebsd32_preadv 289
#define FREEBSD32_SYS_freebsd32_pwritev 290
+#define FREEBSD32_SYS_freebsd32_preadv 289
+#define FREEBSD32_SYS_freebsd32_pwritev 290
#define FREEBSD32_SYS_freebsd4_freebsd32_fhstatfs 297
#define FREEBSD32_SYS_fhopen 298
#define FREEBSD32_SYS_fhstat 299
@@ -263,6 +271,7 @@
#define FREEBSD32_SYS_sched_rr_get_interval 334
#define FREEBSD32_SYS_utrace 335
#define FREEBSD32_SYS_freebsd4_freebsd32_sendfile 336
+#define FREEBSD32_SYS_freebsd4_freebsd32_sendfile 336
#define FREEBSD32_SYS_kldsym 337
#define FREEBSD32_SYS_freebsd32_jail 338
#define FREEBSD32_SYS_sigprocmask 340
@@ -299,6 +308,7 @@
#define FREEBSD32_SYS_lchflags 391
#define FREEBSD32_SYS_uuidgen 392
#define FREEBSD32_SYS_freebsd32_sendfile 393
+#define FREEBSD32_SYS_freebsd32_sendfile 393
#define FREEBSD32_SYS_getfsstat 395
#define FREEBSD32_SYS_statfs 396
#define FREEBSD32_SYS_fstatfs 397
@@ -376,12 +386,22 @@
#define FREEBSD32_SYS_freebsd32_lseek 478
#define FREEBSD32_SYS_freebsd32_truncate 479
#define FREEBSD32_SYS_freebsd32_ftruncate 480
+#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_thr_kill2 481
#define FREEBSD32_SYS_shm_open 482
#define FREEBSD32_SYS_shm_unlink 483
#define FREEBSD32_SYS_cpuset 484
#define FREEBSD32_SYS_freebsd32_cpuset_setid 485
#define FREEBSD32_SYS_freebsd32_cpuset_setid 485
+#define FREEBSD32_SYS_freebsd32_cpuset_setid 485
+#define FREEBSD32_SYS_freebsd32_cpuset_getid 486
+#define FREEBSD32_SYS_freebsd32_cpuset_getaffinity 487
+#define FREEBSD32_SYS_freebsd32_cpuset_setaffinity 488
#define FREEBSD32_SYS_freebsd32_cpuset_getid 486
#define FREEBSD32_SYS_freebsd32_cpuset_getaffinity 487
#define FREEBSD32_SYS_freebsd32_cpuset_setaffinity 488
Modified: user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscalls.c Wed Apr 14 03:13:02 2010 (r206585)
+++ user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscalls.c Wed Apr 14 03:58:21 2010 (r206586)
@@ -3,13 +3,16 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 205325 2010-03-19 11:10:24Z kib
+ * created from FreeBSD: user/jmallett/octeon/sys/compat/freebsd32/syscalls.master 205510 2010-03-23 06:42:52Z jmallett
*/
const char *freebsd32_syscallnames[] = {
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
#endif
+#if !defined(QUAD_SPLIT_REQUIRED) && !defined(__mips__)
+#define QUAD_SPLIT_REQUIRED
+#endif
"syscall", /* 0 = syscall */
"exit", /* 1 = exit */
"fork", /* 2 = fork */
@@ -183,8 +186,13 @@ const char *freebsd32_syscallnames[] = {
"freebsd32_msgsys", /* 170 = freebsd32_msgsys */
"freebsd32_shmsys", /* 171 = freebsd32_shmsys */
"#172", /* 172 = nosys */
+#ifdef QUAD_SPLIT_REQUIRED
"compat6.freebsd32_pread", /* 173 = freebsd6 freebsd32_pread */
"compat6.freebsd32_pwrite", /* 174 = freebsd6 freebsd32_pwrite */
+#else
+ "compat6.freebsd32_pread", /* 173 = freebsd6 freebsd32_pread */
+ "compat6.freebsd32_pwrite", /* 174 = freebsd6 freebsd32_pwrite */
+#endif
"#175", /* 175 = nosys */
"ntp_adjtime", /* 176 = ntp_adjtime */
"#177", /* 177 = sfork */
@@ -207,11 +215,21 @@ const char *freebsd32_syscallnames[] = {
"getrlimit", /* 194 = getrlimit */
"setrlimit", /* 195 = setrlimit */
"freebsd32_getdirentries", /* 196 = freebsd32_getdirentries */
+#ifdef QUAD_SPLIT_REQUIRED
"compat6.freebsd32_mmap", /* 197 = freebsd6 freebsd32_mmap */
+#else
+ "compat6.freebsd32_mmap", /* 197 = freebsd6 freebsd32_mmap */
+#endif
"__syscall", /* 198 = __syscall */
+#ifdef QUAD_SPLIT_REQUIRED
+ "compat6.freebsd32_lseek", /* 199 = freebsd6 freebsd32_lseek */
+ "compat6.freebsd32_truncate", /* 200 = freebsd6 freebsd32_truncate */
+ "compat6.freebsd32_ftruncate", /* 201 = freebsd6 freebsd32_ftruncate */
+#else
"compat6.freebsd32_lseek", /* 199 = freebsd6 freebsd32_lseek */
"compat6.freebsd32_truncate", /* 200 = freebsd6 freebsd32_truncate */
"compat6.freebsd32_ftruncate", /* 201 = freebsd6 freebsd32_ftruncate */
+#endif
"freebsd32_sysctl", /* 202 = freebsd32_sysctl */
"mlock", /* 203 = mlock */
"munlock", /* 204 = munlock */
@@ -299,8 +317,13 @@ const char *freebsd32_syscallnames[] = {
"#286", /* 286 = nosys */
"#287", /* 287 = nosys */
"#288", /* 288 = nosys */
+#ifdef QUAD_SPLIT_REQUIRED
+ "freebsd32_preadv", /* 289 = freebsd32_preadv */
+ "freebsd32_pwritev", /* 290 = freebsd32_pwritev */
+#else
"freebsd32_preadv", /* 289 = freebsd32_preadv */
"freebsd32_pwritev", /* 290 = freebsd32_pwritev */
+#endif
"#291", /* 291 = nosys */
"#292", /* 292 = nosys */
"#293", /* 293 = nosys */
@@ -346,7 +369,11 @@ const char *freebsd32_syscallnames[] = {
"sched_get_priority_min", /* 333 = sched_get_priority_min */
"sched_rr_get_interval", /* 334 = sched_rr_get_interval */
"utrace", /* 335 = utrace */
+#ifdef QUAD_SPLIT_REQUIRED
"compat4.freebsd32_sendfile", /* 336 = freebsd4 freebsd32_sendfile */
+#else
+ "compat4.freebsd32_sendfile", /* 336 = freebsd4 freebsd32_sendfile */
+#endif
"kldsym", /* 337 = kldsym */
"freebsd32_jail", /* 338 = freebsd32_jail */
"#339", /* 339 = pioctl */
@@ -403,7 +430,11 @@ const char *freebsd32_syscallnames[] = {
"kenv", /* 390 = kenv */
"lchflags", /* 391 = lchflags */
"uuidgen", /* 392 = uuidgen */
+#ifdef QUAD_SPLIT_REQUIRED
"freebsd32_sendfile", /* 393 = freebsd32_sendfile */
+#else
+ "freebsd32_sendfile", /* 393 = freebsd32_sendfile */
+#endif
"#394", /* 394 = mac_syscall */
"getfsstat", /* 395 = getfsstat */
"statfs", /* 396 = statfs */
@@ -493,6 +524,14 @@ const char *freebsd32_syscallnames[] = {
"freebsd32_truncate", /* 479 = freebsd32_truncate */
"freebsd32_ftruncate", /* 480 = freebsd32_ftruncate */
#else
+#ifdef QUAD_SPLIT_REQUIRED
+ "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 */
+#else
"freebsd32_pread", /* 475 = freebsd32_pread */
"freebsd32_pwrite", /* 476 = freebsd32_pwrite */
"freebsd32_mmap", /* 477 = freebsd32_mmap */
@@ -500,6 +539,7 @@ const char *freebsd32_syscallnames[] = {
"freebsd32_truncate", /* 479 = freebsd32_truncate */
"freebsd32_ftruncate", /* 480 = freebsd32_ftruncate */
#endif
+#endif
"thr_kill2", /* 481 = thr_kill2 */
"shm_open", /* 482 = shm_open */
"shm_unlink", /* 483 = shm_unlink */
@@ -507,11 +547,21 @@ const char *freebsd32_syscallnames[] = {
#ifdef PAD64_REQUIRED
"freebsd32_cpuset_setid", /* 485 = freebsd32_cpuset_setid */
#else
+#ifdef QUAD_SPLIT_REQUIRED
+ "freebsd32_cpuset_setid", /* 485 = freebsd32_cpuset_setid */
+#else
"freebsd32_cpuset_setid", /* 485 = freebsd32_cpuset_setid */
#endif
+#endif
+#ifdef QUAD_SPLIT_REQUIRED
"freebsd32_cpuset_getid", /* 486 = freebsd32_cpuset_getid */
"freebsd32_cpuset_getaffinity", /* 487 = freebsd32_cpuset_getaffinity */
"freebsd32_cpuset_setaffinity", /* 488 = freebsd32_cpuset_setaffinity */
+#else
+ "freebsd32_cpuset_getid", /* 486 = freebsd32_cpuset_getid */
+ "freebsd32_cpuset_getaffinity", /* 487 = freebsd32_cpuset_getaffinity */
+ "freebsd32_cpuset_setaffinity", /* 488 = freebsd32_cpuset_setaffinity */
+#endif
"faccessat", /* 489 = faccessat */
"fchmodat", /* 490 = fchmodat */
"fchownat", /* 491 = fchownat */
Modified: user/jmallett/octeon/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- user/jmallett/octeon/sys/compat/freebsd32/freebsd32_sysent.c Wed Apr 14 03:13:02 2010 (r206585)
+++ user/jmallett/octeon/sys/compat/freebsd32/freebsd32_sysent.c Wed Apr 14 03:58:21 2010 (r206586)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 205325 2010-03-19 11:10:24Z kib
+ * created from FreeBSD: user/jmallett/octeon/sys/compat/freebsd32/syscalls.master 205510 2010-03-23 06:42:52Z jmallett
*/
#include "opt_compat.h"
@@ -47,6 +47,9 @@ struct sysent freebsd32_sysent[] = {
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
#endif
+#if !defined(QUAD_SPLIT_REQUIRED) && !defined(__mips__)
+#define QUAD_SPLIT_REQUIRED
+#endif
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = syscall */
{ AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, 0 }, /* 1 = exit */
{ 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, 0 }, /* 2 = fork */
@@ -220,8 +223,13 @@ struct sysent freebsd32_sysent[] = {
{ AS(freebsd32_msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 170 = freebsd32_msgsys */
{ AS(freebsd32_shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 171 = freebsd32_shmsys */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 172 = nosys */
+#ifdef QUAD_SPLIT_REQUIRED
{ compat6(AS(freebsd6_freebsd32_pread_args),freebsd32_pread), AUE_PREAD, NULL, 0, 0, 0 }, /* 173 = freebsd6 freebsd32_pread */
{ compat6(AS(freebsd6_freebsd32_pwrite_args),freebsd32_pwrite), AUE_PWRITE, NULL, 0, 0, 0 }, /* 174 = freebsd6 freebsd32_pwrite */
+#else
+ { compat6(AS(freebsd6_freebsd32_pread_args),freebsd32_pread), AUE_PREAD, NULL, 0, 0, 0 }, /* 173 = freebsd6 freebsd32_pread */
+ { compat6(AS(freebsd6_freebsd32_pwrite_args),freebsd32_pwrite), AUE_PWRITE, NULL, 0, 0, 0 }, /* 174 = freebsd6 freebsd32_pwrite */
+#endif
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 175 = nosys */
{ AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0, 0 }, /* 176 = ntp_adjtime */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 177 = sfork */
@@ -244,11 +252,21 @@ struct sysent freebsd32_sysent[] = {
{ AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 194 = getrlimit */
{ AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, 0 }, /* 195 = setrlimit */
{ AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 196 = freebsd32_getdirentries */
+#ifdef QUAD_SPLIT_REQUIRED
{ compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0, 0 }, /* 197 = freebsd6 freebsd32_mmap */
+#else
+ { compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0, 0 }, /* 197 = freebsd6 freebsd32_mmap */
+#endif
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list