[src/trunk]: src/sys/arch/vax/vax trap.c: Set ksi.ksi_trap to frame->trap.

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

details:   https://anonhg.NetBSD.org/src/rev/e990eeaf3f3e
branches:  trunk
changeset: 552667:e990eeaf3f3e
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Sep 29 22:24:53 2003 +0000

description:
trap.c:         Set ksi.ksi_trap to frame->trap.
sig_machdep.c:  Use ksi->ksi_addr in compat code to supply the
                'code' argument to the old signal routines.

diffstat:

 sys/arch/vax/vax/sig_machdep.c |  8 ++++----
 sys/arch/vax/vax/trap.c        |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 3a39d71099fa -r e990eeaf3f3e sys/arch/vax/vax/sig_machdep.c
--- a/sys/arch/vax/vax/sig_machdep.c    Mon Sep 29 22:20:52 2003 +0000
+++ b/sys/arch/vax/vax/sig_machdep.c    Mon Sep 29 22:24:53 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.1 2003/09/29 21:04:53 matt Exp $  */
+/* $NetBSD: sig_machdep.c,v 1.2 2003/09/29 22:24:53 matt Exp $  */
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.1 2003/09/29 21:04:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.2 2003/09/29 22:24:53 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -275,7 +275,7 @@
 #endif
 
        tramp.sig = ksi->ksi_signo;
-       tramp.code = ksi->ksi_trap;
+       tramp.code = (register_t)ksi->ksi_addr;
        /* Set up positions for structs on stack */
        tramp.scp = sp;
        /* r0..r5 are saved by the popr in the sigcode snippet but we need
@@ -339,7 +339,7 @@
        /* Arguments given to the signal handler.  */
        tramp.narg = 3;
        tramp.sig = ksi->ksi_signo;
-       tramp.code = ksi->ksi_trap;
+       tramp.code = (register_t)ksi->ksi_addr;
        tramp.scp = sp;
        sp -= sizeof(tramp);
 
diff -r 3a39d71099fa -r e990eeaf3f3e sys/arch/vax/vax/trap.c
--- a/sys/arch/vax/vax/trap.c   Mon Sep 29 22:20:52 2003 +0000
+++ b/sys/arch/vax/vax/trap.c   Mon Sep 29 22:24:53 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.84 2003/09/29 22:20:52 matt Exp $     */
+/*     $NetBSD: trap.c,v 1.85 2003/09/29 22:24:53 matt Exp $     */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -33,7 +33,7 @@
  /* All bugs are subject to removal without further notice */
                
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.84 2003/09/29 22:20:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.85 2003/09/29 22:24:53 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
@@ -373,7 +373,7 @@
                KERNEL_PROC_LOCK(l);
                memset(&ksi, 0, sizeof(ksi));
                ksi.ksi_signo = sig;
-               ksi.ksi_trap = frame->code;
+               ksi.ksi_trap = frame->trap;
                ksi.ksi_addr = (void *)frame->code;
                ksi.ksi_code = code;
                trapsignal(l, &ksi);