svn commit: r277152 - in user/dchagin/lemul/sys: amd64/linux amd64/linux32 i386/linux
Dmitry Chagin
dchagin at FreeBSD.org
Tue Jan 13 22:16:59 UTC 2015
Author: dchagin
Date: Tue Jan 13 22:16:55 2015
New Revision: 277152
URL: https://svnweb.freebsd.org/changeset/base/277152
Log:
Regen for r277150.
Modified:
user/dchagin/lemul/sys/amd64/linux/linux_proto.h
user/dchagin/lemul/sys/amd64/linux/linux_sysent.c
user/dchagin/lemul/sys/amd64/linux/linux_systrace_args.c
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/linux/linux_proto.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux_proto.h Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/amd64/linux/linux_proto.h Tue Jan 13 22:16:55 2015 (r277152)
@@ -1004,7 +1004,10 @@ struct linux_eventfd_args {
char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)];
};
struct linux_fallocate_args {
- register_t dummy;
+ char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+ char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char offset_r_[PADR_(l_loff_t)];
+ char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)];
};
struct linux_timerfd_settime_args {
register_t dummy;
Modified: user/dchagin/lemul/sys/amd64/linux/linux_sysent.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux_sysent.c Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/amd64/linux/linux_sysent.c Tue Jan 13 22:16:55 2015 (r277152)
@@ -303,7 +303,7 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 282 = linux_signalfd */
{ 0, (sy_call_t *)linux_timerfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 283 = linux_timerfd */
{ AS(linux_eventfd_args), (sy_call_t *)linux_eventfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 284 = linux_eventfd */
- { 0, (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 285 = linux_fallocate */
+ { AS(linux_fallocate_args), (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 285 = linux_fallocate */
{ 0, (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 286 = linux_timerfd_settime */
{ 0, (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 287 = linux_timerfd_gettime */
{ AS(linux_accept4_args), (sy_call_t *)linux_accept4, AUE_ACCEPT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 288 = linux_accept4 */
Modified: user/dchagin/lemul/sys/amd64/linux/linux_systrace_args.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux_systrace_args.c Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/amd64/linux/linux_systrace_args.c Tue Jan 13 22:16:55 2015 (r277152)
@@ -2085,7 +2085,12 @@ systrace_args(int sysnum, void *params,
}
/* linux_fallocate */
case 285: {
- *n_args = 0;
+ struct linux_fallocate_args *p = params;
+ iarg[0] = p->fd; /* l_int */
+ iarg[1] = p->mode; /* l_int */
+ iarg[2] = p->offset; /* l_loff_t */
+ iarg[3] = p->len; /* l_loff_t */
+ *n_args = 4;
break;
}
/* linux_timerfd_settime */
@@ -5391,6 +5396,22 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_fallocate */
case 285:
+ switch(ndx) {
+ case 0:
+ p = "l_int";
+ break;
+ case 1:
+ p = "l_int";
+ break;
+ case 2:
+ p = "l_loff_t";
+ break;
+ case 3:
+ p = "l_loff_t";
+ break;
+ default:
+ break;
+ };
break;
/* linux_timerfd_settime */
case 286:
@@ -6693,6 +6714,9 @@ systrace_return_setargdesc(int sysnum, i
break;
/* linux_fallocate */
case 285:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_timerfd_settime */
case 286:
/* linux_timerfd_gettime */
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_proto.h Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_proto.h Tue Jan 13 22:16:55 2015 (r277152)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 277150 2015-01-13 22:13:03Z dchagin
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -1064,7 +1064,10 @@ struct linux_eventfd_args {
char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)];
};
struct linux_fallocate_args {
- register_t dummy;
+ char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+ char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char offset_r_[PADR_(l_loff_t)];
+ char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)];
};
struct linux_timerfd_settime_args {
register_t dummy;
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h Tue Jan 13 22:16:55 2015 (r277152)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 277150 2015-01-13 22:13:03Z 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 Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_syscalls.c Tue Jan 13 22:16:55 2015 (r277152)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 277150 2015-01-13 22:13:03Z dchagin
*/
const char *linux_syscallnames[] = {
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_sysent.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_sysent.c Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_sysent.c Tue Jan 13 22:16:55 2015 (r277152)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 277150 2015-01-13 22:13:03Z dchagin
*/
#include "opt_compat.h"
@@ -343,7 +343,7 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 321 = linux_signalfd */
{ 0, (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */
{ AS(linux_eventfd_args), (sy_call_t *)linux_eventfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 323 = linux_eventfd */
- { 0, (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 324 = linux_fallocate */
+ { AS(linux_fallocate_args), (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 324 = linux_fallocate */
{ 0, (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */
{ 0, (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */
{ 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 327 = linux_signalfd4 */
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c Tue Jan 13 22:16:55 2015 (r277152)
@@ -2192,7 +2192,12 @@ systrace_args(int sysnum, void *params,
}
/* linux_fallocate */
case 324: {
- *n_args = 0;
+ struct linux_fallocate_args *p = params;
+ iarg[0] = p->fd; /* l_int */
+ iarg[1] = p->mode; /* l_int */
+ iarg[2] = p->offset; /* l_loff_t */
+ iarg[3] = p->len; /* l_loff_t */
+ *n_args = 4;
break;
}
/* linux_timerfd_settime */
@@ -5598,6 +5603,22 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_fallocate */
case 324:
+ switch(ndx) {
+ case 0:
+ p = "l_int";
+ break;
+ case 1:
+ p = "l_int";
+ break;
+ case 2:
+ p = "l_loff_t";
+ break;
+ case 3:
+ p = "l_loff_t";
+ break;
+ default:
+ break;
+ };
break;
/* linux_timerfd_settime */
case 325:
@@ -6956,6 +6977,9 @@ systrace_return_setargdesc(int sysnum, i
break;
/* linux_fallocate */
case 324:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_timerfd_settime */
case 325:
/* linux_timerfd_gettime */
Modified: user/dchagin/lemul/sys/i386/linux/linux_proto.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_proto.h Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/i386/linux/linux_proto.h Tue Jan 13 22:16:55 2015 (r277152)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 277150 2015-01-13 22:13:03Z dchagin
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -1082,7 +1082,10 @@ struct linux_eventfd_args {
char initval_l_[PADL_(l_uint)]; l_uint initval; char initval_r_[PADR_(l_uint)];
};
struct linux_fallocate_args {
- register_t dummy;
+ char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
+ char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+ char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char offset_r_[PADR_(l_loff_t)];
+ char len_l_[PADL_(l_loff_t)]; l_loff_t len; char len_r_[PADR_(l_loff_t)];
};
struct linux_timerfd_settime_args {
register_t dummy;
Modified: user/dchagin/lemul/sys/i386/linux/linux_syscall.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_syscall.h Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/i386/linux/linux_syscall.h Tue Jan 13 22:16:55 2015 (r277152)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 277150 2015-01-13 22:13:03Z 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 Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/i386/linux/linux_syscalls.c Tue Jan 13 22:16:55 2015 (r277152)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 277150 2015-01-13 22:13:03Z dchagin
*/
const char *linux_syscallnames[] = {
Modified: user/dchagin/lemul/sys/i386/linux/linux_sysent.c
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_sysent.c Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/i386/linux/linux_sysent.c Tue Jan 13 22:16:55 2015 (r277152)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 277150 2015-01-13 22:13:03Z dchagin
*/
#include <sys/param.h>
@@ -342,7 +342,7 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 321 = linux_signalfd */
{ 0, (sy_call_t *)linux_timerfd_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 322 = linux_timerfd_create */
{ AS(linux_eventfd_args), (sy_call_t *)linux_eventfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 323 = linux_eventfd */
- { 0, (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 324 = linux_fallocate */
+ { AS(linux_fallocate_args), (sy_call_t *)linux_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 324 = linux_fallocate */
{ 0, (sy_call_t *)linux_timerfd_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 325 = linux_timerfd_settime */
{ 0, (sy_call_t *)linux_timerfd_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 326 = linux_timerfd_gettime */
{ 0, (sy_call_t *)linux_signalfd4, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 327 = linux_signalfd4 */
Modified: user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c Tue Jan 13 22:13:30 2015 (r277151)
+++ user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c Tue Jan 13 22:16:55 2015 (r277152)
@@ -2268,7 +2268,12 @@ systrace_args(int sysnum, void *params,
}
/* linux_fallocate */
case 324: {
- *n_args = 0;
+ struct linux_fallocate_args *p = params;
+ iarg[0] = p->fd; /* l_int */
+ iarg[1] = p->mode; /* l_int */
+ iarg[2] = p->offset; /* l_loff_t */
+ iarg[3] = p->len; /* l_loff_t */
+ *n_args = 4;
break;
}
/* linux_timerfd_settime */
@@ -5829,6 +5834,22 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_fallocate */
case 324:
+ switch(ndx) {
+ case 0:
+ p = "l_int";
+ break;
+ case 1:
+ p = "l_int";
+ break;
+ case 2:
+ p = "l_loff_t";
+ break;
+ case 3:
+ p = "l_loff_t";
+ break;
+ default:
+ break;
+ };
break;
/* linux_timerfd_settime */
case 325:
@@ -7234,6 +7255,9 @@ systrace_return_setargdesc(int sysnum, i
break;
/* linux_fallocate */
case 324:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_timerfd_settime */
case 325:
/* linux_timerfd_gettime */
More information about the svn-src-user
mailing list