Date: Fri, 10 Jun 2011 20:56:09 +0000 From: gk@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r223089 - in soc2011/gk/ino64-head/sys: compat/freebsd32 kern sys Message-ID: <20110610205609.2975C1065680@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gk Date: Fri Jun 10 20:56:08 2011 New Revision: 223089 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223089 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 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_proto.h Fri Jun 10 20:56:08 2011 (r223089) @@ -921,6 +921,21 @@ #endif /* COMPAT_FREEBSD7 */ + +#ifdef COMPAT_FREEBSD8 + +#if !defined(PAD64_REQUIRED) && defined(__powerpc__) +#define PAD64_REQUIRED +#endif +#ifdef PAD64_REQUIRED +#else +#endif +#ifdef PAD64_REQUIRED +#else +#endif + +#endif /* COMPAT_FREEBSD8 */ + #define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4 #define FREEBSD32_SYS_AUE_freebsd4_freebsd32_getfsstat AUE_GETFSSTAT #define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h Fri Jun 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscall.h Fri Jun 10 20:56:08 2011 (r223089) @@ -220,9 +220,9 @@ #define FREEBSD32_SYS_netbsd_lchown 275 #define FREEBSD32_SYS_freebsd32_lutimes 276 #define FREEBSD32_SYS_netbsd_msync 277 -#define FREEBSD32_SYS_nstat 278 -#define FREEBSD32_SYS_nfstat 279 -#define FREEBSD32_SYS_nlstat 280 + /* 278 is obsolete nstat */ + /* 279 is obsolete nfstat */ + /* 280 is obsolete nlstat */ #define FREEBSD32_SYS_freebsd32_preadv 289 #define FREEBSD32_SYS_freebsd32_pwritev 290 #define FREEBSD32_SYS_freebsd4_freebsd32_fhstatfs 297 Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Jun 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_syscalls.c Fri Jun 10 20:56:08 2011 (r223089) @@ -288,9 +288,9 @@ "netbsd_lchown", /* 275 = netbsd_lchown */ "freebsd32_lutimes", /* 276 = freebsd32_lutimes */ "netbsd_msync", /* 277 = netbsd_msync */ - "nstat", /* 278 = nstat */ - "nfstat", /* 279 = nfstat */ - "nlstat", /* 280 = nlstat */ + "obs_nstat", /* 278 = obsolete nstat */ + "obs_nfstat", /* 279 = obsolete nfstat */ + "obs_nlstat", /* 280 = obsolete nlstat */ "#281", /* 281 = nosys */ "#282", /* 282 = nosys */ "#283", /* 283 = nosys */ Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c ============================================================================== --- soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c Fri Jun 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_sysent.c Fri Jun 10 20:56:08 2011 (r223089) @@ -325,9 +325,9 @@ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 275 = netbsd_lchown */ { AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes, AUE_LUTIMES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 276 = freebsd32_lutimes */ { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0, SY_THR_STATIC }, /* 277 = netbsd_msync */ - { AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 278 = nstat */ - { AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 279 = nfstat */ - { AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 280 = nlstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 278 = obsolete nstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 279 = obsolete nfstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 280 = obsolete nlstat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 281 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 282 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 283 = nosys */ 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 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri Jun 10 20:56:08 2011 (r223089) @@ -1309,30 +1309,6 @@ *n_args = 3; break; } - /* nstat */ - case 278: { - struct nstat_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->ub; /* struct nstat * */ - *n_args = 2; - break; - } - /* nfstat */ - case 279: { - struct nfstat_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->sb; /* struct nstat * */ - *n_args = 2; - break; - } - /* nlstat */ - case 280: { - struct nlstat_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->ub; /* struct nstat * */ - *n_args = 2; - break; - } /* freebsd32_preadv */ case 289: { struct freebsd32_preadv_args *p = params; @@ -5086,45 +5062,6 @@ break; }; break; - /* nstat */ - case 278: - switch(ndx) { - case 0: - p = "char *"; - break; - case 1: - p = "struct nstat *"; - break; - default: - break; - }; - break; - /* nfstat */ - case 279: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "struct nstat *"; - break; - default: - break; - }; - break; - /* nlstat */ - case 280: - switch(ndx) { - case 0: - p = "char *"; - break; - case 1: - p = "struct nstat *"; - break; - default: - break; - }; - break; /* freebsd32_preadv */ case 289: switch(ndx) { Modified: soc2011/gk/ino64-head/sys/kern/init_sysent.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/init_sysent.c Fri Jun 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/kern/init_sysent.c Fri Jun 10 20:56:08 2011 (r223089) @@ -32,6 +32,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 sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 0 = syscall */ @@ -312,9 +318,9 @@ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0, SY_THR_STATIC }, /* 275 = netbsd_lchown */ { AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 276 = lutimes */ { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 277 = netbsd_msync */ - { AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 278 = nstat */ - { AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 279 = nfstat */ - { AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 280 = nlstat */ + { compat8(AS(freebsd8_nstat_args),nstat), AUE_STAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 278 = freebsd8 nstat */ + { compat8(AS(freebsd8_nfstat_args),nfstat), AUE_FSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 279 = freebsd8 nfstat */ + { compat8(AS(freebsd8_nlstat_args),nlstat), AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 280 = freebsd8 nlstat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 281 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 282 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 283 = nosys */ Modified: soc2011/gk/ino64-head/sys/kern/syscalls.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/syscalls.c Fri Jun 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/kern/syscalls.c Fri Jun 10 20:56:08 2011 (r223089) @@ -285,9 +285,9 @@ "netbsd_lchown", /* 275 = netbsd_lchown */ "lutimes", /* 276 = lutimes */ "netbsd_msync", /* 277 = netbsd_msync */ - "nstat", /* 278 = nstat */ - "nfstat", /* 279 = nfstat */ - "nlstat", /* 280 = nlstat */ + "compat8.nstat", /* 278 = freebsd8 nstat */ + "compat8.nfstat", /* 279 = freebsd8 nfstat */ + "compat8.nlstat", /* 280 = freebsd8 nlstat */ "#281", /* 281 = nosys */ "#282", /* 282 = nosys */ "#283", /* 283 = nosys */ Modified: soc2011/gk/ino64-head/sys/kern/systrace_args.c ============================================================================== --- soc2011/gk/ino64-head/sys/kern/systrace_args.c Fri Jun 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/kern/systrace_args.c Fri Jun 10 20:56:08 2011 (r223089) @@ -1450,30 +1450,6 @@ *n_args = 3; break; } - /* nstat */ - case 278: { - struct nstat_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->ub; /* struct nstat * */ - *n_args = 2; - break; - } - /* nfstat */ - case 279: { - struct nfstat_args *p = params; - iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->sb; /* struct nstat * */ - *n_args = 2; - break; - } - /* nlstat */ - case 280: { - struct nlstat_args *p = params; - uarg[0] = (intptr_t) p->path; /* char * */ - uarg[1] = (intptr_t) p->ub; /* struct nstat * */ - *n_args = 2; - break; - } /* preadv */ case 289: { struct preadv_args *p = params; @@ -5515,45 +5491,6 @@ break; }; break; - /* nstat */ - case 278: - switch(ndx) { - case 0: - p = "char *"; - break; - case 1: - p = "struct nstat *"; - break; - default: - break; - }; - break; - /* nfstat */ - case 279: - switch(ndx) { - case 0: - p = "int"; - break; - case 1: - p = "struct nstat *"; - break; - default: - break; - }; - break; - /* nlstat */ - case 280: - switch(ndx) { - case 0: - p = "char *"; - break; - case 1: - p = "struct nstat *"; - break; - default: - break; - }; - break; /* preadv */ case 289: switch(ndx) { Modified: soc2011/gk/ino64-head/sys/sys/syscall.h ============================================================================== --- soc2011/gk/ino64-head/sys/sys/syscall.h Fri Jun 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/sys/syscall.h Fri Jun 10 20:56:08 2011 (r223089) @@ -230,9 +230,9 @@ #define SYS_netbsd_lchown 275 #define SYS_lutimes 276 #define SYS_netbsd_msync 277 -#define SYS_nstat 278 -#define SYS_nfstat 279 -#define SYS_nlstat 280 +#define SYS_freebsd8_nstat 278 +#define SYS_freebsd8_nfstat 279 +#define SYS_freebsd8_nlstat 280 #define SYS_preadv 289 #define SYS_pwritev 290 #define SYS_freebsd4_fhstatfs 297 Modified: soc2011/gk/ino64-head/sys/sys/syscall.mk ============================================================================== --- soc2011/gk/ino64-head/sys/sys/syscall.mk Fri Jun 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/sys/syscall.mk Fri Jun 10 20:56:08 2011 (r223089) @@ -182,9 +182,9 @@ netbsd_lchown.o \ lutimes.o \ netbsd_msync.o \ - nstat.o \ - nfstat.o \ - nlstat.o \ + freebsd8_nstat.o \ + freebsd8_nfstat.o \ + freebsd8_nlstat.o \ preadv.o \ pwritev.o \ freebsd4_fhstatfs.o \ Modified: soc2011/gk/ino64-head/sys/sys/sysproto.h ============================================================================== --- soc2011/gk/ino64-head/sys/sys/sysproto.h Fri Jun 10 20:55:53 2011 (r223088) +++ soc2011/gk/ino64-head/sys/sys/sysproto.h Fri Jun 10 20:56:08 2011 (r223089) @@ -775,18 +775,6 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char tptr_l_[PADL_(struct timeval *)]; struct timeval * tptr; char tptr_r_[PADR_(struct timeval *)]; }; -struct nstat_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)]; -}; -struct nfstat_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char sb_l_[PADL_(struct nstat *)]; struct nstat * sb; char sb_r_[PADR_(struct nstat *)]; -}; -struct nlstat_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)]; -}; struct preadv_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)]; @@ -1880,9 +1868,6 @@ int getdents(struct thread *, struct getdents_args *); int lchmod(struct thread *, struct lchmod_args *); int lutimes(struct thread *, struct lutimes_args *); -int nstat(struct thread *, struct nstat_args *); -int nfstat(struct thread *, struct nfstat_args *); -int nlstat(struct thread *, struct nlstat_args *); int preadv(struct thread *, struct preadv_args *); int pwritev(struct thread *, struct pwritev_args *); int fhopen(struct thread *, struct fhopen_args *); @@ -2348,6 +2333,27 @@ #endif /* COMPAT_FREEBSD7 */ + +#ifdef COMPAT_FREEBSD8 + +struct freebsd8_nstat_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)]; +}; +struct freebsd8_nfstat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char sb_l_[PADL_(struct nstat *)]; struct nstat * sb; char sb_r_[PADR_(struct nstat *)]; +}; +struct freebsd8_nlstat_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)]; +}; +int freebsd8_nstat(struct thread *, struct freebsd8_nstat_args *); +int freebsd8_nfstat(struct thread *, struct freebsd8_nfstat_args *); +int freebsd8_nlstat(struct thread *, struct freebsd8_nlstat_args *); + +#endif /* COMPAT_FREEBSD8 */ + #define SYS_AUE_syscall AUE_NULL #define SYS_AUE_exit AUE_EXIT #define SYS_AUE_fork AUE_FORK @@ -2561,9 +2567,9 @@ #define SYS_AUE_getdents AUE_O_GETDENTS #define SYS_AUE_lchmod AUE_LCHMOD #define SYS_AUE_lutimes AUE_LUTIMES -#define SYS_AUE_nstat AUE_STAT -#define SYS_AUE_nfstat AUE_FSTAT -#define SYS_AUE_nlstat AUE_LSTAT +#define SYS_AUE_freebsd8_nstat AUE_STAT +#define SYS_AUE_freebsd8_nfstat AUE_FSTAT +#define SYS_AUE_freebsd8_nlstat AUE_LSTAT #define SYS_AUE_preadv AUE_PREADV #define SYS_AUE_pwritev AUE_PWRITEV #define SYS_AUE_freebsd4_fhstatfs AUE_FHSTATFS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110610205609.2975C1065680>