[Midnightbsd-cvs] src [9445] trunk/sys: regen
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 5 14:27:43 EST 2017
Revision: 9445
http://svnweb.midnightbsd.org/src/?rev=9445
Author: laffer1
Date: 2017-03-05 14:27:42 -0500 (Sun, 05 Mar 2017)
Log Message:
-----------
regen
Modified Paths:
--------------
trunk/sys/compat/freebsd32/freebsd32_proto.h
trunk/sys/compat/freebsd32/freebsd32_syscall.h
trunk/sys/compat/freebsd32/freebsd32_syscalls.c
trunk/sys/compat/freebsd32/freebsd32_sysent.c
trunk/sys/compat/freebsd32/freebsd32_systrace_args.c
trunk/sys/kern/systrace_args.c
trunk/sys/sys/sysproto.h
Modified: trunk/sys/compat/freebsd32/freebsd32_proto.h
===================================================================
--- trunk/sys/compat/freebsd32/freebsd32_proto.h 2017-03-05 19:26:07 UTC (rev 9444)
+++ trunk/sys/compat/freebsd32/freebsd32_proto.h 2017-03-05 19:27:42 UTC (rev 9445)
@@ -573,8 +573,10 @@
char ts_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * ts; char ts_r_[PADR_(const struct timespec32 *)];
char sm_l_[PADL_(const sigset_t *)]; const sigset_t * sm; char sm_r_[PADR_(const sigset_t *)];
};
+#ifdef PAD64_REQUIRED
struct freebsd32_posix_fallocate_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 offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)];
char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)];
char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)];
@@ -582,6 +584,7 @@
};
struct freebsd32_posix_fadvise_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 offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)];
char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)];
char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)];
@@ -590,12 +593,40 @@
};
struct freebsd32_wait6_args {
char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
- char id_l_[PADL_(int)]; int id; char id_r_[PADR_(int)];
+ char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
+ char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)];
+ char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)];
char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
char wrusage_l_[PADL_(struct wrusage32 *)]; struct wrusage32 * wrusage; char wrusage_r_[PADR_(struct wrusage32 *)];
char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
};
+#else
+struct freebsd32_posix_fallocate_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)];
+ char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)];
+ char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)];
+ char len2_l_[PADL_(uint32_t)]; uint32_t len2; char len2_r_[PADR_(uint32_t)];
+};
+struct freebsd32_posix_fadvise_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char offset1_r_[PADR_(uint32_t)];
+ char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char offset2_r_[PADR_(uint32_t)];
+ char len1_l_[PADL_(uint32_t)]; uint32_t len1; char len1_r_[PADR_(uint32_t)];
+ char len2_l_[PADL_(uint32_t)]; uint32_t len2; char len2_r_[PADR_(uint32_t)];
+ char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
+};
+struct freebsd32_wait6_args {
+ char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
+ char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)];
+ char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)];
+ char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
+ char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
+ char wrusage_l_[PADL_(struct wrusage32 *)]; struct wrusage32 * wrusage; char wrusage_r_[PADR_(struct wrusage32 *)];
+ char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
+};
+#endif
#if !defined(PAD64_REQUIRED) && defined(__powerpc__)
#define PAD64_REQUIRED
#endif
@@ -705,9 +736,15 @@
int freebsd32_msgctl(struct thread *, struct freebsd32_msgctl_args *);
int freebsd32_shmctl(struct thread *, struct freebsd32_shmctl_args *);
int freebsd32_pselect(struct thread *, struct freebsd32_pselect_args *);
+#ifdef PAD64_REQUIRED
int freebsd32_posix_fallocate(struct thread *, struct freebsd32_posix_fallocate_args *);
int freebsd32_posix_fadvise(struct thread *, struct freebsd32_posix_fadvise_args *);
int freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *);
+#else
+int freebsd32_posix_fallocate(struct thread *, struct freebsd32_posix_fallocate_args *);
+int freebsd32_posix_fadvise(struct thread *, struct freebsd32_posix_fadvise_args *);
+int freebsd32_wait6(struct thread *, struct freebsd32_wait6_args *);
+#endif
#ifdef COMPAT_43
@@ -776,6 +813,9 @@
#ifdef PAD64_REQUIRED
#else
#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
int ofreebsd32_lseek(struct thread *, struct ofreebsd32_lseek_args *);
int ofreebsd32_stat(struct thread *, struct ofreebsd32_stat_args *);
int ofreebsd32_lstat(struct thread *, struct ofreebsd32_lstat_args *);
@@ -841,6 +881,9 @@
#ifdef PAD64_REQUIRED
#else
#endif
+#ifdef PAD64_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 *);
@@ -908,6 +951,9 @@
#ifdef PAD64_REQUIRED
#else
#endif
+#ifdef PAD64_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_mmap(struct thread *, struct freebsd6_freebsd32_mmap_args *);
@@ -945,6 +991,9 @@
#ifdef PAD64_REQUIRED
#else
#endif
+#ifdef PAD64_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 *);
int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *);
@@ -1085,6 +1134,9 @@
#define FREEBSD32_SYS_AUE_freebsd32_posix_fallocate AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_posix_fadvise AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_wait6 AUE_WAIT6
+#define FREEBSD32_SYS_AUE_freebsd32_posix_fallocate AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_posix_fadvise AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_wait6 AUE_WAIT6
#undef PAD_
#undef PADL_
Modified: trunk/sys/compat/freebsd32/freebsd32_syscall.h
===================================================================
--- trunk/sys/compat/freebsd32/freebsd32_syscall.h 2017-03-05 19:26:07 UTC (rev 9444)
+++ trunk/sys/compat/freebsd32/freebsd32_syscall.h 2017-03-05 19:27:42 UTC (rev 9445)
@@ -426,4 +426,7 @@
#define FREEBSD32_SYS_freebsd32_posix_fallocate 530
#define FREEBSD32_SYS_freebsd32_posix_fadvise 531
#define FREEBSD32_SYS_freebsd32_wait6 532
+#define FREEBSD32_SYS_freebsd32_posix_fallocate 530
+#define FREEBSD32_SYS_freebsd32_posix_fadvise 531
+#define FREEBSD32_SYS_freebsd32_wait6 532
#define FREEBSD32_SYS_MAXSYSCALL 533
Modified: trunk/sys/compat/freebsd32/freebsd32_syscalls.c
===================================================================
--- trunk/sys/compat/freebsd32/freebsd32_syscalls.c 2017-03-05 19:26:07 UTC (rev 9444)
+++ trunk/sys/compat/freebsd32/freebsd32_syscalls.c 2017-03-05 19:27:42 UTC (rev 9445)
@@ -553,7 +553,13 @@
"rctl_get_limits", /* 527 = rctl_get_limits */
"rctl_add_rule", /* 528 = rctl_add_rule */
"rctl_remove_rule", /* 529 = rctl_remove_rule */
+#ifdef PAD64_REQUIRED
"freebsd32_posix_fallocate", /* 530 = freebsd32_posix_fallocate */
"freebsd32_posix_fadvise", /* 531 = freebsd32_posix_fadvise */
"freebsd32_wait6", /* 532 = freebsd32_wait6 */
+#else
+ "freebsd32_posix_fallocate", /* 530 = freebsd32_posix_fallocate */
+ "freebsd32_posix_fadvise", /* 531 = freebsd32_posix_fadvise */
+ "freebsd32_wait6", /* 532 = freebsd32_wait6 */
+#endif
};
Modified: trunk/sys/compat/freebsd32/freebsd32_sysent.c
===================================================================
--- trunk/sys/compat/freebsd32/freebsd32_sysent.c 2017-03-05 19:26:07 UTC (rev 9444)
+++ trunk/sys/compat/freebsd32/freebsd32_sysent.c 2017-03-05 19:27:42 UTC (rev 9445)
@@ -590,7 +590,13 @@
{ AS(rctl_get_limits_args), (sy_call_t *)sys_rctl_get_limits, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 527 = rctl_get_limits */
{ AS(rctl_add_rule_args), (sy_call_t *)sys_rctl_add_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 528 = rctl_add_rule */
{ AS(rctl_remove_rule_args), (sy_call_t *)sys_rctl_remove_rule, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 529 = rctl_remove_rule */
+#ifdef PAD64_REQUIRED
{ AS(freebsd32_posix_fallocate_args), (sy_call_t *)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = freebsd32_posix_fallocate */
{ AS(freebsd32_posix_fadvise_args), (sy_call_t *)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 531 = freebsd32_posix_fadvise */
{ AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC }, /* 532 = freebsd32_wait6 */
+#else
+ { AS(freebsd32_posix_fallocate_args), (sy_call_t *)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = freebsd32_posix_fallocate */
+ { AS(freebsd32_posix_fadvise_args), (sy_call_t *)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 531 = freebsd32_posix_fadvise */
+ { AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC }, /* 532 = freebsd32_wait6 */
+#endif
};
Modified: trunk/sys/compat/freebsd32/freebsd32_systrace_args.c
===================================================================
--- trunk/sys/compat/freebsd32/freebsd32_systrace_args.c 2017-03-05 19:26:07 UTC (rev 9444)
+++ trunk/sys/compat/freebsd32/freebsd32_systrace_args.c 2017-03-05 19:27:42 UTC (rev 9445)
@@ -3023,10 +3023,51 @@
*n_args = 4;
break;
}
+#ifdef PAD64_REQUIRED
/* freebsd32_posix_fallocate */
case 530: {
struct freebsd32_posix_fallocate_args *p = params;
iarg[0] = p->fd; /* int */
+ iarg[1] = p->pad; /* int */
+ uarg[2] = p->offset1; /* uint32_t */
+ uarg[3] = p->offset2; /* uint32_t */
+ uarg[4] = p->len1; /* uint32_t */
+ uarg[5] = p->len2; /* uint32_t */
+ *n_args = 6;
+ break;
+ }
+ /* freebsd32_posix_fadvise */
+ case 531: {
+ struct freebsd32_posix_fadvise_args *p = params;
+ iarg[0] = p->fd; /* int */
+ iarg[1] = p->pad; /* int */
+ uarg[2] = p->offset1; /* uint32_t */
+ uarg[3] = p->offset2; /* uint32_t */
+ uarg[4] = p->len1; /* uint32_t */
+ uarg[5] = p->len2; /* uint32_t */
+ iarg[6] = p->advice; /* int */
+ *n_args = 7;
+ break;
+ }
+ /* freebsd32_wait6 */
+ case 532: {
+ struct freebsd32_wait6_args *p = params;
+ iarg[0] = p->idtype; /* int */
+ iarg[1] = p->pad; /* int */
+ uarg[2] = p->id1; /* uint32_t */
+ uarg[3] = p->id2; /* uint32_t */
+ uarg[4] = (intptr_t) p->status; /* int * */
+ iarg[5] = p->options; /* int */
+ uarg[6] = (intptr_t) p->wrusage; /* struct wrusage32 * */
+ uarg[7] = (intptr_t) p->info; /* siginfo_t * */
+ *n_args = 8;
+ break;
+ }
+#else
+ /* freebsd32_posix_fallocate */
+ case 530: {
+ struct freebsd32_posix_fallocate_args *p = params;
+ iarg[0] = p->fd; /* int */
uarg[1] = p->offset1; /* uint32_t */
uarg[2] = p->offset2; /* uint32_t */
uarg[3] = p->len1; /* uint32_t */
@@ -3050,14 +3091,16 @@
case 532: {
struct freebsd32_wait6_args *p = params;
iarg[0] = p->idtype; /* int */
- iarg[1] = p->id; /* int */
- uarg[2] = (intptr_t) p->status; /* int * */
- iarg[3] = p->options; /* int */
- uarg[4] = (intptr_t) p->wrusage; /* struct wrusage32 * */
- uarg[5] = (intptr_t) p->info; /* siginfo_t * */
- *n_args = 6;
+ uarg[1] = p->id1; /* uint32_t */
+ uarg[2] = p->id2; /* uint32_t */
+ uarg[3] = (intptr_t) p->status; /* int * */
+ iarg[4] = p->options; /* int */
+ uarg[5] = (intptr_t) p->wrusage; /* struct wrusage32 * */
+ uarg[6] = (intptr_t) p->info; /* siginfo_t * */
+ *n_args = 7;
break;
}
+#endif
default:
*n_args = 0;
break;
@@ -8095,6 +8138,7 @@
break;
};
break;
+#ifdef PAD64_REQUIRED
/* freebsd32_posix_fallocate */
case 530:
switch(ndx) {
@@ -8102,7 +8146,7 @@
p = "int";
break;
case 1:
- p = "uint32_t";
+ p = "int";
break;
case 2:
p = "uint32_t";
@@ -8113,6 +8157,9 @@
case 4:
p = "uint32_t";
break;
+ case 5:
+ p = "uint32_t";
+ break;
default:
break;
};
@@ -8124,7 +8171,7 @@
p = "int";
break;
case 1:
- p = "uint32_t";
+ p = "int";
break;
case 2:
p = "uint32_t";
@@ -8136,6 +8183,9 @@
p = "uint32_t";
break;
case 5:
+ p = "uint32_t";
+ break;
+ case 6:
p = "int";
break;
default:
@@ -8152,15 +8202,97 @@
p = "int";
break;
case 2:
+ p = "uint32_t";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
+ case 4:
p = "int *";
break;
+ case 5:
+ p = "int";
+ break;
+ case 6:
+ p = "struct wrusage32 *";
+ break;
+ case 7:
+ p = "siginfo_t *";
+ break;
+ default:
+ break;
+ };
+ break;
+#else
+ /* freebsd32_posix_fallocate */
+ case 530:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "uint32_t";
+ break;
+ case 2:
+ p = "uint32_t";
+ break;
case 3:
+ p = "uint32_t";
+ break;
+ case 4:
+ p = "uint32_t";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* freebsd32_posix_fadvise */
+ case 531:
+ switch(ndx) {
+ case 0:
p = "int";
break;
+ case 1:
+ p = "uint32_t";
+ break;
+ case 2:
+ p = "uint32_t";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
case 4:
+ p = "uint32_t";
+ break;
+ case 5:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* freebsd32_wait6 */
+ case 532:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "uint32_t";
+ break;
+ case 2:
+ p = "uint32_t";
+ break;
+ case 3:
+ p = "int *";
+ break;
+ case 4:
+ p = "int";
+ break;
+ case 5:
p = "struct wrusage32 *";
break;
- case 5:
+ case 6:
p = "siginfo_t *";
break;
default:
@@ -8167,6 +8299,7 @@
break;
};
break;
+#endif
default:
break;
};
Modified: trunk/sys/kern/systrace_args.c
===================================================================
--- trunk/sys/kern/systrace_args.c 2017-03-05 19:26:07 UTC (rev 9444)
+++ trunk/sys/kern/systrace_args.c 2017-03-05 19:27:42 UTC (rev 9445)
@@ -3248,7 +3248,7 @@
case 532: {
struct wait6_args *p = params;
iarg[0] = p->idtype; /* int */
- iarg[1] = p->id; /* int */
+ iarg[1] = p->id; /* id_t */
uarg[2] = (intptr_t) p->status; /* int * */
iarg[3] = p->options; /* int */
uarg[4] = (intptr_t) p->wrusage; /* struct __wrusage * */
@@ -9050,7 +9050,7 @@
p = "int";
break;
case 1:
- p = "int";
+ p = "id_t";
break;
case 2:
p = "int *";
Modified: trunk/sys/sys/sysproto.h
===================================================================
--- trunk/sys/sys/sysproto.h 2017-03-05 19:26:07 UTC (rev 9444)
+++ trunk/sys/sys/sysproto.h 2017-03-05 19:27:42 UTC (rev 9445)
@@ -1754,7 +1754,7 @@
};
struct wait6_args {
char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
- char id_l_[PADL_(int)]; int id; char id_r_[PADR_(int)];
+ char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
char wrusage_l_[PADL_(struct __wrusage *)]; struct __wrusage * wrusage; char wrusage_r_[PADR_(struct __wrusage *)];
More information about the Midnightbsd-cvs
mailing list