svn commit: r247220 - in user/dchagin/lemul/sys: amd64/linux32 i386/linux
Dmitry Chagin
dchagin at FreeBSD.org
Sun Feb 24 11:32:48 UTC 2013
Author: dchagin
Date: Sun Feb 24 11:32:45 2013
New Revision: 247220
URL: http://svnweb.freebsd.org/changeset/base/247220
Log:
Regen for r247219.
Modified:
user/dchagin/lemul/sys/amd64/linux32/linux32_proto.h
user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h
user/dchagin/lemul/sys/amd64/linux32/linux32_syscalls.c
user/dchagin/lemul/sys/amd64/linux32/linux32_sysent.c
user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c
user/dchagin/lemul/sys/i386/linux/linux_proto.h
user/dchagin/lemul/sys/i386/linux/linux_syscall.h
user/dchagin/lemul/sys/i386/linux/linux_syscalls.c
user/dchagin/lemul/sys/i386/linux/linux_sysent.c
user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_proto.h Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_proto.h Sun Feb 24 11:32:45 2013 (r247220)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247183 2013-02-23 09:10:18Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -877,7 +877,11 @@ struct linux_kexec_load_args {
register_t dummy;
};
struct linux_waitid_args {
- register_t dummy;
+ char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
+ char id_l_[PADL_(l_pid_t)]; l_pid_t id; char id_r_[PADR_(l_pid_t)];
+ char info_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * info; char info_r_[PADR_(l_siginfo_t *)];
+ char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
+ char rusage_l_[PADL_(struct l_rusage *)]; struct l_rusage * rusage; char rusage_r_[PADR_(struct l_rusage *)];
};
struct linux_add_key_args {
register_t dummy;
@@ -1627,7 +1631,7 @@ int linux_process_vm_writev(struct threa
#define LINUX_SYS_AUE_linux_mq_notify AUE_NULL
#define LINUX_SYS_AUE_linux_mq_getsetattr AUE_NULL
#define LINUX_SYS_AUE_linux_kexec_load AUE_NULL
-#define LINUX_SYS_AUE_linux_waitid AUE_NULL
+#define LINUX_SYS_AUE_linux_waitid AUE_WAIT6
#define LINUX_SYS_AUE_linux_add_key AUE_NULL
#define LINUX_SYS_AUE_linux_request_key AUE_NULL
#define LINUX_SYS_AUE_linux_keyctl AUE_NULL
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h Sun Feb 24 11:32:45 2013 (r247220)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247183 2013-02-23 09:10:18Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
*/
#define LINUX_SYS_linux_exit 1
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_syscalls.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_syscalls.c Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_syscalls.c Sun Feb 24 11:32:45 2013 (r247220)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247183 2013-02-23 09:10:18Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
*/
const char *linux_syscallnames[] = {
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_sysent.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_sysent.c Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_sysent.c Sun Feb 24 11:32:45 2013 (r247220)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247183 2013-02-23 09:10:18Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
*/
#include "opt_compat.h"
@@ -303,7 +303,7 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 281 = linux_mq_notify */
{ 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 282 = linux_mq_getsetattr */
{ 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 283 = linux_kexec_load */
- { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 284 = linux_waitid */
+ { AS(linux_waitid_args), (sy_call_t *)linux_waitid, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC }, /* 284 = linux_waitid */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 285 = */
{ 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 286 = linux_add_key */
{ 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 287 = linux_request_key */
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 24 11:32:45 2013 (r247220)
@@ -1870,7 +1870,13 @@ systrace_args(int sysnum, void *params,
}
/* linux_waitid */
case 284: {
- *n_args = 0;
+ struct linux_waitid_args *p = params;
+ iarg[0] = p->idtype; /* int */
+ iarg[1] = p->id; /* l_pid_t */
+ uarg[2] = (intptr_t) p->info; /* l_siginfo_t * */
+ iarg[3] = p->options; /* int */
+ uarg[4] = (intptr_t) p->rusage; /* struct l_rusage * */
+ *n_args = 5;
break;
}
/* linux_add_key */
@@ -4999,6 +5005,25 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_waitid */
case 284:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "l_pid_t";
+ break;
+ case 2:
+ p = "l_siginfo_t *";
+ break;
+ case 3:
+ p = "int";
+ break;
+ case 4:
+ p = "struct l_rusage *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_add_key */
case 286:
@@ -6485,6 +6510,9 @@ systrace_return_setargdesc(int sysnum, i
case 283:
/* linux_waitid */
case 284:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_add_key */
case 286:
/* linux_request_key */
Modified: user/dchagin/lemul/sys/i386/linux/linux_proto.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_proto.h Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/i386/linux/linux_proto.h Sun Feb 24 11:32:45 2013 (r247220)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247183 2013-02-23 09:10:18Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -900,7 +900,11 @@ struct linux_kexec_load_args {
register_t dummy;
};
struct linux_waitid_args {
- register_t dummy;
+ char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
+ char id_l_[PADL_(l_pid_t)]; l_pid_t id; char id_r_[PADR_(l_pid_t)];
+ char info_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * info; char info_r_[PADR_(l_siginfo_t *)];
+ char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
+ char rusage_l_[PADL_(struct l_rusage *)]; struct l_rusage * rusage; char rusage_r_[PADR_(struct l_rusage *)];
};
struct linux_add_key_args {
register_t dummy;
@@ -1654,7 +1658,7 @@ int linux_process_vm_writev(struct threa
#define LINUX_SYS_AUE_linux_mq_notify AUE_NULL
#define LINUX_SYS_AUE_linux_mq_getsetattr AUE_NULL
#define LINUX_SYS_AUE_linux_kexec_load AUE_NULL
-#define LINUX_SYS_AUE_linux_waitid AUE_NULL
+#define LINUX_SYS_AUE_linux_waitid AUE_WAIT6
#define LINUX_SYS_AUE_linux_add_key AUE_NULL
#define LINUX_SYS_AUE_linux_request_key AUE_NULL
#define LINUX_SYS_AUE_linux_keyctl AUE_NULL
Modified: user/dchagin/lemul/sys/i386/linux/linux_syscall.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_syscall.h Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/i386/linux/linux_syscall.h Sun Feb 24 11:32:45 2013 (r247220)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247183 2013-02-23 09:10:18Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
*/
#define LINUX_SYS_linux_exit 1
Modified: user/dchagin/lemul/sys/i386/linux/linux_syscalls.c
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_syscalls.c Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/i386/linux/linux_syscalls.c Sun Feb 24 11:32:45 2013 (r247220)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247183 2013-02-23 09:10:18Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
*/
const char *linux_syscallnames[] = {
Modified: user/dchagin/lemul/sys/i386/linux/linux_sysent.c
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_sysent.c Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/i386/linux/linux_sysent.c Sun Feb 24 11:32:45 2013 (r247220)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247183 2013-02-23 09:10:18Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
*/
#include <sys/param.h>
@@ -302,7 +302,7 @@ struct sysent linux_sysent[] = {
{ AS(linux_mq_notify_args), (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 281 = linux_mq_notify */
{ AS(linux_mq_getsetattr_args), (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 282 = linux_mq_getsetattr */
{ 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 283 = linux_kexec_load */
- { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 284 = linux_waitid */
+ { AS(linux_waitid_args), (sy_call_t *)linux_waitid, AUE_WAIT6, NULL, 0, 0, 0, SY_THR_STATIC }, /* 284 = linux_waitid */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 285 = */
{ 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 286 = linux_add_key */
{ 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 287 = linux_request_key */
Modified: user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c Sun Feb 24 11:31:00 2013 (r247219)
+++ user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c Sun Feb 24 11:32:45 2013 (r247220)
@@ -1961,7 +1961,13 @@ systrace_args(int sysnum, void *params,
}
/* linux_waitid */
case 284: {
- *n_args = 0;
+ struct linux_waitid_args *p = params;
+ iarg[0] = p->idtype; /* int */
+ iarg[1] = p->id; /* l_pid_t */
+ uarg[2] = (intptr_t) p->info; /* l_siginfo_t * */
+ iarg[3] = p->options; /* int */
+ uarg[4] = (intptr_t) p->rusage; /* struct l_rusage * */
+ *n_args = 5;
break;
}
/* linux_add_key */
@@ -5295,6 +5301,25 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_waitid */
case 284:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "l_pid_t";
+ break;
+ case 2:
+ p = "l_siginfo_t *";
+ break;
+ case 3:
+ p = "int";
+ break;
+ case 4:
+ p = "struct l_rusage *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_add_key */
case 286:
@@ -6843,6 +6868,9 @@ systrace_return_setargdesc(int sysnum, i
case 283:
/* linux_waitid */
case 284:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_add_key */
case 286:
/* linux_request_key */
More information about the svn-src-user
mailing list