[src/trunk]: src/sys/arch/sh3/include s/trapno/expevt/ for clarity.

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

details:   https://anonhg.NetBSD.org/src/rev/28eab058cb97
branches:  trunk
changeset: 526726:28eab058cb97
user:      uch <uch%NetBSD.org@localhost>
date:      Thu May 09 12:25:41 2002 +0000

description:
s/trapno/expevt/ for clarity.

diffstat:

 sys/arch/sh3/include/frame.h  |   5 +++--
 sys/arch/sh3/include/locore.h |   6 +++---
 sys/arch/sh3/include/signal.h |  10 +++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

diffs (91 lines):

diff -r 4860b343d0c0 -r 28eab058cb97 sys/arch/sh3/include/frame.h
--- a/sys/arch/sh3/include/frame.h      Thu May 09 12:24:19 2002 +0000
+++ b/sys/arch/sh3/include/frame.h      Thu May 09 12:25:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: frame.h,v 1.7 2002/04/28 17:10:34 uch Exp $    */
+/*     $NetBSD: frame.h,v 1.8 2002/05/09 12:25:41 uch Exp $    */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -50,7 +50,7 @@
  */
 struct trapframe {
        /* software member */
-       int     tf_trapno;
+       int     tf_expevt;
        int     tf_ubc;
        /* hardware registers */
        int     tf_spc;
@@ -91,6 +91,7 @@
        int     sf_pr;
        int     sf_r6_bank;
        int     sf_sr;
+       int     sf_r7_bank;
 };
 
 /*
diff -r 4860b343d0c0 -r 28eab058cb97 sys/arch/sh3/include/locore.h
--- a/sys/arch/sh3/include/locore.h     Thu May 09 12:24:19 2002 +0000
+++ b/sys/arch/sh3/include/locore.h     Thu May 09 12:25:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.h,v 1.6 2002/04/28 17:10:35 uch Exp $   */
+/*     $NetBSD: locore.h,v 1.7 2002/05/09 12:25:41 uch Exp $   */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
        sts.l   macl,   @-r14   /* tf_macl*/                            ;\
        mov.l   r2,     @-r14   /* tf_ssr */                            ;\
        stc.l   spc,    @-r14   /* tf_spc */                            ;\
-       add     #-8,    r14     /* skip tf_ubc, tf_trapno */            ;\
+       add     #-8,    r14     /* skip tf_ubc, tf_expevt */            ;\
        mov     r14,    r6      /* store frame pointer */               ;\
        /* Change register bank to 0 */                                 ;\
        shlr    r3              /* r3 = 0x20000000 */                   ;\
@@ -126,7 +126,7 @@
        mov     r0,     r14                                             ;\
        add     #TF_SIZE, r0                                            ;\
        ldc     r0,     r6_bank /* roll up frame pointer */             ;\
-       add     #8,     r14     /* skip tf_trapno, tf_ubc */            ;\
+       add     #8,     r14     /* skip tf_expevt, tf_ubc */            ;\
        mov.l   @r14+,  r0      /* tf_spc */                            ;\
        ldc     r0,     spc                                             ;\
        mov.l   @r14+,  r0      /* tf_ssr */                            ;\
diff -r 4860b343d0c0 -r 28eab058cb97 sys/arch/sh3/include/signal.h
--- a/sys/arch/sh3/include/signal.h     Thu May 09 12:24:19 2002 +0000
+++ b/sys/arch/sh3/include/signal.h     Thu May 09 12:25:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: signal.h,v 1.2 2002/04/28 17:10:37 uch Exp $   */
+/*     $NetBSD: signal.h,v 1.3 2002/05/09 12:25:41 uch Exp $   */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
@@ -42,10 +42,6 @@
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
     !defined(_XOPEN_SOURCE)
-/*
- * Get the "code" values
- */
-#include <machine/trap.h>
 
 /*
  * Information pushed on stack when a signal is delivered.
@@ -79,7 +75,7 @@
        int     sc_onstack;             /* sigstack state to restore */
        int     sc_mask;                /* signal mask to restore (old style) */
 
-       int     sc_trapno;              /* XXX should be above */
+       int     sc_expevt;              /* XXX should be above */
        int     sc_err;
 };
 #endif
@@ -108,7 +104,7 @@
        int     sc_onstack;     /* sigstack state to restore */
        int     __sc_mask13;    /* signal mask to restore (old style) */
 
-       int     sc_trapno;      /* XXX should be above */
+       int     sc_expevt;      /* XXX should be above */
        int     sc_err;
 
        sigset_t sc_mask;       /* signal mask to restore (new style) */