Source-Changes-HG archive

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

[src/netbsd-1-4]: src/sys/arch/sparc/sparc pullup 1.114->1.116 (christos)



details:   https://anonhg.NetBSD.org/src/rev/260f02696594
branches:  netbsd-1-4
changeset: 468579:260f02696594
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 30 15:33:55 1999 +0000

description:
pullup 1.114->1.116 (christos)

diffstat:

 sys/arch/sparc/sparc/locore.s |  130 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 128 insertions(+), 2 deletions(-)

diffs (165 lines):

diff -r 56a7b98075ac -r 260f02696594 sys/arch/sparc/sparc/locore.s
--- a/sys/arch/sparc/sparc/locore.s     Fri Apr 30 15:30:25 1999 +0000
+++ b/sys/arch/sparc/sparc/locore.s     Fri Apr 30 15:33:55 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.114 1999/03/30 19:41:30 pk Exp $  */
+/*     $NetBSD: locore.s,v 1.114.2.1 1999/04/30 15:33:55 perry Exp $   */
 
 /*
  * Copyright (c) 1996 Paul Kranenburg
@@ -52,6 +52,7 @@
 
 #include "opt_ddb.h"
 #include "opt_compat_svr4.h"
+#include "opt_compat_sunos.h"
 #include "opt_multiprocessor.h"
 
 #include "assym.h"
@@ -68,6 +69,9 @@
 #include <machine/signal.h>
 #include <machine/trap.h>
 #include <sys/syscall.h>
+#ifdef COMPAT_SUNOS
+#include <compat/sunos/sunos_syscall.h>
+#endif
 #ifdef COMPAT_SVR4
 #include <compat/svr4/svr4_syscall.h>
 #endif
@@ -4050,6 +4054,128 @@
        t       ST_SYSCALL
 _C_LABEL(esigcode):
 
+#ifdef COMPAT_SUNOS
+/*
+ * The following code is copied to the top of the user stack when each
+ * process is exec'ed, and signals are `trampolined' off it.
+ *
+ * When this code is run, the stack looks like:
+ *     [%sp]           64 bytes to which registers can be dumped
+ *     [%sp + 64]      signal number (goes in %o0)
+ *     [%sp + 64 + 4]  signal code (goes in %o1)
+ *     [%sp + 64 + 8]  placeholder
+ *     [%sp + 64 + 12] argument for %o3, currently unsupported (always 0)
+ *     [%sp + 64 + 16] first word of saved state (sigcontext)
+ *         .
+ *         .
+ *         .
+ *     [%sp + NNN]     last word of saved state
+ * (followed by previous stack contents or top of signal stack).
+ * The address of the function to call is in %g1; the old %g1 and %o0
+ * have already been saved in the sigcontext.  We are running in a clean
+ * window, all previous windows now being saved to the stack.
+ *
+ * Note that [%sp + 64 + 8] == %sp + 64 + 16.  The copy at %sp+64+8
+ * will eventually be removed, with a hole left in its place, if things
+ * work out.
+ */
+       .globl  _C_LABEL(sunos_sigcode)
+       .globl  _C_LABEL(sunos_esigcode)
+_C_LABEL(sunos_sigcode):
+       /*
+        * XXX  the `save' and `restore' below are unnecessary: should
+        *      replace with simple arithmetic on %sp
+        *
+        * Make room on the stack for 32 %f registers + %fsr.  This comes
+        * out to 33*4 or 132 bytes, but this must be aligned to a multiple
+        * of 8, or 136 bytes.
+        */
+       save    %sp, -CCFSZ - 136, %sp
+       mov     %g2, %l2                ! save globals in %l registers
+       mov     %g3, %l3
+       mov     %g4, %l4
+       mov     %g5, %l5
+       mov     %g6, %l6
+       mov     %g7, %l7
+       /*
+        * Saving the fpu registers is expensive, so do it iff the fsr
+        * stored in the sigcontext shows that the fpu is enabled.
+        */
+       ld      [%fp + 64 + 16 + SC_PSR_OFFSET], %l0
+       sethi   %hi(PSR_EF), %l1        ! FPU enable bit is too high for andcc
+       andcc   %l0, %l1, %l0           ! %l0 = fpu enable bit
+       be      1f                      ! if not set, skip the saves
+        rd     %y, %l1                 ! in any case, save %y
+
+       ! fpu is enabled, oh well
+       st      %fsr, [%sp + CCFSZ + 0]
+       std     %f0, [%sp + CCFSZ + 8]
+       std     %f2, [%sp + CCFSZ + 16]
+       std     %f4, [%sp + CCFSZ + 24]
+       std     %f6, [%sp + CCFSZ + 32]
+       std     %f8, [%sp + CCFSZ + 40]
+       std     %f10, [%sp + CCFSZ + 48]
+       std     %f12, [%sp + CCFSZ + 56]
+       std     %f14, [%sp + CCFSZ + 64]
+       std     %f16, [%sp + CCFSZ + 72]
+       std     %f18, [%sp + CCFSZ + 80]
+       std     %f20, [%sp + CCFSZ + 88]
+       std     %f22, [%sp + CCFSZ + 96]
+       std     %f24, [%sp + CCFSZ + 104]
+       std     %f26, [%sp + CCFSZ + 112]
+       std     %f28, [%sp + CCFSZ + 120]
+       std     %f30, [%sp + CCFSZ + 128]
+
+1:
+       ldd     [%fp + 64], %o0         ! sig, code
+       ld      [%fp + 76], %o3         ! arg3
+       call    %g1                     ! (*sa->sa_handler)(sig,code,scp,arg3)
+        add    %fp, 64 + 16, %o2       ! scp
+
+       /*
+        * Now that the handler has returned, re-establish all the state
+        * we just saved above, then do a sigreturn.
+        */
+       tst     %l0                     ! reload fpu registers?
+       be      1f                      ! if not, skip the loads
+        wr     %l1, %g0, %y            ! in any case, restore %y
+
+       ld      [%sp + CCFSZ + 0], %fsr
+       ldd     [%sp + CCFSZ + 8], %f0
+       ldd     [%sp + CCFSZ + 16], %f2
+       ldd     [%sp + CCFSZ + 24], %f4
+       ldd     [%sp + CCFSZ + 32], %f6
+       ldd     [%sp + CCFSZ + 40], %f8
+       ldd     [%sp + CCFSZ + 48], %f10
+       ldd     [%sp + CCFSZ + 56], %f12
+       ldd     [%sp + CCFSZ + 64], %f14
+       ldd     [%sp + CCFSZ + 72], %f16
+       ldd     [%sp + CCFSZ + 80], %f18
+       ldd     [%sp + CCFSZ + 88], %f20
+       ldd     [%sp + CCFSZ + 96], %f22
+       ldd     [%sp + CCFSZ + 104], %f24
+       ldd     [%sp + CCFSZ + 112], %f26
+       ldd     [%sp + CCFSZ + 120], %f28
+       ldd     [%sp + CCFSZ + 128], %f30
+
+1:
+       mov     %l2, %g2
+       mov     %l3, %g3
+       mov     %l4, %g4
+       mov     %l5, %g5
+       mov     %l6, %g6
+       mov     %l7, %g7
+
+       ! get registers back & set syscall #
+       restore %g0, SUNOS_SYS_sigreturn, %g1
+       add     %sp, 64 + 16, %o0       ! compute scp
+       t       ST_SYSCALL              ! sigreturn(scp)
+       ! sigreturn does not return unless it fails
+       mov     SUNOS_SYS_exit, %g1             ! exit(errno)
+       t       ST_SYSCALL
+_C_LABEL(sunos_esigcode):
+#endif /* COMPAT_SUNOS */
+
 #ifdef COMPAT_SVR4
 /*
  * The following code is copied to the top of the user stack when each
@@ -4170,7 +4296,7 @@
        mov     SYS_exit, %g1           ! exit(errno)
        t       ST_SYSCALL
 _C_LABEL(svr4_esigcode):
-#endif
+#endif /* COMPAT_SVR4 */
 
 /*
  * Primitives



Home | Main Index | Thread Index | Old Index