Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass the code out of getargs, so that ktracing __syscall using syscalls

Browse Source 
works.
This commit is contained in:
christos 2005-07-10 19:05:47 +00:00
parent c23eb30613
commit 61a46bc6b1
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/sparc/sparc/syscall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: syscall.c,v 1.1 2005/07/10 17:02:19 christos Exp $ */ /* $NetBSD: syscall.c,v 1.2 2005/07/10 19:07:03 christos Exp $ */
/* /*
* Copyright (c) 1996 * Copyright (c) 1996
@ -49,7 +49,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.1 2005/07/10 17:02:19 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.2 2005/07/10 19:07:03 christos Exp $");
#include "opt_syscall_debug.h" #include "opt_syscall_debug.h"
#include "opt_ktrace.h" #include "opt_ktrace.h"
@ -98,7 +98,7 @@ struct args {
static __inline int handle_new(struct trapframe *, register_t *); static __inline int handle_new(struct trapframe *, register_t *);
static __inline int getargs(struct proc *p, struct trapframe *, static __inline int getargs(struct proc *p, struct trapframe *,
register_t, const struct sysent **, struct args *); register_t *, const struct sysent **, struct args *);
#ifdef FPU_DEBUG #ifdef FPU_DEBUG
static __inline void save_fpu(struct trapframe *); static __inline void save_fpu(struct trapframe *);
#endif #endif
@ -125,7 +125,7 @@ handle_new(struct trapframe *tf, register_t *code)
* ones later as needed. * ones later as needed.
*/ */
static __inline int static __inline int
getargs(struct proc *p, struct trapframe *tf, register_t code, getargs(struct proc *p, struct trapframe *tf, register_t *code,
const struct sysent **callp, struct args *args) const struct sysent **callp, struct args *args)
{ {
int *ap = &tf->tf_out[0]; int *ap = &tf->tf_out[0];
@ -133,24 +133,24 @@ getargs(struct proc *p, struct trapframe *tf, register_t code,
*callp = p->p_emul->e_sysent; *callp = p->p_emul->e_sysent;
switch (code) { switch (*code) {
case SYS_syscall: case SYS_syscall:
code = *ap++; *code = *ap++;
nap--; nap--;
break; break;
case SYS___syscall: case SYS___syscall:
if (!(p->p_emul->e_flags & EMUL_HAS_SYS___syscall)) if (!(p->p_emul->e_flags & EMUL_HAS_SYS___syscall))
break; break;
code = ap[_QUAD_LOWWORD]; *code = ap[_QUAD_LOWWORD];
ap += 2; ap += 2;
nap -= 2; nap -= 2;
break; break;
} }
if (code < 0 || code >= p->p_emul->e_nsysent) if (*code < 0 || *code >= p->p_emul->e_nsysent)
return ENOSYS; return ENOSYS;
*callp += code; *callp += *code;
i = (*callp)->sy_argsize / sizeof(register_t); i = (*callp)->sy_argsize / sizeof(register_t);
if (__predict_false(i > nap)) { /* usually false */ if (__predict_false(i > nap)) { /* usually false */
void *off = (char *)tf->tf_out[6] + void *off = (char *)tf->tf_out[6] +
@ -235,7 +235,7 @@ syscall_plain(register_t code, struct trapframe *tf, register_t pc)
#endif #endif
new = handle_new(tf, &code); new = handle_new(tf, &code);
if ((error = getargs(p, tf, code, &callp, &args)) != 0) if ((error = getargs(p, tf, &code, &callp, &args)) != 0)
goto bad; goto bad;
#ifdef SYSCALL_DEBUG #ifdef SYSCALL_DEBUG
@ -322,7 +322,7 @@ syscall_fancy(register_t code, struct trapframe *tf, register_t pc)
#endif #endif
new = handle_new(tf, &code); new = handle_new(tf, &code);
if ((error = getargs(p, tf, code, &callp, &args)) != 0) if ((error = getargs(p, tf, &code, &callp, &args)) != 0)
goto bad; goto bad;
KERNEL_PROC_LOCK(l); KERNEL_PROC_LOCK(l);

26
sys/arch/sparc64/sparc64/syscall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: syscall.c,v 1.3 2005/07/10 05:17:37 christos Exp $ */ /* $NetBSD: syscall.c,v 1.4 2005/07/10 19:05:47 christos Exp $ */
/*- /*-
* Copyright (c) 2005 The NetBSD Foundation, Inc. * Copyright (c) 2005 The NetBSD Foundation, Inc.
@ -86,7 +86,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.3 2005/07/10 05:17:37 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.4 2005/07/10 19:05:47 christos Exp $");
#define NEW_FPSTATE #define NEW_FPSTATE
@ -134,8 +134,8 @@ union args {
}; };
static __inline int handle_old(struct trapframe64 *, register_t *); static __inline int handle_old(struct trapframe64 *, register_t *);
static __inline int getargs(struct proc *, struct trapframe64 *, register_t, static __inline int getargs(struct proc *, struct trapframe64 *,
const struct sysent **, union args *); register_t *, const struct sysent **, union args *);
void syscall_plain(struct trapframe64 *, register_t, register_t); void syscall_plain(struct trapframe64 *, register_t, register_t);
void syscall_fancy(struct trapframe64 *, register_t, register_t); void syscall_fancy(struct trapframe64 *, register_t, register_t);
@ -167,7 +167,7 @@ handle_old(struct trapframe64 *tf, register_t *code)
* ones later as needed. * ones later as needed.
*/ */
static __inline int static __inline int
getargs(struct proc *p, struct trapframe64 *tf, register_t code, getargs(struct proc *p, struct trapframe64 *tf, register_t *code,
const struct sysent **callp, union args *args) const struct sysent **callp, union args *args)
{ {
int64_t *ap = &tf->tf_out[0]; int64_t *ap = &tf->tf_out[0];
@ -175,29 +175,29 @@ getargs(struct proc *p, struct trapframe64 *tf, register_t code,
int s64 = tf->tf_out[6] & 1L; /* Do we have a 64-bit stack? */ int s64 = tf->tf_out[6] & 1L; /* Do we have a 64-bit stack? */
*callp = p->p_emul->e_sysent; *callp = p->p_emul->e_sysent;
switch (code) { switch (*code) {
case SYS_syscall: case SYS_syscall:
code = *ap++; *code = *ap++;
nap--; nap--;
break; break;
case SYS___syscall: case SYS___syscall:
if (s64) { if (s64) {
/* longs *are* quadwords */ /* longs *are* quadwords */
code = ap[0]; *code = ap[0];
ap += 1; ap += 1;
nap -= 1; nap -= 1;
} else { } else {
code = ap[_QUAD_LOWWORD]; *code = ap[_QUAD_LOWWORD];
ap += 2; ap += 2;
nap -= 2; nap -= 2;
} }
break; break;
} }
if (code < 0 || code >= p->p_emul->e_nsysent) if (*code < 0 || *code >= p->p_emul->e_nsysent)
return ENOSYS; return ENOSYS;
*callp += code; *callp += *code;
if (s64) { if (s64) {
/* 64-bit stack -- not really supported on 32-bit kernels */ /* 64-bit stack -- not really supported on 32-bit kernels */
@ -338,7 +338,7 @@ syscall_plain(struct trapframe64 *tf, register_t code, register_t pc)
tf->tf_npc = tf->tf_pc + 4; tf->tf_npc = tf->tf_pc + 4;
if ((error = getargs(p, tf, code, &callp, &args)) != 0) if ((error = getargs(p, tf, &code, &callp, &args)) != 0)
goto bad; goto bad;
#ifdef SYSCALL_DEBUG #ifdef SYSCALL_DEBUG
@ -436,7 +436,7 @@ syscall_fancy(struct trapframe64 *tf, register_t code, register_t pc)
tf->tf_npc = tf->tf_pc + 4; tf->tf_npc = tf->tf_pc + 4;
if ((error = getargs(p, tf, code, &callp, &args)) != 0) if ((error = getargs(p, tf, &code, &callp, &args)) != 0)
goto bad; goto bad;
#ifdef __arch64__ #ifdef __arch64__