From b5b9ca33d7ca27140f614bc74db88b2a2a0c255f Mon Sep 17 00:00:00 2001
From: nathanw <nathanw@NetBSD.org>
Date: Mon, 13 Oct 2003 22:19:15 +0000
Subject: [PATCH] Catch up DEBUG printfs to siginfo changes.

---
 sys/arch/alpha/alpha/compat_16_machdep.c | 12 ++++++------
 sys/arch/alpha/alpha/machdep.c           | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/arch/alpha/alpha/compat_16_machdep.c b/sys/arch/alpha/alpha/compat_16_machdep.c
index 76d9eca85983..2c58aed2eb0a 100644
--- a/sys/arch/alpha/alpha/compat_16_machdep.c
+++ b/sys/arch/alpha/alpha/compat_16_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.2 2003/10/08 00:28:40 thorpej Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.3 2003/10/13 22:19:15 nathanw Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
 #include <machine/cpu.h>
 #include <machine/reg.h>
 
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.2 2003/10/08 00:28:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.3 2003/10/13 22:19:15 nathanw Exp $");
 
 
 #ifdef DEBUG
@@ -121,7 +121,7 @@ sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *mask)
 #ifdef DEBUG
 	if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
 		printf("sendsig_sigcontext(%d): sig %d ssp %p usp %p\n",
-		       p->p_pid, sig, &onstack, scp);
+		       p->p_pid, sig, &onstack, fp);
 #endif
 
 	/* Build stack frame for signal trampoline. */
@@ -186,8 +186,8 @@ sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *mask)
 	}
 #ifdef DEBUG
 	if (sigdebug & SDB_FOLLOW)
-		printf("sendsig_sigcontext(%d): sig %d scp %p code %lx\n",
-		       p->p_pid, sig, scp, code);
+		printf("sendsig_sigcontext(%d): sig %d usp %p code %x\n",
+		       p->p_pid, sig, fp, ksi->ksi_code);
 #endif
 
 	/*
@@ -227,7 +227,7 @@ sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *mask)
 #ifdef DEBUG
 	if (sigdebug & SDB_FOLLOW)
 		printf("sendsig(%d): pc %lx, catcher %lx\n", p->p_pid,
-		    frame->tf_regs[FRAME_PC], frame->tf_regs[FRAME_A3]);
+		    tf->tf_regs[FRAME_PC], tf->tf_regs[FRAME_A3]);
 	if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
 		printf("sendsig(%d): sig %d returns\n",
 		    p->p_pid, sig);
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index e150080fe494..7d5f105749b9 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.275 2003/10/08 03:10:41 enami Exp $ */
+/* $NetBSD: machdep.c,v 1.276 2003/10/13 22:19:15 nathanw Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.275 2003/10/08 03:10:41 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.276 2003/10/13 22:19:15 nathanw Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1575,7 +1575,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
 #ifdef DEBUG
 	if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
 		printf("sendsig_siginfo(%d): sig %d ssp %p usp %p\n", p->p_pid,
-		    sig, &onstack, scp);
+		    sig, &onstack, fp);
 #endif
 
 	/* Build stack frame for signal trampoline. */
@@ -1603,8 +1603,8 @@ sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
 
 #ifdef DEBUG
 	if (sigdebug & SDB_FOLLOW)
-		printf("sendsig_siginfo(%d): sig %d scp %p code %lx\n",
-		       p->p_pid, sig, scp, code);
+		printf("sendsig_siginfo(%d): sig %d usp %p code %x\n",
+		       p->p_pid, sig, fp, ksi->ksi_code);
 #endif
 
 	/*
@@ -1627,7 +1627,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
 #ifdef DEBUG
 	if (sigdebug & SDB_FOLLOW)
 		printf("sendsig_siginfo(%d): pc %lx, catcher %lx\n", p->p_pid,
-		    frame->tf_regs[FRAME_PC], frame->tf_regs[FRAME_A3]);
+		    tf->tf_regs[FRAME_PC], tf->tf_regs[FRAME_A3]);
 	if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid)
 		printf("sendsig_siginfo(%d): sig %d returns\n",
 		    p->p_pid, sig);