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

ktrace rval[1] - in order to get both fd numbers for pipe()

Browse Source
This commit is contained in:
dsl 2003-05-15 12:56:16 +00:00
parent 3b82314399
commit 88b103687c
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/sparc64/sparc64/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.88 2003/01/21 20:42:03 martin Exp $ */
/* $NetBSD: trap.c,v 1.89 2003/05/15 12:56:17 dsl Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@ -2132,7 +2132,7 @@ syscall(tf, code, pc)
userret(l, pc, sticks);
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET))
ktrsysret(p, code, error, rval[0]);
ktrsysret(p, code, error, rval);
#endif
share_fpu(l, tf);
#ifdef DEBUG

9
sys/kern/kern_ktrace.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_ktrace.c,v 1.70 2003/05/02 12:43:01 yamt Exp $ */
/* $NetBSD: kern_ktrace.c,v 1.71 2003/05/15 12:56:16 dsl Exp $ */
/*
* Copyright (c) 1989, 1993
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.70 2003/05/02 12:43:01 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.71 2003/05/15 12:56:16 dsl Exp $");
#include "opt_ktrace.h"
#include "opt_compat_mach.h"
@ -169,7 +169,7 @@ ktrsysret(p, code, error, retval)
struct proc *p;
register_t code;
int error;
register_t retval;
register_t *retval;
{
struct ktr_header kth;
struct ktr_sysret ktp;
@ -179,7 +179,8 @@ ktrsysret(p, code, error, retval)
ktp.ktr_code = code;
ktp.ktr_eosys = 0; /* XXX unused */
ktp.ktr_error = error;
ktp.ktr_retval = retval; /* what about val2 ? */
ktp.ktr_retval = retval ? retval[0] : 0;
ktp.ktr_retval_1 = retval ? retval[1] : 0;
kth.ktr_buf = (caddr_t)&ktp;
kth.ktr_len = sizeof(struct ktr_sysret);

6
sys/kern/kern_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_subr.c,v 1.97 2003/02/01 06:23:43 thorpej Exp $ */
/* $NetBSD: kern_subr.c,v 1.98 2003/05/15 12:56:16 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.97 2003/02/01 06:23:43 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.98 2003/05/15 12:56:16 dsl Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@ -1315,7 +1315,7 @@ trace_exit(struct lwp *l, register_t code, void *args, register_t rval[],
#ifdef KTRACE
if (KTRPOINT(p, KTR_SYSRET)) {
KERNEL_PROC_LOCK(l);
ktrsysret(p, code, error, rval[0]);
ktrsysret(p, code, error, rval);
KERNEL_PROC_UNLOCK(l);
}
#endif /* KTRACE */

5
sys/sys/ktrace.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ktrace.h,v 1.27 2002/12/21 16:23:56 manu Exp $ */
/* $NetBSD: ktrace.h,v 1.28 2003/05/15 12:56:17 dsl Exp $ */
/*
* Copyright (c) 1988, 1993
@ -94,6 +94,7 @@ struct ktr_sysret {
short ktr_eosys; /* XXX unused */
int ktr_error;
register_t ktr_retval;
register_t ktr_retval_1;
};
/*
@ -211,7 +212,7 @@ void ktrnamei(struct proc *, char *);
void ktrpsig(struct proc *, int, sig_t, sigset_t *, int);
void ktrsyscall(struct proc *, register_t, register_t,
const struct sysent *, register_t []);
void ktrsysret(struct proc *, register_t, int, register_t);
void ktrsysret(struct proc *, register_t, int, register_t *);
void ktruser(struct proc *, const char *, void *, size_t, int);
void ktrmmsg(struct proc *, const void *, size_t);
void ktrderef(struct proc *);