Author: markj
Date: Tue Jan 21 17:28:36 2020
New Revision: 356946
URL: https://svnweb.freebsd.org/changeset/base/356946
Log:
Regen.
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/amd64/linux32/linux32_proto.h
head/sys/amd64/linux32/linux32_systrace_args.c
Modified: head/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- head/sys/amd64/linux32/linux32_proto.h Tue Jan 21 17:28:22 2020
(r356945)
+++ head/sys/amd64/linux32/linux32_proto.h Tue Jan 21 17:28:36 2020
(r356946)
@@ -574,13 +574,15 @@ struct linux_pread_args {
char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char
nbyte_r_[PADR_(l_size_t)];
- char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char
offset_r_[PADR_(l_loff_t)];
+ char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char
offset1_r_[PADR_(uint32_t)];
+ char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char
offset2_r_[PADR_(uint32_t)];
};
struct linux_pwrite_args {
char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
char nbyte_l_[PADL_(l_size_t)]; l_size_t nbyte; char
nbyte_r_[PADR_(l_size_t)];
- char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char
offset_r_[PADR_(l_loff_t)];
+ char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char
offset1_r_[PADR_(uint32_t)];
+ char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char
offset2_r_[PADR_(uint32_t)];
};
struct linux_chown16_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@@ -623,11 +625,13 @@ struct linux_mmap2_args {
};
struct linux_truncate64_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char length_l_[PADL_(l_loff_t)]; l_loff_t length; char
length_r_[PADR_(l_loff_t)];
+ char length1_l_[PADL_(uint32_t)]; uint32_t length1; char
length1_r_[PADR_(uint32_t)];
+ char length2_l_[PADL_(uint32_t)]; uint32_t length2; char
length2_r_[PADR_(uint32_t)];
};
struct linux_ftruncate64_args {
char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
- char length_l_[PADL_(l_loff_t)]; l_loff_t length; char
length_r_[PADR_(l_loff_t)];
+ char length1_l_[PADL_(uint32_t)]; uint32_t length1; char
length1_r_[PADR_(uint32_t)];
+ char length2_l_[PADL_(uint32_t)]; uint32_t length2; char
length2_r_[PADR_(uint32_t)];
};
struct linux_stat64_args {
char filename_l_[PADL_(const char *)]; const char * filename; char
filename_r_[PADR_(const char *)];
@@ -756,7 +760,8 @@ struct linux_set_thread_area_args {
};
struct linux_fadvise64_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char
offset_r_[PADR_(l_loff_t)];
+ char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char
offset1_r_[PADR_(uint32_t)];
+ char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char
offset2_r_[PADR_(uint32_t)];
char len_l_[PADL_(l_size_t)]; l_size_t len; char
len_r_[PADR_(l_size_t)];
char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
};
@@ -847,8 +852,10 @@ struct linux_utimes_args {
};
struct linux_fadvise64_64_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(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)];
+ char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char
offset1_r_[PADR_(uint32_t)];
+ char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char
offset2_r_[PADR_(uint32_t)];
+ char len1_l_[PADL_(uint32_t)]; uint32_t len1; char
len1_r_[PADR_(uint32_t)];
+ char len2_l_[PADL_(uint32_t)]; uint32_t len2; char
len2_r_[PADR_(uint32_t)];
char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
};
struct linux_mbind_args {
@@ -1021,8 +1028,10 @@ struct linux_splice_args {
};
struct linux_sync_file_range_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
- char offset_l_[PADL_(l_loff_t)]; l_loff_t offset; char
offset_r_[PADR_(l_loff_t)];
- char nbytes_l_[PADL_(l_loff_t)]; l_loff_t nbytes; char
nbytes_r_[PADR_(l_loff_t)];
+ char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char
offset1_r_[PADR_(uint32_t)];
+ char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char
offset2_r_[PADR_(uint32_t)];
+ char nbytes1_l_[PADL_(uint32_t)]; uint32_t nbytes1; char
nbytes1_r_[PADR_(uint32_t)];
+ char nbytes2_l_[PADL_(uint32_t)]; uint32_t nbytes2; char
nbytes2_r_[PADR_(uint32_t)];
char flags_l_[PADL_(unsigned int)]; unsigned int flags; char
flags_r_[PADR_(unsigned int)];
};
struct linux_tee_args {
@@ -1066,8 +1075,10 @@ struct linux_eventfd_args {
struct linux_fallocate_args {
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)];
+ char offset1_l_[PADL_(uint32_t)]; uint32_t offset1; char
offset1_r_[PADR_(uint32_t)];
+ char offset2_l_[PADL_(uint32_t)]; uint32_t offset2; char
offset2_r_[PADR_(uint32_t)];
+ char len1_l_[PADL_(uint32_t)]; uint32_t len1; char
len1_r_[PADR_(uint32_t)];
+ char len2_l_[PADL_(uint32_t)]; uint32_t len2; char
len2_r_[PADR_(uint32_t)];
};
struct linux_timerfd_settime_args {
char fd_l_[PADL_(l_int)]; l_int fd; char fd_r_[PADR_(l_int)];
Modified: head/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- head/sys/amd64/linux32/linux32_systrace_args.c Tue Jan 21 17:28:22
2020 (r356945)
+++ head/sys/amd64/linux32/linux32_systrace_args.c Tue Jan 21 17:28:36
2020 (r356946)
@@ -1235,8 +1235,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->fd; /* l_uint */
uarg[1] = (intptr_t) p->buf; /* char * */
iarg[2] = p->nbyte; /* l_size_t */
- iarg[3] = p->offset; /* l_loff_t */
- *n_args = 4;
+ uarg[3] = p->offset1; /* uint32_t */
+ uarg[4] = p->offset2; /* uint32_t */
+ *n_args = 5;
break;
}
/* linux_pwrite */
@@ -1245,8 +1246,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
iarg[0] = p->fd; /* l_uint */
uarg[1] = (intptr_t) p->buf; /* char * */
iarg[2] = p->nbyte; /* l_size_t */
- iarg[3] = p->offset; /* l_loff_t */
- *n_args = 4;
+ uarg[3] = p->offset1; /* uint32_t */
+ uarg[4] = p->offset2; /* uint32_t */
+ *n_args = 5;
break;
}
/* linux_chown16 */
@@ -1324,16 +1326,18 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 193: {
struct linux_truncate64_args *p = params;
uarg[0] = (intptr_t) p->path; /* char * */
- iarg[1] = p->length; /* l_loff_t */
- *n_args = 2;
+ uarg[1] = p->length1; /* uint32_t */
+ uarg[2] = p->length2; /* uint32_t */
+ *n_args = 3;
break;
}
/* linux_ftruncate64 */
case 194: {
struct linux_ftruncate64_args *p = params;
iarg[0] = p->fd; /* l_uint */
- iarg[1] = p->length; /* l_loff_t */
- *n_args = 2;
+ uarg[1] = p->length1; /* uint32_t */
+ uarg[2] = p->length2; /* uint32_t */
+ *n_args = 3;
break;
}
/* linux_stat64 */
@@ -1657,10 +1661,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 250: {
struct linux_fadvise64_args *p = params;
iarg[0] = p->fd; /* int */
- iarg[1] = p->offset; /* l_loff_t */
- iarg[2] = p->len; /* l_size_t */
- iarg[3] = p->advice; /* int */
- *n_args = 4;
+ uarg[1] = p->offset1; /* uint32_t */
+ uarg[2] = p->offset2; /* uint32_t */
+ iarg[3] = p->len; /* l_size_t */
+ iarg[4] = p->advice; /* int */
+ *n_args = 5;
break;
}
/* linux_exit_group */
@@ -1828,10 +1833,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 272: {
struct linux_fadvise64_64_args *p = params;
iarg[0] = p->fd; /* int */
- iarg[1] = p->offset; /* l_loff_t */
- iarg[2] = p->len; /* l_loff_t */
- iarg[3] = p->advice; /* int */
- *n_args = 4;
+ uarg[1] = p->offset1; /* uint32_t */
+ uarg[2] = p->offset2; /* uint32_t */
+ uarg[3] = p->len1; /* uint32_t */
+ uarg[4] = p->len2; /* uint32_t */
+ iarg[5] = p->advice; /* int */
+ *n_args = 6;
break;
}
/* linux_mbind */
@@ -2120,10 +2127,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
case 314: {
struct linux_sync_file_range_args *p = params;
iarg[0] = p->fd; /* l_int */
- iarg[1] = p->offset; /* l_loff_t */
- iarg[2] = p->nbytes; /* l_loff_t */
- uarg[3] = p->flags; /* unsigned int */
- *n_args = 4;
+ uarg[1] = p->offset1; /* uint32_t */
+ uarg[2] = p->offset2; /* uint32_t */
+ uarg[3] = p->nbytes1; /* uint32_t */
+ uarg[4] = p->nbytes2; /* uint32_t */
+ uarg[5] = p->flags; /* unsigned int */
+ *n_args = 6;
break;
}
/* linux_tee */
@@ -2197,9 +2206,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
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;
+ uarg[2] = p->offset1; /* uint32_t */
+ uarg[3] = p->offset2; /* uint32_t */
+ uarg[4] = p->len1; /* uint32_t */
+ uarg[5] = p->len2; /* uint32_t */
+ *n_args = 6;
break;
}
/* linux_timerfd_settime */
@@ -4875,8 +4886,11 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_size_t";
break;
case 3:
- p = "l_loff_t";
+ p = "uint32_t";
break;
+ case 4:
+ p = "uint32_t";
+ break;
default:
break;
};
@@ -4894,8 +4908,11 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_size_t";
break;
case 3:
- p = "l_loff_t";
+ p = "uint32_t";
break;
+ case 4:
+ p = "uint32_t";
+ break;
default:
break;
};
@@ -5019,8 +5036,11 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "userland char *";
break;
case 1:
- p = "l_loff_t";
+ p = "uint32_t";
break;
+ case 2:
+ p = "uint32_t";
+ break;
default:
break;
};
@@ -5032,8 +5052,11 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_uint";
break;
case 1:
- p = "l_loff_t";
+ p = "uint32_t";
break;
+ case 2:
+ p = "uint32_t";
+ break;
default:
break;
};
@@ -5483,12 +5506,15 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "int";
break;
case 1:
- p = "l_loff_t";
+ p = "uint32_t";
break;
case 2:
- p = "l_size_t";
+ p = "uint32_t";
break;
case 3:
+ p = "l_size_t";
+ break;
+ case 4:
p = "int";
break;
default:
@@ -5763,12 +5789,18 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "int";
break;
case 1:
- p = "l_loff_t";
+ p = "uint32_t";
break;
case 2:
- p = "l_loff_t";
+ p = "uint32_t";
break;
case 3:
+ p = "uint32_t";
+ break;
+ case 4:
+ p = "uint32_t";
+ break;
+ case 5:
p = "int";
break;
default:
@@ -6178,12 +6210,18 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_int";
break;
case 1:
- p = "l_loff_t";
+ p = "uint32_t";
break;
case 2:
- p = "l_loff_t";
+ p = "uint32_t";
break;
case 3:
+ p = "uint32_t";
+ break;
+ case 4:
+ p = "uint32_t";
+ break;
+ case 5:
p = "unsigned int";
break;
default:
@@ -6295,10 +6333,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
p = "l_int";
break;
case 2:
- p = "l_loff_t";
+ p = "uint32_t";
break;
case 3:
- p = "l_loff_t";
+ p = "uint32_t";
+ break;
+ case 4:
+ p = "uint32_t";
+ break;
+ case 5:
+ p = "uint32_t";
break;
default:
break;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
