The branch main has been updated by dchagin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0c08f34f4ddff9847bd57f262270687ea1220a6a
commit 0c08f34f4ddff9847bd57f262270687ea1220a6a
Author: Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2021-08-12 08:47:31 +0000
Commit: Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2021-08-12 08:47:31 +0000
linux(4): Regen for clone syscall.
MFC after: 2 weeks
---
sys/amd64/linux/linux_proto.h | 8 ++++----
sys/amd64/linux/linux_systrace_args.c | 16 ++++++++--------
sys/amd64/linux32/linux32_proto.h | 10 +++++-----
sys/amd64/linux32/linux32_systrace_args.c | 20 ++++++++++----------
sys/arm/linux/linux_proto.h | 10 +++++-----
sys/arm/linux/linux_systrace_args.c | 20 ++++++++++----------
sys/arm64/linux/linux_proto.h | 8 ++++----
sys/arm64/linux/linux_systrace_args.c | 16 ++++++++--------
sys/i386/linux/linux_proto.h | 10 +++++-----
sys/i386/linux/linux_systrace_args.c | 20 ++++++++++----------
10 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h
index 10f460cc0f7b..5ebf28723c64 100644
--- a/sys/amd64/linux/linux_proto.h
+++ b/sys/amd64/linux/linux_proto.h
@@ -275,10 +275,10 @@ struct linux_getsockopt_args {
};
struct linux_clone_args {
char flags_l_[PADL_(l_ulong)]; l_ulong flags; char
flags_r_[PADR_(l_ulong)];
- char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void
*)];
- char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char
parent_tidptr_r_[PADR_(void *)];
- char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char
child_tidptr_r_[PADR_(void *)];
- char tls_l_[PADL_(void *)]; void * tls; char tls_r_[PADR_(void *)];
+ char stack_l_[PADL_(l_ulong)]; l_ulong stack; char
stack_r_[PADR_(l_ulong)];
+ char parent_tidptr_l_[PADL_(l_int *)]; l_int * parent_tidptr; char
parent_tidptr_r_[PADR_(l_int *)];
+ char child_tidptr_l_[PADL_(l_int *)]; l_int * child_tidptr; char
child_tidptr_r_[PADR_(l_int *)];
+ char tls_l_[PADL_(l_ulong)]; l_ulong tls; char tls_r_[PADR_(l_ulong)];
};
struct linux_fork_args {
register_t dummy;
diff --git a/sys/amd64/linux/linux_systrace_args.c
b/sys/amd64/linux/linux_systrace_args.c
index ba0776542a29..3101b8672ce2 100644
--- a/sys/amd64/linux/linux_systrace_args.c
+++ b/sys/amd64/linux/linux_systrace_args.c
@@ -509,10 +509,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
case 56: {
struct linux_clone_args *p = params;
iarg[0] = p->flags; /* l_ulong */
- uarg[1] = (intptr_t)p->stack; /* void * */
- uarg[2] = (intptr_t)p->parent_tidptr; /* void * */
- uarg[3] = (intptr_t)p->child_tidptr; /* void * */
- uarg[4] = (intptr_t)p->tls; /* void * */
+ iarg[1] = p->stack; /* l_ulong */
+ uarg[2] = (intptr_t)p->parent_tidptr; /* l_int * */
+ uarg[3] = (intptr_t)p->child_tidptr; /* l_int * */
+ iarg[4] = p->tls; /* l_ulong */
*n_args = 5;
break;
}
@@ -3598,16 +3598,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "l_ulong";
break;
case 1:
- p = "userland void *";
+ p = "l_ulong";
break;
case 2:
- p = "userland void *";
+ p = "userland l_int *";
break;
case 3:
- p = "userland void *";
+ p = "userland l_int *";
break;
case 4:
- p = "userland void *";
+ p = "l_ulong";
break;
default:
break;
diff --git a/sys/amd64/linux32/linux32_proto.h
b/sys/amd64/linux32/linux32_proto.h
index 49adaaacc876..07e673a862ad 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -377,11 +377,11 @@ struct linux_sigreturn_args {
char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char
sfp_r_[PADR_(struct l_sigframe *)];
};
struct linux_clone_args {
- char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
- char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void
*)];
- char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char
parent_tidptr_r_[PADR_(void *)];
- char tls_l_[PADL_(void *)]; void * tls; char tls_r_[PADR_(void *)];
- char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char
child_tidptr_r_[PADR_(void *)];
+ char flags_l_[PADL_(l_ulong)]; l_ulong flags; char
flags_r_[PADR_(l_ulong)];
+ char stack_l_[PADL_(l_ulong)]; l_ulong stack; char
stack_r_[PADR_(l_ulong)];
+ char parent_tidptr_l_[PADL_(l_int *)]; l_int * parent_tidptr; char
parent_tidptr_r_[PADR_(l_int *)];
+ char tls_l_[PADL_(l_ulong)]; l_ulong tls; char tls_r_[PADR_(l_ulong)];
+ char child_tidptr_l_[PADL_(l_int *)]; l_int * child_tidptr; char
child_tidptr_r_[PADR_(l_int *)];
};
struct linux_setdomainname_args {
char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)];
diff --git a/sys/amd64/linux32/linux32_systrace_args.c
b/sys/amd64/linux32/linux32_systrace_args.c
index a1186b6a29d7..79605a335aaf 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -808,11 +808,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
/* linux_clone */
case 120: {
struct linux_clone_args *p = params;
- iarg[0] = p->flags; /* l_int */
- uarg[1] = (intptr_t)p->stack; /* void * */
- uarg[2] = (intptr_t)p->parent_tidptr; /* void * */
- uarg[3] = (intptr_t)p->tls; /* void * */
- uarg[4] = (intptr_t)p->child_tidptr; /* void * */
+ iarg[0] = p->flags; /* l_ulong */
+ iarg[1] = p->stack; /* l_ulong */
+ uarg[2] = (intptr_t)p->parent_tidptr; /* l_int * */
+ iarg[3] = p->tls; /* l_ulong */
+ uarg[4] = (intptr_t)p->child_tidptr; /* l_int * */
*n_args = 5;
break;
}
@@ -4431,19 +4431,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 120:
switch (ndx) {
case 0:
- p = "l_int";
+ p = "l_ulong";
break;
case 1:
- p = "userland void *";
+ p = "l_ulong";
break;
case 2:
- p = "userland void *";
+ p = "userland l_int *";
break;
case 3:
- p = "userland void *";
+ p = "l_ulong";
break;
case 4:
- p = "userland void *";
+ p = "userland l_int *";
break;
default:
break;
diff --git a/sys/arm/linux/linux_proto.h b/sys/arm/linux/linux_proto.h
index 131fa227e8f8..07245d6db4f3 100644
--- a/sys/arm/linux/linux_proto.h
+++ b/sys/arm/linux/linux_proto.h
@@ -292,11 +292,11 @@ struct linux_sigreturn_args {
char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char
sfp_r_[PADR_(struct l_sigframe *)];
};
struct linux_clone_args {
- char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
- char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void
*)];
- char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char
parent_tidptr_r_[PADR_(void *)];
- char tls_l_[PADL_(void *)]; void * tls; char tls_r_[PADR_(void *)];
- char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char
child_tidptr_r_[PADR_(void *)];
+ char flags_l_[PADL_(l_ulong)]; l_ulong flags; char
flags_r_[PADR_(l_ulong)];
+ char stack_l_[PADL_(l_ulong)]; l_ulong stack; char
stack_r_[PADR_(l_ulong)];
+ char parent_tidptr_l_[PADL_(l_int *)]; l_int * parent_tidptr; char
parent_tidptr_r_[PADR_(l_int *)];
+ char tls_l_[PADL_(l_ulong)]; l_ulong tls; char tls_r_[PADR_(l_ulong)];
+ char child_tidptr_l_[PADL_(l_int *)]; l_int * child_tidptr; char
child_tidptr_r_[PADR_(l_int *)];
};
struct linux_setdomainname_args {
char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)];
diff --git a/sys/arm/linux/linux_systrace_args.c
b/sys/arm/linux/linux_systrace_args.c
index f35bb0c6b906..16591890ea9a 100644
--- a/sys/arm/linux/linux_systrace_args.c
+++ b/sys/arm/linux/linux_systrace_args.c
@@ -651,11 +651,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
/* linux_clone */
case 120: {
struct linux_clone_args *p = params;
- iarg[0] = p->flags; /* l_int */
- uarg[1] = (intptr_t)p->stack; /* void * */
- uarg[2] = (intptr_t)p->parent_tidptr; /* void * */
- uarg[3] = (intptr_t)p->tls; /* void * */
- uarg[4] = (intptr_t)p->child_tidptr; /* void * */
+ iarg[0] = p->flags; /* l_ulong */
+ iarg[1] = p->stack; /* l_ulong */
+ uarg[2] = (intptr_t)p->parent_tidptr; /* l_int * */
+ iarg[3] = p->tls; /* l_ulong */
+ uarg[4] = (intptr_t)p->child_tidptr; /* l_int * */
*n_args = 5;
break;
}
@@ -3477,19 +3477,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 120:
switch (ndx) {
case 0:
- p = "l_int";
+ p = "l_ulong";
break;
case 1:
- p = "userland void *";
+ p = "l_ulong";
break;
case 2:
- p = "userland void *";
+ p = "userland l_int *";
break;
case 3:
- p = "userland void *";
+ p = "l_ulong";
break;
case 4:
- p = "userland void *";
+ p = "userland l_int *";
break;
default:
break;
diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index 37296827d312..83237b046f85 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -861,10 +861,10 @@ struct linux_keyctl_args {
};
struct linux_clone_args {
char flags_l_[PADL_(l_ulong)]; l_ulong flags; char
flags_r_[PADR_(l_ulong)];
- char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void
*)];
- char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char
parent_tidptr_r_[PADR_(void *)];
- char tls_l_[PADL_(void *)]; void * tls; char tls_r_[PADR_(void *)];
- char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char
child_tidptr_r_[PADR_(void *)];
+ char stack_l_[PADL_(l_ulong)]; l_ulong stack; char
stack_r_[PADR_(l_ulong)];
+ char parent_tidptr_l_[PADL_(l_int *)]; l_int * parent_tidptr; char
parent_tidptr_r_[PADR_(l_int *)];
+ char tls_l_[PADL_(l_ulong)]; l_ulong tls; char tls_r_[PADR_(l_ulong)];
+ char child_tidptr_l_[PADL_(l_int *)]; l_int * child_tidptr; char
child_tidptr_r_[PADR_(l_int *)];
};
struct linux_execve_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
diff --git a/sys/arm64/linux/linux_systrace_args.c
b/sys/arm64/linux/linux_systrace_args.c
index f3838d2c52f9..6c0eeb5ae0f4 100644
--- a/sys/arm64/linux/linux_systrace_args.c
+++ b/sys/arm64/linux/linux_systrace_args.c
@@ -1746,10 +1746,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
case 220: {
struct linux_clone_args *p = params;
iarg[0] = p->flags; /* l_ulong */
- uarg[1] = (intptr_t)p->stack; /* void * */
- uarg[2] = (intptr_t)p->parent_tidptr; /* void * */
- uarg[3] = (intptr_t)p->tls; /* void * */
- uarg[4] = (intptr_t)p->child_tidptr; /* void * */
+ iarg[1] = p->stack; /* l_ulong */
+ uarg[2] = (intptr_t)p->parent_tidptr; /* l_int * */
+ iarg[3] = p->tls; /* l_ulong */
+ uarg[4] = (intptr_t)p->child_tidptr; /* l_int * */
*n_args = 5;
break;
}
@@ -5222,16 +5222,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
p = "l_ulong";
break;
case 1:
- p = "userland void *";
+ p = "l_ulong";
break;
case 2:
- p = "userland void *";
+ p = "userland l_int *";
break;
case 3:
- p = "userland void *";
+ p = "l_ulong";
break;
case 4:
- p = "userland void *";
+ p = "userland l_int *";
break;
default:
break;
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index cdda5da13870..24b912757e61 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -380,11 +380,11 @@ struct linux_sigreturn_args {
char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char
sfp_r_[PADR_(struct l_sigframe *)];
};
struct linux_clone_args {
- char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
- char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void
*)];
- char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char
parent_tidptr_r_[PADR_(void *)];
- char tls_l_[PADL_(void *)]; void * tls; char tls_r_[PADR_(void *)];
- char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char
child_tidptr_r_[PADR_(void *)];
+ char flags_l_[PADL_(l_ulong)]; l_ulong flags; char
flags_r_[PADR_(l_ulong)];
+ char stack_l_[PADL_(l_ulong)]; l_ulong stack; char
stack_r_[PADR_(l_ulong)];
+ char parent_tidptr_l_[PADL_(l_int *)]; l_int * parent_tidptr; char
parent_tidptr_r_[PADR_(l_int *)];
+ char tls_l_[PADL_(l_ulong)]; l_ulong tls; char tls_r_[PADR_(l_ulong)];
+ char child_tidptr_l_[PADL_(l_int *)]; l_int * child_tidptr; char
child_tidptr_r_[PADR_(l_int *)];
};
struct linux_setdomainname_args {
char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)];
diff --git a/sys/i386/linux/linux_systrace_args.c
b/sys/i386/linux/linux_systrace_args.c
index 4e8d180751a3..0752304d5872 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -837,11 +837,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
/* linux_clone */
case 120: {
struct linux_clone_args *p = params;
- iarg[0] = p->flags; /* l_int */
- uarg[1] = (intptr_t)p->stack; /* void * */
- uarg[2] = (intptr_t)p->parent_tidptr; /* void * */
- uarg[3] = (intptr_t)p->tls; /* void * */
- uarg[4] = (intptr_t)p->child_tidptr; /* void * */
+ iarg[0] = p->flags; /* l_ulong */
+ iarg[1] = p->stack; /* l_ulong */
+ uarg[2] = (intptr_t)p->parent_tidptr; /* l_int * */
+ iarg[3] = p->tls; /* l_ulong */
+ uarg[4] = (intptr_t)p->child_tidptr; /* l_int * */
*n_args = 5;
break;
}
@@ -4512,19 +4512,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 120:
switch (ndx) {
case 0:
- p = "l_int";
+ p = "l_ulong";
break;
case 1:
- p = "userland void *";
+ p = "l_ulong";
break;
case 2:
- p = "userland void *";
+ p = "userland l_int *";
break;
case 3:
- p = "userland void *";
+ p = "l_ulong";
break;
case 4:
- p = "userland void *";
+ p = "userland l_int *";
break;
default:
break;
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
