[src/trunk]: src/sys/arch/sparc64/sparc64 Make this compile with 32bit kernels.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fb14f8155765
branches:  trunk
changeset: 554624:fb14f8155765
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Oct 30 21:02:55 2003 +0000

description:
Make this compile with 32bit kernels.

diffstat:

 sys/arch/sparc64/sparc64/machdep.c       |   8 ++++----
 sys/arch/sparc64/sparc64/sunos_machdep.c |  12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (84 lines):

diff -r 3079b2312a4d -r fb14f8155765 sys/arch/sparc64/sparc64/machdep.c
--- a/sys/arch/sparc64/sparc64/machdep.c        Thu Oct 30 20:40:20 2003 +0000
+++ b/sys/arch/sparc64/sparc64/machdep.c        Thu Oct 30 21:02:55 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.154 2003/10/28 17:37:25 hannken Exp $ */
+/*     $NetBSD: machdep.c,v 1.155 2003/10/30 21:02:55 matt Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.154 2003/10/28 17:37:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.155 2003/10/30 21:02:55 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -514,7 +514,7 @@
        if (*onstack)
                return ((caddr_t)ctx->ps_sigstk.ss_sp + ctx->ps_sigstk.ss_size);
        else
-               return (void *)(tf->tf_out[6] + STACK_OFFSET);
+               return (void *)((uintptr_t)tf->tf_out[6] + STACK_OFFSET);
 }
 
 struct sigframe_siginfo {
@@ -534,7 +534,7 @@
        long ucsz;
        struct sigframe_siginfo *fp = getframe(l, sig, &onstack);
        sig_t catcher = SIGACTION(p, sig).sa_handler;
-       struct trapframe *tf = l->l_md.md_tf;
+       struct trapframe64 *tf = l->l_md.md_tf;
        struct rwindow *newsp;
        /* Allocate an aligned sigframe */
        fp = (void *)((u_long)(fp - 1) & ~0x0f);
diff -r 3079b2312a4d -r fb14f8155765 sys/arch/sparc64/sparc64/sunos_machdep.c
--- a/sys/arch/sparc64/sparc64/sunos_machdep.c  Thu Oct 30 20:40:20 2003 +0000
+++ b/sys/arch/sparc64/sparc64/sunos_machdep.c  Thu Oct 30 21:02:55 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sunos_machdep.c,v 1.19 2003/09/26 12:02:56 simonb Exp $        */
+/*     $NetBSD: sunos_machdep.c,v 1.20 2003/10/30 21:02:55 matt Exp $  */
 
 /*
  * Copyright (c) 1995 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.19 2003/09/26 12:02:56 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.20 2003/10/30 21:02:55 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -81,10 +81,9 @@
 };
 
 void
-sunos_sendsig(sig, mask, code)
-       int sig;
+sunos_sendsig(ksi, mask)
+       const ksiginfo_t *ksi;
        const sigset_t *mask;
-       u_long code;
 {
        register struct lwp *l = curlwp;
        struct proc *p = l->l_proc;
@@ -92,6 +91,7 @@
        register struct trapframe64 *tf;
        register int addr, onstack; 
        struct rwindow32 *kwin, *oldsp, *newsp;
+       int sig = ksi->ksi_signo;
        sig_t catcher = SIGACTION(p, sig).sa_handler;
        struct sunos_sigframe sf;
 
@@ -129,7 +129,7 @@
         * directly in user space....
         */
        sf.sf_signo = sig;
-       sf.sf_code = code;
+       sf.sf_code = ksi->ksi_trap;
        sf.sf_scp = (u_long)&fp->sf_sc;
        sf.sf_addr = 0;                 /* XXX */