d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retire SYF_ARGMASK and remove both SYF_MPSAFE and SYF_ARGMASK. sy_narg is

Browse Source 
now back to just being an argument count.
This commit is contained in:
John Baldwin 2006-07-28 20:22:58 +00:00
parent b5ba473ca0
commit cb76d9b05c
10 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/amd64/amd64/trap.c
View File

@ -778,7 +778,7 @@ syscall(frame)
else
callp = &p->p_sysent->sv_table[code];
narg = callp->sy_narg & SYF_ARGMASK;
narg = callp->sy_narg;
/*
* copyin and the ktrsyscall()/ktrsysret() code is MP-aware

2
sys/amd64/ia32/ia32_syscall.c
View File

@ -154,7 +154,7 @@ ia32_syscall(struct trapframe frame)
else
callp = &p->p_sysent->sv_table[code];
narg = callp->sy_narg & SYF_ARGMASK;
narg = callp->sy_narg;
/*
* copyin and the ktrsyscall()/ktrsysret() code is MP-aware

4
sys/arm/arm/trap.c
View File

@ -910,7 +910,7 @@ syscall(struct thread *td, trapframe_t *frame, u_int32_t insn)
callp = &p->p_sysent->sv_table[0];
else
callp = &p->p_sysent->sv_table[code];
nargs = callp->sy_narg & SYF_ARGMASK;
nargs = callp->sy_narg;
memcpy(copyargs, ap, nap * sizeof(register_t));
if (nargs > nap) {
error = copyin((void *)frame->tf_usr_sp, copyargs + nap,
@ -930,7 +930,7 @@ syscall(struct thread *td, trapframe_t *frame, u_int32_t insn)
if (error == 0) {
td->td_retval[0] = 0;
td->td_retval[1] = 0;
STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK));
STOPEVENT(p, S_SCE, callp->sy_narg);
PTRACESTOP_SC(p, td, S_PT_SCE);
AUDIT_SYSCALL_ENTER(code, td);
error = (*callp->sy_call)(td, args);

2
sys/i386/i386/trap.c
View File

@ -975,7 +975,7 @@ syscall(frame)
else
callp = &p->p_sysent->sv_table[code];
narg = callp->sy_narg & SYF_ARGMASK;
narg = callp->sy_narg;
/*
* copyin and the ktrsyscall()/ktrsysret() code is MP-aware

2
sys/ia64/ia32/ia32_trap.c
View File

@ -96,7 +96,7 @@ ia32_syscall(struct trapframe *tf)
else
callp = &p->p_sysent->sv_table[code];
narg = callp->sy_narg & SYF_ARGMASK;
narg = callp->sy_narg;
/* copyin and the ktrsyscall()/ktrsysret() code is MP-aware */
if (params != NULL && narg != 0)

4
sys/ia64/ia64/trap.c
View File

@ -1003,7 +1003,7 @@ syscall(struct trapframe *tf)
#ifdef KTRACE
if (KTRPOINT(td, KTR_SYSCALL))
ktrsyscall(code, (callp->sy_narg & SYF_ARGMASK), args);
ktrsyscall(code, callp->sy_narg, args);
#endif
CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
td->td_proc->p_pid, td->td_proc->p_comm, code);
@ -1012,7 +1012,7 @@ syscall(struct trapframe *tf)
td->td_retval[1] = 0;
tf->tf_scratch.gr10 = EJUSTRETURN;
STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK));
STOPEVENT(p, S_SCE, callp->sy_narg);
PTRACESTOP_SC(p, td, S_PT_SCE);

2
sys/powerpc/aim/trap.c
View File

@ -389,7 +389,7 @@ syscall(struct trapframe *frame)
else
callp = &p->p_sysent->sv_table[code];
narg = callp->sy_narg & SYF_ARGMASK;
narg = callp->sy_narg;
if (narg > n) {
bcopy(params, args, n * sizeof(register_t));

2
sys/powerpc/powerpc/trap.c
View File

@ -389,7 +389,7 @@ syscall(struct trapframe *frame)
else
callp = &p->p_sysent->sv_table[code];
narg = callp->sy_narg & SYF_ARGMASK;
narg = callp->sy_narg;
if (narg > n) {
bcopy(params, args, n * sizeof(register_t));

2
sys/sparc64/sparc64/trap.c
View File

@ -560,7 +560,7 @@ syscall(struct trapframe *tf)
else
callp = &p->p_sysent->sv_table[code];
narg = callp->sy_narg & SYF_ARGMASK;
narg = callp->sy_narg;
if (narg <= regcnt) {
argp = &tf->tf_out[reg];

3
sys/sys/sysent.h
View File

@ -46,9 +46,6 @@ struct sysent { /* system call table */
au_event_t sy_auevent; /* audit event associated with syscall */
};
#define SYF_ARGMASK 0x0000FFFF
#define SYF_MPSAFE 0x00010000
struct image_params;
struct __sigset;
struct trapframe;