svn commit: r293509 - in stable/10/sys: amd64/linux32 i386/linux
Dmitry Chagin
dchagin at FreeBSD.org
Sat Jan 9 15:36:00 UTC 2016
Author: dchagin
Date: Sat Jan 9 15:35:57 2016
New Revision: 293509
URL: https://svnweb.freebsd.org/changeset/base/293509
Log:
Regen for r293508.
Modified:
stable/10/sys/amd64/linux32/linux32_proto.h
stable/10/sys/amd64/linux32/linux32_syscall.h
stable/10/sys/amd64/linux32/linux32_syscalls.c
stable/10/sys/amd64/linux32/linux32_sysent.c
stable/10/sys/amd64/linux32/linux32_systrace_args.c
stable/10/sys/i386/linux/linux_proto.h
stable/10/sys/i386/linux/linux_syscall.h
stable/10/sys/i386/linux/linux_syscalls.c
stable/10/sys/i386/linux/linux_sysent.c
stable/10/sys/i386/linux/linux_systrace_args.c
Modified: stable/10/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_proto.h Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/amd64/linux32/linux32_proto.h Sat Jan 9 15:35:57 2016 (r293509)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293505 2016-01-09 15:31:15Z dchagin
+ * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293508 2016-01-09 15:34:54Z dchagin
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -1064,7 +1064,9 @@ struct linux_epoll_create1_args {
register_t dummy;
};
struct linux_dup3_args {
- register_t dummy;
+ char oldfd_l_[PADL_(l_int)]; l_int oldfd; char oldfd_r_[PADR_(l_int)];
+ char newfd_l_[PADL_(l_int)]; l_int newfd; char newfd_r_[PADR_(l_int)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_pipe2_args {
char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char pipefds_r_[PADR_(l_int *)];
Modified: stable/10/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_syscall.h Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/amd64/linux32/linux32_syscall.h Sat Jan 9 15:35:57 2016 (r293509)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293505 2016-01-09 15:31:15Z dchagin
+ * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293508 2016-01-09 15:34:54Z dchagin
*/
#define LINUX_SYS_linux_exit 1
Modified: stable/10/sys/amd64/linux32/linux32_syscalls.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_syscalls.c Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/amd64/linux32/linux32_syscalls.c Sat Jan 9 15:35:57 2016 (r293509)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293505 2016-01-09 15:31:15Z dchagin
+ * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293508 2016-01-09 15:34:54Z dchagin
*/
const char *linux_syscallnames[] = {
Modified: stable/10/sys/amd64/linux32/linux32_sysent.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_sysent.c Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/amd64/linux32/linux32_sysent.c Sat Jan 9 15:35:57 2016 (r293509)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293505 2016-01-09 15:31:15Z dchagin
+ * created from FreeBSD: stable/10/sys/amd64/linux32/syscalls.master 293508 2016-01-09 15:34:54Z dchagin
*/
#include "opt_compat.h"
@@ -349,7 +349,7 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 327 = linux_signalfd4 */
{ 0, (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 328 = linux_eventfd2 */
{ 0, (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 329 = linux_epoll_create1 */
- { 0, (sy_call_t *)linux_dup3, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 330 = linux_dup3 */
+ { AS(linux_dup3_args), (sy_call_t *)linux_dup3, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 330 = linux_dup3 */
{ AS(linux_pipe2_args), (sy_call_t *)linux_pipe2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 331 = linux_pipe2 */
{ 0, (sy_call_t *)linux_inotify_init1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 332 = linux_inotify_init1 */
{ 0, (sy_call_t *)linux_preadv, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 333 = linux_preadv */
Modified: stable/10/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_systrace_args.c Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/amd64/linux32/linux32_systrace_args.c Sat Jan 9 15:35:57 2016 (r293509)
@@ -2190,7 +2190,11 @@ systrace_args(int sysnum, void *params,
}
/* linux_dup3 */
case 330: {
- *n_args = 0;
+ struct linux_dup3_args *p = params;
+ iarg[0] = p->oldfd; /* l_int */
+ iarg[1] = p->newfd; /* l_int */
+ iarg[2] = p->flags; /* l_int */
+ *n_args = 3;
break;
}
/* linux_pipe2 */
@@ -5467,6 +5471,19 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_dup3 */
case 330:
+ switch(ndx) {
+ case 0:
+ p = "l_int";
+ break;
+ case 1:
+ p = "l_int";
+ break;
+ case 2:
+ p = "l_int";
+ break;
+ default:
+ break;
+ };
break;
/* linux_pipe2 */
case 331:
@@ -6752,6 +6769,9 @@ systrace_return_setargdesc(int sysnum, i
case 329:
/* linux_dup3 */
case 330:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_pipe2 */
case 331:
if (ndx == 0 || ndx == 1)
Modified: stable/10/sys/i386/linux/linux_proto.h
==============================================================================
--- stable/10/sys/i386/linux/linux_proto.h Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/i386/linux/linux_proto.h Sat Jan 9 15:35:57 2016 (r293509)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293505 2016-01-09 15:31:15Z dchagin
+ * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293508 2016-01-09 15:34:54Z dchagin
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -1082,7 +1082,9 @@ struct linux_epoll_create1_args {
register_t dummy;
};
struct linux_dup3_args {
- register_t dummy;
+ char oldfd_l_[PADL_(l_int)]; l_int oldfd; char oldfd_r_[PADR_(l_int)];
+ char newfd_l_[PADL_(l_int)]; l_int newfd; char newfd_r_[PADR_(l_int)];
+ char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
};
struct linux_pipe2_args {
char pipefds_l_[PADL_(l_int *)]; l_int * pipefds; char pipefds_r_[PADR_(l_int *)];
Modified: stable/10/sys/i386/linux/linux_syscall.h
==============================================================================
--- stable/10/sys/i386/linux/linux_syscall.h Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/i386/linux/linux_syscall.h Sat Jan 9 15:35:57 2016 (r293509)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293505 2016-01-09 15:31:15Z dchagin
+ * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293508 2016-01-09 15:34:54Z dchagin
*/
#define LINUX_SYS_linux_exit 1
Modified: stable/10/sys/i386/linux/linux_syscalls.c
==============================================================================
--- stable/10/sys/i386/linux/linux_syscalls.c Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/i386/linux/linux_syscalls.c Sat Jan 9 15:35:57 2016 (r293509)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293505 2016-01-09 15:31:15Z dchagin
+ * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293508 2016-01-09 15:34:54Z dchagin
*/
const char *linux_syscallnames[] = {
Modified: stable/10/sys/i386/linux/linux_sysent.c
==============================================================================
--- stable/10/sys/i386/linux/linux_sysent.c Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/i386/linux/linux_sysent.c Sat Jan 9 15:35:57 2016 (r293509)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293505 2016-01-09 15:31:15Z dchagin
+ * created from FreeBSD: stable/10/sys/i386/linux/syscalls.master 293508 2016-01-09 15:34:54Z dchagin
*/
#include <sys/param.h>
@@ -348,7 +348,7 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 327 = linux_signalfd4 */
{ 0, (sy_call_t *)linux_eventfd2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 328 = linux_eventfd2 */
{ 0, (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 329 = linux_epoll_create1 */
- { 0, (sy_call_t *)linux_dup3, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 330 = linux_dup3 */
+ { AS(linux_dup3_args), (sy_call_t *)linux_dup3, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 330 = linux_dup3 */
{ AS(linux_pipe2_args), (sy_call_t *)linux_pipe2, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 331 = linux_pipe2 */
{ 0, (sy_call_t *)linux_inotify_init1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 332 = linux_inotify_init1 */
{ 0, (sy_call_t *)linux_preadv, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 333 = linux_preadv */
Modified: stable/10/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- stable/10/sys/i386/linux/linux_systrace_args.c Sat Jan 9 15:34:54 2016 (r293508)
+++ stable/10/sys/i386/linux/linux_systrace_args.c Sat Jan 9 15:35:57 2016 (r293509)
@@ -2266,7 +2266,11 @@ systrace_args(int sysnum, void *params,
}
/* linux_dup3 */
case 330: {
- *n_args = 0;
+ struct linux_dup3_args *p = params;
+ iarg[0] = p->oldfd; /* l_int */
+ iarg[1] = p->newfd; /* l_int */
+ iarg[2] = p->flags; /* l_int */
+ *n_args = 3;
break;
}
/* linux_pipe2 */
@@ -5698,6 +5702,19 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_dup3 */
case 330:
+ switch(ndx) {
+ case 0:
+ p = "l_int";
+ break;
+ case 1:
+ p = "l_int";
+ break;
+ case 2:
+ p = "l_int";
+ break;
+ default:
+ break;
+ };
break;
/* linux_pipe2 */
case 331:
@@ -7030,6 +7047,9 @@ systrace_return_setargdesc(int sysnum, i
case 329:
/* linux_dup3 */
case 330:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_pipe2 */
case 331:
if (ndx == 0 || ndx == 1)
More information about the svn-src-all
mailing list