Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/nathanw_sa]: src/sys/arch Don't need upcall trampolines.



details:   https://anonhg.NetBSD.org/src/rev/0b9fcd3cc218
branches:  nathanw_sa
changeset: 506054:0b9fcd3cc218
user:      nathanw <nathanw%NetBSD.org@localhost>
date:      Fri Jul 19 22:20:36 2002 +0000

description:
Don't need upcall trampolines.

diffstat:

 sys/arch/alpha/alpha/locore.s      |  23 +++--------------------
 sys/arch/i386/i386/locore.s        |  11 +----------
 sys/arch/powerpc/powerpc/sigcode.S |   6 +-----
 3 files changed, 5 insertions(+), 35 deletions(-)

diffs (90 lines):

diff -r f9ee81a8c10a -r 0b9fcd3cc218 sys/arch/alpha/alpha/locore.s
--- a/sys/arch/alpha/alpha/locore.s     Fri Jul 19 22:18:25 2002 +0000
+++ b/sys/arch/alpha/alpha/locore.s     Fri Jul 19 22:20:36 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.97.2.7 2002/07/09 16:52:32 nathanw Exp $ */
+/* $NetBSD: locore.s,v 1.97.2.8 2002/07/19 22:20:36 nathanw Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
 
 #include <machine/asm.h>
 
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.97.2.7 2002/07/09 16:52:32 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.97.2.8 2002/07/19 22:20:36 nathanw Exp $");
 
 #include "assym.h"
 
@@ -295,27 +295,10 @@
        CALLSYS_NOERROR(__sigreturn14)  /* and call sigreturn() with it. */
        mov     v0, a0                  /* if that failed, get error code */
        CALLSYS_NOERROR(exit)           /* and call exit() with it. */
+XNESTED(esigcode,0)
        END(sigcode)
 
-       /*
-/* Upcall "trampoline" code. Invoked from RTE setup by cpu_upcall().
- *
- * On entry, stack & registers look like:
- *     
- *      a0     upcall type     
- *      a1     pointer to sa_t array
- *      a2     count of "event" SAs    
- *     a3      count of "interrupted" SAs
- *     a4      arg
- *      pv     address of upcallhandler
- */
 
-NESTED(upcallcode,0,0,ra,0,0)
-       jsr     ra, (t12)
-       subq    zero, 1, a0
-       CALLSYS_NOERROR(exit)
-XNESTED(esigcode,0)
-       END(upcallcode)
        
 
 
diff -r f9ee81a8c10a -r 0b9fcd3cc218 sys/arch/i386/i386/locore.s
--- a/sys/arch/i386/i386/locore.s       Fri Jul 19 22:18:25 2002 +0000
+++ b/sys/arch/i386/i386/locore.s       Fri Jul 19 22:20:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.233.2.13 2002/07/03 23:31:44 nathanw Exp $        */
+/*     $NetBSD: locore.s,v 1.233.2.14 2002/07/19 22:20:37 nathanw Exp $        */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -735,15 +735,6 @@
        int     $0x80                   # enter kernel with args on stack
        movl    $SYS_exit,%eax
        int     $0x80                   # exit if sigreturn fails
-
-/* 
- *  Scheduler activations upcall trampoline.
- */    
-NENTRY(upcallcode)
-       call    SAF_UPCALL(%esp)
-       pushl   $101
-       movl    $SYS_exit,%eax
-       int     $0x80                   # upcalls should not return.
        .globl  _C_LABEL(esigcode)
 _C_LABEL(esigcode):
 
diff -r f9ee81a8c10a -r 0b9fcd3cc218 sys/arch/powerpc/powerpc/sigcode.S
--- a/sys/arch/powerpc/powerpc/sigcode.S        Fri Jul 19 22:18:25 2002 +0000
+++ b/sys/arch/powerpc/powerpc/sigcode.S        Fri Jul 19 22:20:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sigcode.S,v 1.1.16.1 2001/11/05 19:46:19 briggs Exp $  */
+/*     $NetBSD: sigcode.S,v 1.1.16.2 2002/07/19 22:20:39 nathanw Exp $ */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -50,8 +50,4 @@
        sc                              /* sigreturn(scp) */
        li      0,SYS_exit
        sc                              /* exit(errno) */
-_C_LABEL(upcallcode):
-       blrl
-       li      0,SYS_exit
-       sc
 _C_LABEL(esigcode):



Home | Main Index | Thread Index | Old Index