From owner-svn-src-user@FreeBSD.ORG Sun Feb 24 18:14:00 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id F2BECBD2;
Sun, 24 Feb 2013 18:13:59 +0000 (UTC)
(envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id E4C45D01;
Sun, 24 Feb 2013 18:13:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1OIDxsL034726;
Sun, 24 Feb 2013 18:13:59 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1OIDvYo034707;
Sun, 24 Feb 2013 18:13:57 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201302241813.r1OIDvYo034707@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sun, 24 Feb 2013 18:13:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r247229 - in user/dchagin/lemul/sys: amd64/linux32
i386/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Feb 2013 18:14:00 -0000
Author: dchagin
Date: Sun Feb 24 18:13:57 2013
New Revision: 247229
URL: http://svnweb.freebsd.org/changeset/base/247229
Log:
Regen for r247228.
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 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_proto.h Sun Feb 24 18:13:57 2013 (r247229)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247228 2013-02-24 18:12:30Z dchagin
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -573,7 +573,9 @@ struct linux_rt_sigtimedwait_args {
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_rt_sigqueueinfo_args {
- register_t dummy;
+ char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
+ char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)];
+ char info_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * info; char info_r_[PADR_(l_siginfo_t *)];
};
struct linux_rt_sigsuspend_args {
char newset_l_[PADL_(l_sigset_t *)]; l_sigset_t * newset; char newset_r_[PADR_(l_sigset_t *)];
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h Sun Feb 24 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_syscall.h Sun Feb 24 18:13:57 2013 (r247229)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247228 2013-02-24 18:12:30Z 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 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_syscalls.c Sun Feb 24 18:13:57 2013 (r247229)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247228 2013-02-24 18:12:30Z 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 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_sysent.c Sun Feb 24 18:13:57 2013 (r247229)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/amd64/linux32/syscalls.master 247228 2013-02-24 18:12:30Z dchagin
*/
#include "opt_compat.h"
@@ -197,7 +197,7 @@ struct sysent linux_sysent[] = {
{ AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 175 = linux_rt_sigprocmask */
{ AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 176 = linux_rt_sigpending */
{ AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 177 = linux_rt_sigtimedwait */
- { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 178 = linux_rt_sigqueueinfo */
+ { AS(linux_rt_sigqueueinfo_args), (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 178 = linux_rt_sigqueueinfo */
{ AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 179 = linux_rt_sigsuspend */
{ AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 180 = linux_pread */
{ AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 181 = linux_pwrite */
Modified: user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 24 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/amd64/linux32/linux32_systrace_args.c Sun Feb 24 18:13:57 2013 (r247229)
@@ -1234,7 +1234,11 @@ systrace_args(int sysnum, void *params,
}
/* linux_rt_sigqueueinfo */
case 178: {
- *n_args = 0;
+ struct linux_rt_sigqueueinfo_args *p = params;
+ iarg[0] = p->pid; /* l_pid_t */
+ iarg[1] = p->sig; /* l_int */
+ uarg[2] = (intptr_t) p->info; /* l_siginfo_t * */
+ *n_args = 3;
break;
}
/* linux_rt_sigsuspend */
@@ -4151,6 +4155,19 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_rt_sigqueueinfo */
case 178:
+ switch(ndx) {
+ case 0:
+ p = "l_pid_t";
+ break;
+ case 1:
+ p = "l_int";
+ break;
+ case 2:
+ p = "l_siginfo_t *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_rt_sigsuspend */
case 179:
@@ -6176,6 +6193,9 @@ systrace_return_setargdesc(int sysnum, i
break;
/* linux_rt_sigqueueinfo */
case 178:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_rt_sigsuspend */
case 179:
if (ndx == 0 || ndx == 1)
Modified: user/dchagin/lemul/sys/i386/linux/linux_proto.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_proto.h Sun Feb 24 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/i386/linux/linux_proto.h Sun Feb 24 18:13:57 2013 (r247229)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247228 2013-02-24 18:12:30Z dchagin
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -574,7 +574,9 @@ struct linux_rt_sigtimedwait_args {
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_rt_sigqueueinfo_args {
- register_t dummy;
+ char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
+ char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)];
+ char info_l_[PADL_(l_siginfo_t *)]; l_siginfo_t * info; char info_r_[PADR_(l_siginfo_t *)];
};
struct linux_rt_sigsuspend_args {
char newset_l_[PADL_(l_sigset_t *)]; l_sigset_t * newset; char newset_r_[PADR_(l_sigset_t *)];
Modified: user/dchagin/lemul/sys/i386/linux/linux_syscall.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_syscall.h Sun Feb 24 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/i386/linux/linux_syscall.h Sun Feb 24 18:13:57 2013 (r247229)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247228 2013-02-24 18:12:30Z 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 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/i386/linux/linux_syscalls.c Sun Feb 24 18:13:57 2013 (r247229)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247228 2013-02-24 18:12:30Z 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 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/i386/linux/linux_sysent.c Sun Feb 24 18:13:57 2013 (r247229)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247219 2013-02-24 11:31:00Z dchagin
+ * created from FreeBSD: user/dchagin/lemul/sys/i386/linux/syscalls.master 247228 2013-02-24 18:12:30Z dchagin
*/
#include <sys/param.h>
@@ -196,7 +196,7 @@ struct sysent linux_sysent[] = {
{ AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 175 = linux_rt_sigprocmask */
{ AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 176 = linux_rt_sigpending */
{ AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 177 = linux_rt_sigtimedwait */
- { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 178 = linux_rt_sigqueueinfo */
+ { AS(linux_rt_sigqueueinfo_args), (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 178 = linux_rt_sigqueueinfo */
{ AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 179 = linux_rt_sigsuspend */
{ AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 180 = linux_pread */
{ AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0, 0, SY_THR_STATIC }, /* 181 = linux_pwrite */
Modified: user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c Sun Feb 24 18:12:30 2013 (r247228)
+++ user/dchagin/lemul/sys/i386/linux/linux_systrace_args.c Sun Feb 24 18:13:57 2013 (r247229)
@@ -1277,7 +1277,11 @@ systrace_args(int sysnum, void *params,
}
/* linux_rt_sigqueueinfo */
case 178: {
- *n_args = 0;
+ struct linux_rt_sigqueueinfo_args *p = params;
+ iarg[0] = p->pid; /* l_pid_t */
+ iarg[1] = p->sig; /* l_int */
+ uarg[2] = (intptr_t) p->info; /* l_siginfo_t * */
+ *n_args = 3;
break;
}
/* linux_rt_sigsuspend */
@@ -4303,6 +4307,19 @@ systrace_entry_setargdesc(int sysnum, in
break;
/* linux_rt_sigqueueinfo */
case 178:
+ switch(ndx) {
+ case 0:
+ p = "l_pid_t";
+ break;
+ case 1:
+ p = "l_int";
+ break;
+ case 2:
+ p = "l_siginfo_t *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_rt_sigsuspend */
case 179:
@@ -6496,6 +6513,9 @@ systrace_return_setargdesc(int sysnum, i
break;
/* linux_rt_sigqueueinfo */
case 178:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_rt_sigsuspend */
case 179:
if (ndx == 0 || ndx == 1)