Regen for r314312 (Linux epoll_pwait).

MFC after:	1 month
This commit is contained in:
dchagin 2017-02-26 19:59:28 +00:00
parent 8a318fc47b
commit 948e5bcce0
6 changed files with 18 additions and 3 deletions

View File

@ -995,6 +995,7 @@ struct linux_epoll_pwait_args {
char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)]; char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)];
char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)]; char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)];
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
}; };
struct linux_signalfd_args { struct linux_signalfd_args {
register_t dummy; register_t dummy;

View File

@ -2068,7 +2068,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
iarg[2] = p->maxevents; /* l_int */ iarg[2] = p->maxevents; /* l_int */
iarg[3] = p->timeout; /* l_int */ iarg[3] = p->timeout; /* l_int */
uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */ uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */
*n_args = 5; iarg[5] = p->sigsetsize; /* l_size_t */
*n_args = 6;
break; break;
} }
/* linux_signalfd */ /* linux_signalfd */
@ -5646,6 +5647,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 4: case 4:
p = "userland l_sigset_t *"; p = "userland l_sigset_t *";
break; break;
case 5:
p = "l_size_t";
break;
default: default:
break; break;
}; };

View File

@ -1051,6 +1051,7 @@ struct linux_epoll_pwait_args {
char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)]; char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)];
char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)]; char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)];
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
}; };
struct linux_utimensat_args { struct linux_utimensat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];

View File

@ -2169,7 +2169,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
iarg[2] = p->maxevents; /* l_int */ iarg[2] = p->maxevents; /* l_int */
iarg[3] = p->timeout; /* l_int */ iarg[3] = p->timeout; /* l_int */
uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */ uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */
*n_args = 5; iarg[5] = p->sigsetsize; /* l_size_t */
*n_args = 6;
break; break;
} }
/* linux_utimensat */ /* linux_utimensat */
@ -5981,6 +5982,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 4: case 4:
p = "userland l_sigset_t *"; p = "userland l_sigset_t *";
break; break;
case 5:
p = "l_size_t";
break;
default: default:
break; break;
}; };

View File

@ -1069,6 +1069,7 @@ struct linux_epoll_pwait_args {
char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)]; char maxevents_l_[PADL_(l_int)]; l_int maxevents; char maxevents_r_[PADR_(l_int)];
char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)]; char timeout_l_[PADL_(l_int)]; l_int timeout; char timeout_r_[PADR_(l_int)];
char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)]; char mask_l_[PADL_(l_sigset_t *)]; l_sigset_t * mask; char mask_r_[PADR_(l_sigset_t *)];
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
}; };
struct linux_utimensat_args { struct linux_utimensat_args {
char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];

View File

@ -2245,7 +2245,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
iarg[2] = p->maxevents; /* l_int */ iarg[2] = p->maxevents; /* l_int */
iarg[3] = p->timeout; /* l_int */ iarg[3] = p->timeout; /* l_int */
uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */ uarg[4] = (intptr_t) p->mask; /* l_sigset_t * */
*n_args = 5; iarg[5] = p->sigsetsize; /* l_size_t */
*n_args = 6;
break; break;
} }
/* linux_utimensat */ /* linux_utimensat */
@ -6212,6 +6213,9 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 4: case 4:
p = "userland l_sigset_t *"; p = "userland l_sigset_t *";
break; break;
case 5:
p = "l_size_t";
break;
default: default:
break; break;
}; };