From owner-svn-soc-all@FreeBSD.ORG Fri Jun 17 22:31:01 2011 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id EAF45106564A for ; Fri, 17 Jun 2011 22:30:58 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Fri, 17 Jun 2011 22:30:58 +0000 Date: Fri, 17 Jun 2011 22:30:58 +0000 From: gk@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20110617223058.EAF45106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r223374 - in soc2011/gk/ino64-head/sys: compat/freebsd32 kern sys X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2011 22:31:01 -0000 Author: gk Date: Fri Jun 17 22:30:58 2011 New Revision: 223374 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223374 Log: Regen Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_proto.h soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c soc2011/gk/ino64-head/sys/kern/init_sysent.c soc2011/gk/ino64-head/sys/kern/syscalls.c soc2011/gk/ino64-head/sys/kern/systrace_args.c soc2011/gk/ino64-head/sys/sys/syscall.h soc2011/gk/ino64-head/sys/sys/syscall.mk soc2011/gk/ino64-head/sys/sys/sysproto.h Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_proto.h Fri Jun 17 22:30:42 2011 (r223373) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_proto.h Fri Jun 17 22:30:58 2011 (r223374) @@ -147,24 +147,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_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 *)]; -}; -struct freebsd32_fstat_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; -}; -struct freebsd32_lstat_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 *)]; -}; -struct freebsd32_getdirentries_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; - 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 *)]; -}; 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)]; @@ -523,12 +505,6 @@ char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)]; char envv_l_[PADL_(u_int32_t *)]; u_int32_t * envv; char envv_r_[PADR_(u_int32_t *)]; }; -struct freebsd32_fstatat_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char buf_l_[PADL_(struct stat *)]; struct stat * buf; char buf_r_[PADR_(struct stat *)]; - char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; -}; struct freebsd32_futimesat_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; @@ -575,6 +551,34 @@ char lenlo_l_[PADL_(uint32_t)]; uint32_t lenlo; char lenlo_r_[PADR_(uint32_t)]; char lenhi_l_[PADL_(uint32_t)]; uint32_t lenhi; char lenhi_r_[PADR_(uint32_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 *)]; +}; +struct freebsd32_fstat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; +}; +struct freebsd32_lstat_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 *)]; +}; +struct freebsd32_fhstat_args { + char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; + char sb_l_[PADL_(struct stat32 *)]; struct stat32 * sb; char sb_r_[PADR_(struct stat32 *)]; +}; +struct freebsd32_fstatat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct stat32 *)]; struct stat32 * buf; char buf_r_[PADR_(struct stat32 *)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; +}; +struct freebsd32_getdirentries_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + 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 *)]; +}; #if !defined(PAD64_REQUIRED) && defined(__powerpc__) #define PAD64_REQUIRED #endif @@ -599,10 +603,6 @@ 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_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 *); 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 *); @@ -675,7 +675,6 @@ int freebsd32_cpuset_getaffinity(struct thread *, struct freebsd32_cpuset_getaffinity_args *); int freebsd32_cpuset_setaffinity(struct thread *, struct freebsd32_cpuset_setaffinity_args *); 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 *); int freebsd32_jail_get(struct thread *, struct freebsd32_jail_get_args *); int freebsd32_jail_set(struct thread *, struct freebsd32_jail_set_args *); @@ -684,6 +683,12 @@ int freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *); int freebsd32_pselect(struct thread *, struct freebsd32_pselect_args *); int freebsd32_posix_fallocate(struct thread *, struct freebsd32_posix_fallocate_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_fhstat(struct thread *, struct freebsd32_fhstat_args *); +int freebsd32_fstatat(struct thread *, struct freebsd32_fstatat_args *); +int freebsd32_getdirentries(struct thread *, struct freebsd32_getdirentries_args *); #ifdef COMPAT_43 @@ -927,12 +932,52 @@ #if !defined(PAD64_REQUIRED) && defined(__powerpc__) #define PAD64_REQUIRED #endif +struct freebsd8_freebsd32_stat_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char ub_l_[PADL_(struct freebsd8_stat32 *)]; struct freebsd8_stat32 * ub; char ub_r_[PADR_(struct freebsd8_stat32 *)]; +}; +struct freebsd8_freebsd32_fstat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char ub_l_[PADL_(struct freebsd8_stat32 *)]; struct freebsd8_stat32 * ub; char ub_r_[PADR_(struct freebsd8_stat32 *)]; +}; +struct freebsd8_freebsd32_lstat_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char ub_l_[PADL_(struct freebsd8_stat32 *)]; struct freebsd8_stat32 * ub; char ub_r_[PADR_(struct freebsd8_stat32 *)]; +}; +struct freebsd8_freebsd32_getdirentries_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + 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 *)]; +}; +struct freebsd8_freebsd32_getdents_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char count_l_[PADL_(size_t)]; size_t count; char count_r_[PADR_(size_t)]; +}; +struct freebsd8_freebsd32_fhstat_args { + char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; + char sb_l_[PADL_(struct freebsd8_stat32 *)]; struct freebsd8_stat32 * sb; char sb_r_[PADR_(struct freebsd8_stat32 *)]; +}; #ifdef PAD64_REQUIRED #else #endif #ifdef PAD64_REQUIRED #else #endif +struct freebsd8_freebsd32_fstatat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct freebsd8_stat32 *)]; struct freebsd8_stat32 * buf; char buf_r_[PADR_(struct freebsd8_stat32 *)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; +}; +int freebsd8_freebsd32_stat(struct thread *, struct freebsd8_freebsd32_stat_args *); +int freebsd8_freebsd32_fstat(struct thread *, struct freebsd8_freebsd32_fstat_args *); +int freebsd8_freebsd32_lstat(struct thread *, struct freebsd8_freebsd32_lstat_args *); +int freebsd8_freebsd32_getdirentries(struct thread *, struct freebsd8_freebsd32_getdirentries_args *); +int freebsd8_freebsd32_getdents(struct thread *, struct freebsd8_freebsd32_getdents_args *); +int freebsd8_freebsd32_fhstat(struct thread *, struct freebsd8_freebsd32_fhstat_args *); +int freebsd8_freebsd32_fstatat(struct thread *, struct freebsd8_freebsd32_fstatat_args *); #endif /* COMPAT_FREEBSD8 */ @@ -976,10 +1021,10 @@ #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_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_freebsd8_freebsd32_stat AUE_STAT +#define FREEBSD32_SYS_AUE_freebsd8_freebsd32_fstat AUE_FSTAT +#define FREEBSD32_SYS_AUE_freebsd8_freebsd32_lstat AUE_LSTAT +#define FREEBSD32_SYS_AUE_freebsd8_freebsd32_getdirentries AUE_GETDIRENTRIES #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 @@ -998,10 +1043,12 @@ #define FREEBSD32_SYS_AUE_freebsd32_aio_read AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_aio_write AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_lio_listio AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd8_freebsd32_getdents AUE_O_GETDENTS #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_freebsd4_freebsd32_fhstatfs AUE_FHSTATFS +#define FREEBSD32_SYS_AUE_freebsd8_freebsd32_fhstat AUE_FHSTAT #define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kldstat AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_aio_return AUE_NULL @@ -1057,7 +1104,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_cpuset_getaffinity AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_cpuset_setaffinity AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_fexecve AUE_FEXECVE -#define FREEBSD32_SYS_AUE_freebsd32_fstatat AUE_FSTATAT +#define FREEBSD32_SYS_AUE_freebsd8_freebsd32_fstatat AUE_FSTATAT #define FREEBSD32_SYS_AUE_freebsd32_futimesat AUE_FUTIMESAT #define FREEBSD32_SYS_AUE_freebsd32_jail_get AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_jail_set AUE_NULL @@ -1066,6 +1113,12 @@ #define FREEBSD32_SYS_AUE_freebsd32_shmctl AUE_SHMCTL #define FREEBSD32_SYS_AUE_freebsd32_pselect AUE_SELECT #define FREEBSD32_SYS_AUE_freebsd32_posix_fallocate AUE_NULL +#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_fhstat AUE_FHSTAT +#define FREEBSD32_SYS_AUE_freebsd32_fstatat AUE_FSTATAT +#define FREEBSD32_SYS_AUE_freebsd32_getdirentries AUE_GETDIRENTRIES #undef PAD_ #undef PADL_ Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h Fri Jun 17 22:30:42 2011 (r223373) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h Fri Jun 17 22:30:58 2011 (r223374) @@ -172,14 +172,14 @@ #define FREEBSD32_SYS_setgid 181 #define FREEBSD32_SYS_setegid 182 #define FREEBSD32_SYS_seteuid 183 -#define FREEBSD32_SYS_freebsd32_stat 188 -#define FREEBSD32_SYS_freebsd32_fstat 189 -#define FREEBSD32_SYS_freebsd32_lstat 190 +#define FREEBSD32_SYS_freebsd8_freebsd32_stat 188 +#define FREEBSD32_SYS_freebsd8_freebsd32_fstat 189 +#define FREEBSD32_SYS_freebsd8_freebsd32_lstat 190 #define FREEBSD32_SYS_pathconf 191 #define FREEBSD32_SYS_fpathconf 192 #define FREEBSD32_SYS_getrlimit 194 #define FREEBSD32_SYS_setrlimit 195 -#define FREEBSD32_SYS_freebsd32_getdirentries 196 +#define FREEBSD32_SYS_freebsd8_freebsd32_getdirentries 196 #define FREEBSD32_SYS_freebsd6_freebsd32_mmap 197 #define FREEBSD32_SYS___syscall 198 #define FREEBSD32_SYS_freebsd6_freebsd32_lseek 199 @@ -215,7 +215,7 @@ #define FREEBSD32_SYS_freebsd32_aio_read 255 #define FREEBSD32_SYS_freebsd32_aio_write 256 #define FREEBSD32_SYS_freebsd32_lio_listio 257 -#define FREEBSD32_SYS_getdents 272 +#define FREEBSD32_SYS_freebsd8_freebsd32_getdents 272 #define FREEBSD32_SYS_lchmod 274 #define FREEBSD32_SYS_netbsd_lchown 275 #define FREEBSD32_SYS_freebsd32_lutimes 276 @@ -227,7 +227,7 @@ #define FREEBSD32_SYS_freebsd32_pwritev 290 #define FREEBSD32_SYS_freebsd4_freebsd32_fhstatfs 297 #define FREEBSD32_SYS_fhopen 298 -#define FREEBSD32_SYS_fhstat 299 +#define FREEBSD32_SYS_freebsd8_freebsd32_fhstat 299 #define FREEBSD32_SYS_modnext 300 #define FREEBSD32_SYS_freebsd32_modstat 301 #define FREEBSD32_SYS_modfnext 302 @@ -391,7 +391,7 @@ #define FREEBSD32_SYS_fchmodat 490 #define FREEBSD32_SYS_fchownat 491 #define FREEBSD32_SYS_freebsd32_fexecve 492 -#define FREEBSD32_SYS_freebsd32_fstatat 493 +#define FREEBSD32_SYS_freebsd8_freebsd32_fstatat 493 #define FREEBSD32_SYS_freebsd32_futimesat 494 #define FREEBSD32_SYS_linkat 495 #define FREEBSD32_SYS_mkdirat 496 @@ -422,4 +422,11 @@ #define FREEBSD32_SYS_rctl_add_rule 528 #define FREEBSD32_SYS_rctl_remove_rule 529 #define FREEBSD32_SYS_freebsd32_posix_fallocate 530 -#define FREEBSD32_SYS_MAXSYSCALL 532 +#define FREEBSD32_SYS_freebsd32_stat 532 +#define FREEBSD32_SYS_freebsd32_fstat 533 +#define FREEBSD32_SYS_freebsd32_lstat 534 +#define FREEBSD32_SYS_freebsd32_fhstat 535 +#define FREEBSD32_SYS_freebsd32_fstatat 536 +#define FREEBSD32_SYS_getdents 537 +#define FREEBSD32_SYS_freebsd32_getdirentries 538 +#define FREEBSD32_SYS_MAXSYSCALL 539 Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Jun 17 22:30:42 2011 (r223373) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Jun 17 22:30:58 2011 (r223374) @@ -198,15 +198,15 @@ "#185", /* 185 = lfs_markv */ "#186", /* 186 = lfs_segclean */ "#187", /* 187 = lfs_segwait */ - "freebsd32_stat", /* 188 = freebsd32_stat */ - "freebsd32_fstat", /* 189 = freebsd32_fstat */ - "freebsd32_lstat", /* 190 = freebsd32_lstat */ + "compat8.freebsd32_stat", /* 188 = freebsd8 freebsd32_stat */ + "compat8.freebsd32_fstat", /* 189 = freebsd8 freebsd32_fstat */ + "compat8.freebsd32_lstat", /* 190 = freebsd8 freebsd32_lstat */ "pathconf", /* 191 = pathconf */ "fpathconf", /* 192 = fpathconf */ "#193", /* 193 = nosys */ "getrlimit", /* 194 = getrlimit */ "setrlimit", /* 195 = setrlimit */ - "freebsd32_getdirentries", /* 196 = freebsd32_getdirentries */ + "compat8.freebsd32_getdirentries", /* 196 = freebsd8 freebsd32_getdirentries */ "compat6.freebsd32_mmap", /* 197 = freebsd6 freebsd32_mmap */ "__syscall", /* 198 = __syscall */ "compat6.freebsd32_lseek", /* 199 = freebsd6 freebsd32_lseek */ @@ -282,7 +282,7 @@ "#269", /* 269 = nosys */ "#270", /* 270 = nosys */ "#271", /* 271 = nosys */ - "getdents", /* 272 = getdents */ + "compat8.freebsd32_getdents", /* 272 = freebsd8 freebsd32_getdents */ "#273", /* 273 = nosys */ "lchmod", /* 274 = lchmod */ "netbsd_lchown", /* 275 = netbsd_lchown */ @@ -309,7 +309,7 @@ "#296", /* 296 = nosys */ "compat4.freebsd32_fhstatfs", /* 297 = freebsd4 freebsd32_fhstatfs */ "fhopen", /* 298 = fhopen */ - "fhstat", /* 299 = fhstat */ + "compat8.freebsd32_fhstat", /* 299 = freebsd8 freebsd32_fhstat */ "modnext", /* 300 = modnext */ "freebsd32_modstat", /* 301 = freebsd32_modstat */ "modfnext", /* 302 = modfnext */ @@ -516,7 +516,7 @@ "fchmodat", /* 490 = fchmodat */ "fchownat", /* 491 = fchownat */ "freebsd32_fexecve", /* 492 = freebsd32_fexecve */ - "freebsd32_fstatat", /* 493 = freebsd32_fstatat */ + "compat8.freebsd32_fstatat", /* 493 = freebsd8 freebsd32_fstatat */ "freebsd32_futimesat", /* 494 = freebsd32_futimesat */ "linkat", /* 495 = linkat */ "mkdirat", /* 496 = mkdirat */ @@ -555,4 +555,11 @@ "rctl_remove_rule", /* 529 = rctl_remove_rule */ "freebsd32_posix_fallocate", /* 530 = freebsd32_posix_fallocate */ "#531", /* 531 = posix_fadvise */ + "freebsd32_stat", /* 532 = freebsd32_stat */ + "freebsd32_fstat", /* 533 = freebsd32_fstat */ + "freebsd32_lstat", /* 534 = freebsd32_lstat */ + "freebsd32_fhstat", /* 535 = freebsd32_fhstat */ + "freebsd32_fstatat", /* 536 = freebsd32_fstatat */ + "getdents", /* 537 = getdents */ + "freebsd32_getdirentries", /* 538 = freebsd32_getdirentries */ }; Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c Fri Jun 17 22:30:42 2011 (r223373) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c Fri Jun 17 22:30:58 2011 (r223374) @@ -42,6 +42,12 @@ #define compat7(n, name) 0, (sy_call_t *)nosys #endif +#ifdef COMPAT_FREEBSD8 +#define compat8(n, name) n, (sy_call_t *)__CONCAT(freebsd8_,name) +#else +#define compat8(n, name) 0, (sy_call_t *)nosys +#endif + /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { #if !defined(PAD64_REQUIRED) && defined(__powerpc__) @@ -235,15 +241,15 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 185 = lfs_markv */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 186 = lfs_segclean */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 187 = lfs_segwait */ - { AS(freebsd32_stat_args), (sy_call_t *)freebsd32_stat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 188 = freebsd32_stat */ - { AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 189 = freebsd32_fstat */ - { AS(freebsd32_lstat_args), (sy_call_t *)freebsd32_lstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 190 = freebsd32_lstat */ + { compat8(AS(freebsd8_freebsd32_stat_args),freebsd32_stat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 188 = freebsd8 freebsd32_stat */ + { compat8(AS(freebsd8_freebsd32_fstat_args),freebsd32_fstat), AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 189 = freebsd8 freebsd32_fstat */ + { compat8(AS(freebsd8_freebsd32_lstat_args),freebsd32_lstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 190 = freebsd8 freebsd32_lstat */ { AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0, 0, SY_THR_STATIC }, /* 191 = pathconf */ { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, 0, SY_THR_STATIC }, /* 192 = fpathconf */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 193 = nosys */ { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 194 = getrlimit */ { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 195 = setrlimit */ - { AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 196 = freebsd32_getdirentries */ + { compat8(AS(freebsd8_freebsd32_getdirentries_args),freebsd32_getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 196 = freebsd8 freebsd32_getdirentries */ { compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0, 0, SY_THR_STATIC }, /* 197 = freebsd6 freebsd32_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 198 = __syscall */ { compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0, 0, SY_THR_STATIC }, /* 199 = freebsd6 freebsd32_lseek */ @@ -319,7 +325,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 269 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 270 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 271 = nosys */ - { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = getdents */ + { compat8(AS(freebsd8_freebsd32_getdents_args),freebsd32_getdents), AUE_O_GETDENTS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = freebsd8 freebsd32_getdents */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 273 = nosys */ { AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 274 = lchmod */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 275 = netbsd_lchown */ @@ -346,7 +352,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 296 = nosys */ { compat4(AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs), AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 297 = freebsd4 freebsd32_fhstatfs */ { AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 298 = fhopen */ - { AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 299 = fhstat */ + { compat8(AS(freebsd8_freebsd32_fhstat_args),freebsd32_fhstat), AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 299 = freebsd8 freebsd32_fhstat */ { AS(modnext_args), (sy_call_t *)modnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 300 = modnext */ { AS(freebsd32_modstat_args), (sy_call_t *)freebsd32_modstat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 301 = freebsd32_modstat */ { AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 302 = modfnext */ @@ -553,7 +559,7 @@ { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 490 = fchmodat */ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 491 = fchownat */ { AS(freebsd32_fexecve_args), (sy_call_t *)freebsd32_fexecve, AUE_FEXECVE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 492 = freebsd32_fexecve */ - { AS(freebsd32_fstatat_args), (sy_call_t *)freebsd32_fstatat, AUE_FSTATAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 493 = freebsd32_fstatat */ + { compat8(AS(freebsd8_freebsd32_fstatat_args),freebsd32_fstatat), AUE_FSTATAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 493 = freebsd8 freebsd32_fstatat */ { AS(freebsd32_futimesat_args), (sy_call_t *)freebsd32_futimesat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 494 = freebsd32_futimesat */ { AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 495 = linkat */ { AS(mkdirat_args), (sy_call_t *)mkdirat, AUE_MKDIRAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 496 = mkdirat */ @@ -592,4 +598,11 @@ { AS(rctl_remove_rule_args), (sy_call_t *)rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 529 = rctl_remove_rule */ { AS(freebsd32_posix_fallocate_args), (sy_call_t *)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = freebsd32_posix_fallocate */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 531 = posix_fadvise */ + { AS(freebsd32_stat_args), (sy_call_t *)freebsd32_stat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 532 = freebsd32_stat */ + { AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 533 = freebsd32_fstat */ + { AS(freebsd32_lstat_args), (sy_call_t *)freebsd32_lstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 534 = freebsd32_lstat */ + { AS(freebsd32_fhstat_args), (sy_call_t *)freebsd32_fhstat, AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 535 = freebsd32_fhstat */ + { AS(freebsd32_fstatat_args), (sy_call_t *)freebsd32_fstatat, AUE_FSTATAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 536 = freebsd32_fstatat */ + { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 537 = getdents */ + { AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 538 = freebsd32_getdirentries */ }; Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Jun 17 22:30:42 2011 (r223373) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Jun 17 22:30:58 2011 (r223374) @@ -919,30 +919,6 @@ *n_args = 1; break; } - /* freebsd32_stat */ - case 188: { - struct freebsd32_stat_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->ub; /* struct stat32 * */ - *n_args = 2; - break; - } - /* freebsd32_fstat */ - case 189: { - struct freebsd32_fstat_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->ub; /* struct stat32 * */ - *n_args = 2; - break; - } - /* freebsd32_lstat */ - case 190: { - struct freebsd32_lstat_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->ub; /* struct stat32 * */ - *n_args = 2; - break; - } /* pathconf */ case 191: { struct pathconf_args *p = params; @@ -975,16 +951,6 @@ *n_args = 2; break; } - /* freebsd32_getdirentries */ - case 196: { - struct freebsd32_getdirentries_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->buf; /* char * */ - uarg[2] = p->count; /* u_int */ - uarg[3] = (intptr_t) p->basep; /* int32_t * */ - *n_args = 4; - break; - } /* nosys */ case 198: { *n_args = 0; @@ -1266,15 +1232,6 @@ *n_args = 4; break; } - /* getdents */ - case 272: { - struct getdents_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->buf; /* char * */ - uarg[2] = p->count; /* size_t */ - *n_args = 3; - break; - } /* lchmod */ case 274: { struct lchmod_args *p = params; @@ -1339,14 +1296,6 @@ *n_args = 2; break; } - /* fhstat */ - case 299: { - struct fhstat_args *p = params; - uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */ - uarg[1] = (intptr_t) p->sb; /* struct stat * */ - *n_args = 2; - break; - } /* modnext */ case 300: { struct modnext_args *p = params; @@ -2713,16 +2662,6 @@ *n_args = 3; break; } - /* freebsd32_fstatat */ - case 493: { - struct freebsd32_fstatat_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ - uarg[2] = (intptr_t) p->buf; /* struct stat * */ - iarg[3] = p->flag; /* int */ - *n_args = 4; - break; - } /* freebsd32_futimesat */ case 494: { struct freebsd32_futimesat_args *p = params; @@ -2994,6 +2933,67 @@ *n_args = 5; break; } + /* freebsd32_stat */ + case 532: { + struct freebsd32_stat_args *p = params; + uarg[0] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->ub; /* struct stat32 * */ + *n_args = 2; + break; + } + /* freebsd32_fstat */ + case 533: { + struct freebsd32_fstat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->ub; /* struct stat32 * */ + *n_args = 2; + break; + } + /* freebsd32_lstat */ + case 534: { + struct freebsd32_lstat_args *p = params; + uarg[0] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->ub; /* struct stat32 * */ + *n_args = 2; + break; + } + /* freebsd32_fhstat */ + case 535: { + struct freebsd32_fhstat_args *p = params; + uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */ + uarg[1] = (intptr_t) p->sb; /* struct stat32 * */ + *n_args = 2; + break; + } + /* freebsd32_fstatat */ + case 536: { + struct freebsd32_fstatat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + uarg[2] = (intptr_t) p->buf; /* struct stat32 * */ + iarg[3] = p->flag; /* int */ + *n_args = 4; + break; + } + /* getdents */ + case 537: { + struct getdents_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->buf; /* char * */ + uarg[2] = p->count; /* size_t */ + *n_args = 3; + break; + } + /* freebsd32_getdirentries */ + case 538: { + struct freebsd32_getdirentries_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->buf; /* char * */ + uarg[2] = p->count; /* u_int */ + uarg[3] = (intptr_t) p->basep; /* int32_t * */ + *n_args = 4; + break; + } default: *n_args = 0; break; @@ -4465,45 +4465,6 @@ break; }; break; - /* freebsd32_stat */ - case 188: - switch(ndx) { - case 0: - p = "char *"; - break; - case 1: - p = "struct stat32 *"; - break; - default: - break; - }; - break; - /* freebsd32_fstat */ - case 189: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "struct stat32 *"; - break; - default: - break; - }; - break; - /* freebsd32_lstat */ - case 190: - switch(ndx) { - case 0: - p = "char *"; - break; - case 1: - p = "struct stat32 *"; - break; - default: - break; - }; - break; /* pathconf */ case 191: switch(ndx) { @@ -4556,25 +4517,6 @@ break; }; break; - /* freebsd32_getdirentries */ - case 196: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "char *"; - break; - case 2: - p = "u_int"; - break; - case 3: - p = "int32_t *"; - break; - default: - break; - }; - break; /* nosys */ case 198: break; @@ -4988,22 +4930,6 @@ break; }; break; - /* getdents */ - case 272: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "char *"; - break; - case 2: - p = "size_t"; - break; - default: - break; - }; - break; /* lchmod */ case 274: switch(ndx) { @@ -5119,19 +5045,6 @@ break; }; break; - /* fhstat */ - case 299: - switch(ndx) { - case 0: - p = "const struct fhandle *"; - break; - case 1: - p = "struct stat *"; - break; - default: - break; - }; - break; /* modnext */ case 300: switch(ndx) { @@ -7487,25 +7400,6 @@ break; }; break; - /* freebsd32_fstatat */ - case 493: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "char *"; - break; - case 2: - p = "struct stat *"; - break; - case 3: - p = "int"; - break; - default: - break; - }; - break; /* freebsd32_futimesat */ case 494: switch(ndx) { @@ -7988,6 +7882,112 @@ break; }; break; + /* freebsd32_stat */ + case 532: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "struct stat32 *"; + break; + default: + break; + }; + break; + /* freebsd32_fstat */ + case 533: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "struct stat32 *"; + break; + default: + break; + }; + break; + /* freebsd32_lstat */ + case 534: + switch(ndx) { + case 0: + p = "char *"; + break; + case 1: + p = "struct stat32 *"; + break; + default: + break; + }; + break; + /* freebsd32_fhstat */ + case 535: + switch(ndx) { + case 0: + p = "const struct fhandle *"; + break; + case 1: + p = "struct stat32 *"; + break; + default: + break; + }; + break; + /* freebsd32_fstatat */ + case 536: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "char *"; + break; + case 2: + p = "struct stat32 *"; + break; + case 3: + p = "int"; + break; + default: + break; + }; + break; + /* getdents */ + case 537: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "char *"; + break; + case 2: + p = "size_t"; + break; + default: + break; + }; + break; + /* freebsd32_getdirentries */ + case 538: + switch(ndx) { + case 0: + p = "int"; + break; + case 1: + p = "char *"; + break; + case 2: + p = "u_int"; + break; + case 3: + p = "int32_t *"; + break; + default: + break; + }; + break; default: break; }; Modified: soc2011/gk/ino64-head/sys/kern/init_sysent.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/init_sysent.c Fri Jun 17 22:30:42 2011 (r223373) +++ soc2011/gk/ino64-head/sys/kern/init_sysent.c Fri Jun 17 22:30:58 2011 (r223374) @@ -228,15 +228,15 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 185 = lfs_markv */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 186 = lfs_segclean */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 187 = lfs_segwait */ - { AS(stat_args), (sy_call_t *)stat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 188 = stat */ - { AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 189 = fstat */ - { AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 190 = lstat */ + { compat8(AS(freebsd8_stat_args),stat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 188 = freebsd8 stat */ + { compat8(AS(freebsd8_fstat_args),fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 189 = freebsd8 fstat */ + { compat8(AS(freebsd8_lstat_args),lstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 190 = freebsd8 lstat */ { AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0, 0, SY_THR_STATIC }, /* 191 = pathconf */ { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 192 = fpathconf */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 193 = nosys */ { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 194 = getrlimit */ { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 195 = setrlimit */ - { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 196 = getdirentries */ + { compat8(AS(freebsd8_getdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 196 = freebsd8 getdirentries */ { AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 197 = freebsd6_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 198 = __syscall */ { AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 199 = freebsd6_lseek */ @@ -312,7 +312,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 269 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 270 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 271 = nosys */ - { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 272 = getdents */ + { compat8(AS(freebsd8_getdents_args),getdents), AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 272 = freebsd8 getdents */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 273 = nosys */ { AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 274 = lchmod */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 275 = netbsd_lchown */ @@ -339,7 +339,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 296 = nosys */ { compat4(AS(freebsd4_fhstatfs_args),fhstatfs), AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 297 = freebsd4 fhstatfs */ { AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 298 = fhopen */ - { AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 299 = fhstat */ + { compat8(AS(freebsd8_fhstat_args),fhstat), AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 299 = freebsd8 fhstat */ { AS(modnext_args), (sy_call_t *)modnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 300 = modnext */ { AS(modstat_args), (sy_call_t *)modstat, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 301 = modstat */ { AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 302 = modfnext */ @@ -533,7 +533,7 @@ { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 490 = fchmodat */ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 491 = fchownat */ { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 492 = fexecve */ - { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 493 = fstatat */ + { compat8(AS(freebsd8_fstatat_args),fstatat), AUE_FSTATAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 493 = freebsd8 fstatat */ { AS(futimesat_args), (sy_call_t *)futimesat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 494 = futimesat */ { AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 495 = linkat */ { AS(mkdirat_args), (sy_call_t *)mkdirat, AUE_MKDIRAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 496 = mkdirat */ @@ -572,4 +572,11 @@ { AS(rctl_remove_rule_args), (sy_call_t *)rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 529 = rctl_remove_rule */ { AS(posix_fallocate_args), (sy_call_t *)posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = posix_fallocate */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 531 = posix_fadvise */ + { AS(stat_args), (sy_call_t *)stat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 532 = stat */ + { AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 533 = fstat */ + { AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 534 = lstat */ + { AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 535 = fhstat */ + { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 536 = fstatat */ + { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 537 = getdents */ + { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 538 = getdirentries */ }; Modified: soc2011/gk/ino64-head/sys/kern/syscalls.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/syscalls.c Fri Jun 17 22:30:42 2011 (r223373) +++ soc2011/gk/ino64-head/sys/kern/syscalls.c Fri Jun 17 22:30:58 2011 (r223374) @@ -195,15 +195,15 @@ "#185", /* 185 = lfs_markv */ "#186", /* 186 = lfs_segclean */ "#187", /* 187 = lfs_segwait */ - "stat", /* 188 = stat */ - "fstat", /* 189 = fstat */ - "lstat", /* 190 = lstat */ + "compat8.stat", /* 188 = freebsd8 stat */ + "compat8.fstat", /* 189 = freebsd8 fstat */ + "compat8.lstat", /* 190 = freebsd8 lstat */ "pathconf", /* 191 = pathconf */ "fpathconf", /* 192 = fpathconf */ "#193", /* 193 = nosys */ "getrlimit", /* 194 = getrlimit */ "setrlimit", /* 195 = setrlimit */ - "getdirentries", /* 196 = getdirentries */ + "compat8.getdirentries", /* 196 = freebsd8 getdirentries */ "freebsd6_mmap", /* 197 = freebsd6_mmap */ "__syscall", /* 198 = __syscall */ "freebsd6_lseek", /* 199 = freebsd6_lseek */ @@ -279,7 +279,7 @@ "#269", /* 269 = nosys */ "#270", /* 270 = nosys */ "#271", /* 271 = nosys */ - "getdents", /* 272 = getdents */ + "compat8.getdents", /* 272 = freebsd8 getdents */ "#273", /* 273 = nosys */ "lchmod", /* 274 = lchmod */ "netbsd_lchown", /* 275 = netbsd_lchown */ @@ -306,7 +306,7 @@ "#296", /* 296 = nosys */ "compat4.fhstatfs", /* 297 = freebsd4 fhstatfs */ "fhopen", /* 298 = fhopen */ - "fhstat", /* 299 = fhstat */ + "compat8.fhstat", /* 299 = freebsd8 fhstat */ "modnext", /* 300 = modnext */ "modstat", /* 301 = modstat */ "modfnext", /* 302 = modfnext */ @@ -500,7 +500,7 @@ "fchmodat", /* 490 = fchmodat */ "fchownat", /* 491 = fchownat */ "fexecve", /* 492 = fexecve */ - "fstatat", /* 493 = fstatat */ + "compat8.fstatat", /* 493 = freebsd8 fstatat */ "futimesat", /* 494 = futimesat */ "linkat", /* 495 = linkat */ "mkdirat", /* 496 = mkdirat */ @@ -539,4 +539,11 @@ "rctl_remove_rule", /* 529 = rctl_remove_rule */ "posix_fallocate", /* 530 = posix_fallocate */ "#531", /* 531 = posix_fadvise */ + "stat", /* 532 = stat */ + "fstat", /* 533 = fstat */ + "lstat", /* 534 = lstat */ + "fhstat", /* 535 = fhstat */ + "fstatat", /* 536 = fstatat */ + "getdents", /* 537 = getdents */ + "getdirentries", /* 538 = getdirentries */ }; Modified: soc2011/gk/ino64-head/sys/kern/systrace_args.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/systrace_args.c Fri Jun 17 22:30:42 2011 (r223373) +++ soc2011/gk/ino64-head/sys/kern/systrace_args.c Fri Jun 17 22:30:58 2011 (r223374) @@ -971,30 +971,6 @@ *n_args = 1; break; } - /* stat */ - case 188: { - struct stat_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->ub; /* struct stat * */ - *n_args = 2; - break; - } - /* fstat */ - case 189: { - struct fstat_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->sb; /* struct stat * */ - *n_args = 2; - break; - } - /* lstat */ - case 190: { - struct lstat_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->ub; /* struct stat * */ - *n_args = 2; - break; - } /* pathconf */ case 191: { struct pathconf_args *p = params; @@ -1027,16 +1003,6 @@ *n_args = 2; break; } - /* getdirentries */ - case 196: { - struct getdirentries_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->buf; /* char * */ - uarg[2] = p->count; /* u_int */ - uarg[3] = (intptr_t) p->basep; /* long * */ - *n_args = 4; - break; - } /* freebsd6_mmap */ case 197: { struct freebsd6_mmap_args *p = params; @@ -1407,15 +1373,6 @@ *n_args = 4; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***