svn commit: r317846 - head/sys/compat/freebsd32
Brooks Davis
brooks at FreeBSD.org
Fri May 5 18:50:24 UTC 2017
Author: brooks
Date: Fri May 5 18:50:22 2017
New Revision: 317846
URL: https://svnweb.freebsd.org/changeset/base/317846
Log:
Regent post r317845.
MFC after: 1 week
MFC with: r317845
Sponsored by: DARPA, AFRL
Modified:
head/sys/compat/freebsd32/freebsd32_proto.h
head/sys/compat/freebsd32/freebsd32_syscall.h
head/sys/compat/freebsd32/freebsd32_syscalls.c
head/sys/compat/freebsd32/freebsd32_sysent.c
head/sys/compat/freebsd32/freebsd32_systrace_args.c
Modified: head/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_proto.h Fri May 5 18:49:39 2017 (r317845)
+++ head/sys/compat/freebsd32/freebsd32_proto.h Fri May 5 18:50:22 2017 (r317846)
@@ -382,6 +382,11 @@ struct freebsd32_thr_new_args {
char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)];
char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)];
};
+struct freebsd32_sigqueue_args {
+ char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
+ char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
+ char value_l_[PADL_(int)]; int value; char value_r_[PADR_(int)];
+};
struct freebsd32_kmq_open_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
@@ -764,6 +769,7 @@ int freebsd32_ksem_timedwait(struct thre
int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *);
int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *);
int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *);
+int freebsd32_sigqueue(struct thread *, struct freebsd32_sigqueue_args *);
int freebsd32_kmq_open(struct thread *, struct freebsd32_kmq_open_args *);
int freebsd32_kmq_setattr(struct thread *, struct freebsd32_kmq_setattr_args *);
int freebsd32_kmq_timedreceive(struct thread *, struct freebsd32_kmq_timedreceive_args *);
@@ -1230,6 +1236,7 @@ int freebsd10_freebsd32_pipe(struct thre
#define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_THR_NEW
+#define FREEBSD32_SYS_AUE_freebsd32_sigqueue AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_kmq_open AUE_MQ_OPEN
#define FREEBSD32_SYS_AUE_freebsd32_kmq_setattr AUE_MQ_SETATTR
#define FREEBSD32_SYS_AUE_freebsd32_kmq_timedreceive AUE_MQ_TIMEDRECEIVE
Modified: head/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscall.h Fri May 5 18:49:39 2017 (r317845)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h Fri May 5 18:50:22 2017 (r317846)
@@ -358,7 +358,7 @@
#define FREEBSD32_SYS_auditctl 453
#define FREEBSD32_SYS_freebsd32_umtx_op 454
#define FREEBSD32_SYS_freebsd32_thr_new 455
-#define FREEBSD32_SYS_sigqueue 456
+#define FREEBSD32_SYS_freebsd32_sigqueue 456
#define FREEBSD32_SYS_freebsd32_kmq_open 457
#define FREEBSD32_SYS_freebsd32_kmq_setattr 458
#define FREEBSD32_SYS_freebsd32_kmq_timedreceive 459
Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscalls.c Fri May 5 18:49:39 2017 (r317845)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c Fri May 5 18:50:22 2017 (r317846)
@@ -465,7 +465,7 @@ const char *freebsd32_syscallnames[] = {
"auditctl", /* 453 = auditctl */
"freebsd32_umtx_op", /* 454 = freebsd32_umtx_op */
"freebsd32_thr_new", /* 455 = freebsd32_thr_new */
- "sigqueue", /* 456 = sigqueue */
+ "freebsd32_sigqueue", /* 456 = freebsd32_sigqueue */
"freebsd32_kmq_open", /* 457 = freebsd32_kmq_open */
"freebsd32_kmq_setattr", /* 458 = freebsd32_kmq_setattr */
"freebsd32_kmq_timedreceive", /* 459 = freebsd32_kmq_timedreceive */
Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c Fri May 5 18:49:39 2017 (r317845)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c Fri May 5 18:50:22 2017 (r317846)
@@ -508,7 +508,7 @@ struct sysent freebsd32_sysent[] = {
{ AS(auditctl_args), (sy_call_t *)sys_auditctl, AUE_AUDITCTL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 453 = auditctl */
{ AS(freebsd32_umtx_op_args), (sy_call_t *)freebsd32_umtx_op, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 454 = freebsd32_umtx_op */
{ AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, AUE_THR_NEW, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 455 = freebsd32_thr_new */
- { AS(sigqueue_args), (sy_call_t *)sys_sigqueue, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 456 = sigqueue */
+ { AS(freebsd32_sigqueue_args), (sy_call_t *)freebsd32_sigqueue, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 456 = freebsd32_sigqueue */
{ AS(freebsd32_kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 457 = freebsd32_kmq_open */
{ AS(freebsd32_kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT }, /* 458 = freebsd32_kmq_setattr */
{ AS(freebsd32_kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT }, /* 459 = freebsd32_kmq_timedreceive */
Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri May 5 18:49:39 2017 (r317845)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri May 5 18:50:22 2017 (r317846)
@@ -2355,12 +2355,12 @@ systrace_args(int sysnum, void *params,
*n_args = 2;
break;
}
- /* sigqueue */
+ /* freebsd32_sigqueue */
case 456: {
- struct sigqueue_args *p = params;
+ struct freebsd32_sigqueue_args *p = params;
iarg[0] = p->pid; /* pid_t */
iarg[1] = p->signum; /* int */
- uarg[2] = (intptr_t) p->value; /* void * */
+ iarg[2] = p->value; /* int */
*n_args = 3;
break;
}
@@ -7130,7 +7130,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* sigqueue */
+ /* freebsd32_sigqueue */
case 456:
switch(ndx) {
case 0:
@@ -7140,7 +7140,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "int";
break;
case 2:
- p = "userland void *";
+ p = "int";
break;
default:
break;
@@ -10305,7 +10305,7 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* sigqueue */
+ /* freebsd32_sigqueue */
case 456:
if (ndx == 0 || ndx == 1)
p = "int";
More information about the svn-src-head
mailing list