This commit is contained in:
Konstantin Belousov 2020-12-04 18:58:27 +00:00
parent 31df9c26c5
commit d7d95c3ff8
5 changed files with 14 additions and 9 deletions

View File

@ -168,6 +168,9 @@ struct freebsd32_shmsys_args {
char a3_l_[PADL_(uint32_t)]; uint32_t a3; char a3_r_[PADR_(uint32_t)];
char a4_l_[PADL_(uint32_t)]; uint32_t a4; char a4_r_[PADR_(uint32_t)];
};
struct freebsd32_ntp_adjtime_args {
char tp_l_[PADL_(struct timex32 *)]; struct timex32 * tp; char tp_r_[PADR_(struct timex32 *)];
};
struct freebsd32___sysctl_args {
char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)];
char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)];
@ -769,6 +772,7 @@ int freebsd32_sysarch(struct thread *, struct freebsd32_sysarch_args *);
int freebsd32_semsys(struct thread *, struct freebsd32_semsys_args *);
int freebsd32_msgsys(struct thread *, struct freebsd32_msgsys_args *);
int freebsd32_shmsys(struct thread *, struct freebsd32_shmsys_args *);
int freebsd32_ntp_adjtime(struct thread *, struct freebsd32_ntp_adjtime_args *);
int freebsd32___sysctl(struct thread *, struct freebsd32___sysctl_args *);
int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *);
int freebsd32_msgsnd(struct thread *, struct freebsd32_msgsnd_args *);
@ -1342,6 +1346,7 @@ int freebsd11_freebsd32_fstatat(struct thread *, struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd32_shmsys AUE_SHMSYS
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_pread AUE_PREAD
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_pwrite AUE_PWRITE
#define FREEBSD32_SYS_AUE_freebsd32_ntp_adjtime AUE_NTP_ADJTIME
#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_stat AUE_STAT
#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_fstat AUE_FSTAT
#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_lstat AUE_LSTAT

View File

@ -167,7 +167,7 @@
#define FREEBSD32_SYS_freebsd32_shmsys 171
/* 173 is freebsd6 freebsd32_pread */
/* 174 is freebsd6 freebsd32_pwrite */
#define FREEBSD32_SYS_ntp_adjtime 176
#define FREEBSD32_SYS_freebsd32_ntp_adjtime 176
#define FREEBSD32_SYS_setgid 181
#define FREEBSD32_SYS_setegid 182
#define FREEBSD32_SYS_seteuid 183

View File

@ -185,7 +185,7 @@ const char *freebsd32_syscallnames[] = {
"compat6.freebsd32_pread", /* 173 = freebsd6 freebsd32_pread */
"compat6.freebsd32_pwrite", /* 174 = freebsd6 freebsd32_pwrite */
"#175", /* 175 = nosys */
"ntp_adjtime", /* 176 = ntp_adjtime */
"freebsd32_ntp_adjtime", /* 176 = freebsd32_ntp_adjtime */
"#177", /* 177 = sfork */
"#178", /* 178 = getdescriptor */
"#179", /* 179 = setdescriptor */

View File

@ -238,7 +238,7 @@ struct sysent freebsd32_sysent[] = {
{ compat6(AS(freebsd6_freebsd32_pread_args),freebsd32_pread), .sy_auevent = AUE_PREAD, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 173 = freebsd6 freebsd32_pread */
{ compat6(AS(freebsd6_freebsd32_pwrite_args),freebsd32_pwrite), .sy_auevent = AUE_PWRITE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 174 = freebsd6 freebsd32_pwrite */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 175 = nosys */
{ .sy_narg = AS(ntp_adjtime_args), .sy_call = (sy_call_t *)sys_ntp_adjtime, .sy_auevent = AUE_NTP_ADJTIME, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 176 = ntp_adjtime */
{ .sy_narg = AS(freebsd32_ntp_adjtime_args), .sy_call = (sy_call_t *)freebsd32_ntp_adjtime, .sy_auevent = AUE_NTP_ADJTIME, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 176 = freebsd32_ntp_adjtime */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 177 = sfork */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 178 = getdescriptor */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 179 = setdescriptor */

View File

@ -870,10 +870,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
*n_args = 4;
break;
}
/* ntp_adjtime */
/* freebsd32_ntp_adjtime */
case 176: {
struct ntp_adjtime_args *p = params;
uarg[0] = (intptr_t) p->tp; /* struct timex * */
struct freebsd32_ntp_adjtime_args *p = params;
uarg[0] = (intptr_t) p->tp; /* struct timex32 * */
*n_args = 1;
break;
}
@ -4786,11 +4786,11 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
break;
};
break;
/* ntp_adjtime */
/* freebsd32_ntp_adjtime */
case 176:
switch(ndx) {
case 0:
p = "userland struct timex *";
p = "userland struct timex32 *";
break;
default:
break;
@ -9629,7 +9629,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
/* ntp_adjtime */
/* freebsd32_ntp_adjtime */
case 176:
if (ndx == 0 || ndx == 1)
p = "int";