Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej_scsipi]: src/sys Re-sync with HEAD files which were out of sync.
details: https://anonhg.NetBSD.org/src/rev/b1c90c89e081
branches: thorpej_scsipi
changeset: 477391:b1c90c89e081
user: bouyer <bouyer%NetBSD.org@localhost>
date: Thu Feb 15 13:36:10 2001 +0000
description:
Re-sync with HEAD files which were out of sync.
diffstat:
sys/arch/bebox/bebox/locore.s | 305 +---------------------------------
sys/arch/dreamcast/dreamcast/shb.c | 4 +-
sys/arch/macppc/macppc/locore.S | 35 +---
sys/arch/ofppc/ofppc/locore.S | 338 +------------------------------------
sys/arch/prep/prep/locore.s | 208 +----------------------
sys/dev/microcode/daic/Makefile | 4 +
sys/netisdn/i4b_ipr.c | 3 +-
sys/netisdn/i4b_isppp.c | 12 +-
sys/netisdn/i4b_l2.c | 4 +-
sys/netisdn/i4b_trace.c | 8 +-
10 files changed, 24 insertions(+), 897 deletions(-)
diffs (truncated from 1084 to 300 lines):
diff -r 16b613f7d333 -r b1c90c89e081 sys/arch/bebox/bebox/locore.s
--- a/sys/arch/bebox/bebox/locore.s Sun Feb 11 19:08:28 2001 +0000
+++ b/sys/arch/bebox/bebox/locore.s Thu Feb 15 13:36:10 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.10.8.3 2000/12/08 09:26:25 bouyer Exp $ */
+/* $NetBSD: locore.s,v 1.10.8.4 2001/02/15 13:36:10 bouyer Exp $ */
/* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */
/*
@@ -416,309 +416,6 @@
b trapexit
/*
- * DSI second stage fault handler
- */
-s_dsitrap:
- mfdsisr 31 /* test whether this may be a
- spill fault */
- mtcr 31
- mtsprg 1,1 /* save SP */
- bc 4,1,disitrap /* branch if table miss is false */
- lis 1,spillstk+SPILLSTK@ha
- addi 1,1,spillstk+SPILLSTK@l /* get spill stack */
- stwu 1,-52(1)
- stw 0,48(1) /* save non-volatile registers */
- stw 3,44(1)
- stw 4,40(1)
- stw 5,36(1)
- stw 6,32(1)
- stw 7,28(1)
- stw 8,24(1)
- stw 9,20(1)
- stw 10,16(1)
- stw 11,12(1)
- stw 12,8(1)
- mflr 30 /* save trap type */
- mfctr 31 /* & CTR */
- mfdar 3
-s_pte_spill:
- bl _C_LABEL(pte_spill) /* try a spill */
- or. 3,3,3
- mtctr 31 /* restore CTR */
- mtlr 30 /* and trap type */
- mfsprg 31,2 /* get saved XER */
- mtxer 31 /* restore XER */
- lwz 12,8(1) /* restore non-volatile registers */
- lwz 11,12(1)
- lwz 10,16(1)
- lwz 9,20(1)
- lwz 8,24(1)
- lwz 7,28(1)
- lwz 6,32(1)
- lwz 5,36(1)
- lwz 4,40(1)
- lwz 3,44(1)
- lwz 0,48(1)
- beq disitrap
- mfsprg 1,1 /* restore SP */
- mtcr 29 /* restore CR */
- mtlr 28 /* restore LR */
- lmw 28,disisave(0) /* restore r28-r31 */
- rfi /* return to trapped code */
-
-/*
- * ISI second stage fault handler
- */
-s_isitrap:
- mfsrr1 31 /* test whether this may be a
- spill fault */
- mtcr 31
- mtsprg 1,1 /* save SP */
- bc 4,1,disitrap /* branch if table miss is false */
- lis 1,spillstk+SPILLSTK@ha
- addi 1,1,spillstk+SPILLSTK@l /* get spill stack */
- stwu 1,-52(1)
- stw 0,48(1) /* save non-volatile registers */
- stw 3,44(1)
- stw 4,40(1)
- stw 5,36(1)
- stw 6,32(1)
- stw 7,28(1)
- stw 8,24(1)
- stw 9,20(1)
- stw 10,16(1)
- stw 11,12(1)
- stw 12,8(1)
- mfxer 30 /* save XER */
- mtsprg 2,30
- mflr 30 /* save trap type */
- mfctr 31 /* & ctr */
- mfsrr0 3
- b s_pte_spill /* above */
-
-/*
- * External interrupt second level handler
- */
-#define INTRENTER \
-/* Save non-volatile registers: */ \
- stwu 1,-88(1); /* temporarily */ \
- stw 0,84(1); \
- mfsprg 0,1; /* get original SP */ \
- stw 0,0(1); /* and store it */ \
- stw 3,80(1); \
- stw 4,76(1); \
- stw 5,72(1); \
- stw 6,68(1); \
- stw 7,64(1); \
- stw 8,60(1); \
- stw 9,56(1); \
- stw 10,52(1); \
- stw 11,48(1); \
- stw 12,44(1); \
- stw 28,40(1); /* saved LR */ \
- stw 29,36(1); /* saved CR */ \
- stw 30,32(1); /* saved XER */ \
- lmw 28,tempsave(0); /* restore r28-r31 */ \
- mfctr 6; \
- lis 5,_C_LABEL(intr_depth)@ha; \
- lwz 5,_C_LABEL(intr_depth)@l(5); \
- mfsrr0 4; \
- mfsrr1 3; \
- stw 6,28(1); \
- stw 5,20(1); \
- stw 4,12(1); \
- stw 3,8(1); \
-/* interrupts are recoverable here, and enable translation */ \
- lis 3,(KERNEL_SEGMENT|SR_SUKEY|SR_PRKEY)@h; \
- ori 3,3,(KERNEL_SEGMENT|SR_SUKEY|SR_PRKEY)@l; \
- mtsr KERNEL_SR,3; \
- mfmsr 5; \
- ori 5,5,(PSL_IR|PSL_DR|PSL_RI); \
- mtmsr 5; \
- isync
-
- .globl _C_LABEL(extint_call)
-extintr:
- INTRENTER
-_C_LABEL(extint_call):
- bl _C_LABEL(extint_call) /* to be filled in later */
-
-intr_exit:
-/* Disable interrupts (should already be disabled) and MMU here: */
- mfmsr 3
- andi. 3,3,~(PSL_EE|PSL_ME|PSL_RI|PSL_DR|PSL_IR)@l
- mtmsr 3
- isync
-/* restore possibly overwritten registers: */
- lwz 12,44(1)
- lwz 11,48(1)
- lwz 10,52(1)
- lwz 9,56(1)
- lwz 8,60(1)
- lwz 7,64(1)
- lwz 6,8(1)
- lwz 5,12(1)
- lwz 4,28(1)
- lwz 3,32(1)
- mtsrr1 6
- mtsrr0 5
- mtctr 4
- mtxer 3
-/* Returning to user mode? */
- mtcr 6 /* saved SRR1 */
- bc 4,17,1f /* branch if PSL_PR is false */
- lis 3,_C_LABEL(curpm)@ha /* get current pmap real address */
- lwz 3,_C_LABEL(curpm)@l(3)
- lwz 3,PM_KERNELSR(3)
- mtsr KERNEL_SR,3 /* Restore kernel SR */
- lis 3,_C_LABEL(astpending)@ha /* Test AST pending */
- lwz 4,_C_LABEL(astpending)@l(3)
- andi. 4,4,1
- beq 1f
-/* Setup for entry to realtrap: */
- lwz 3,0(1) /* get saved SP */
- mtsprg 1,3
- li 6,EXC_AST
- stmw 28,tempsave(0) /* establish tempsave again */
- mtlr 6
- lwz 28,40(1) /* saved LR */
- lwz 29,36(1) /* saved CR */
- lwz 6,68(1)
- lwz 5,72(1)
- lwz 4,76(1)
- lwz 3,80(1)
- lwz 0,84(1)
- lis 30,_C_LABEL(intr_depth)@ha /* adjust reentrancy count */
- lwz 31,_C_LABEL(intr_depth)@l(30)
- addi 31,31,-1
- stw 31,_C_LABEL(intr_depth)@l(30)
- b realtrap
-1:
-/* Here is the normal exit of extintr: */
- lwz 5,36(1)
- lwz 6,40(1)
- mtcr 5
- mtlr 6
- lwz 6,68(1)
- lwz 5,72(1)
- lis 3,_C_LABEL(intr_depth)@ha /* adjust reentrancy count */
- lwz 4,_C_LABEL(intr_depth)@l(3)
- addi 4,4,-1
- stw 4,_C_LABEL(intr_depth)@l(3)
- lwz 4,76(1)
- lwz 3,80(1)
- lwz 0,84(1)
- lwz 1,0(1)
- rfi
-
-/*
- * Decrementer interrupt second level handler
- */
-decrintr:
- INTRENTER
- addi 3,1,8 /* intr frame */
- bl _C_LABEL(decr_intr)
- b intr_exit
-
-#ifdef DDB
-/*
- * Deliberate entry to ddbtrap
- */
- .globl _C_LABEL(ddb_trap)
-_C_LABEL(ddb_trap):
- mtsprg 1,1
- mfmsr 3
- mtsrr1 3
- andi. 3,3,~(PSL_EE|PSL_ME)@l
- mtmsr 3 /* disable interrupts */
- isync
- stmw 28,ddbsave(0)
- mflr 28
- li 29,EXC_BPT
- mtlr 29
- mfcr 29
- mtsrr0 28
-
-/*
- * Now the ddb trap catching code.
- */
-ddbtrap:
- FRAME_SETUP(ddbsave)
-/* Call C trap code: */
- addi 3,1,8
- bl _C_LABEL(ddb_trap_glue)
- or. 3,3,3
- bne ddbleave
-/* This wasn't for DDB, so switch to real trap: */
- lwz 3,FRAME_EXC+8(1) /* save exception */
- stw 3,ddbsave+8(0)
- FRAME_LEAVE(ddbsave)
- mtsprg 1,1 /* prepare for entrance to realtrap */
- stmw 28,tempsave(0)
- mflr 28
- mfcr 29
- lwz 31,ddbsave+8(0)
- mtlr 31
- b realtrap
-ddbleave:
- FRAME_LEAVE(ddbsave)
- rfi
-#endif /* DDB */
-
-#ifdef IPKDB
-/*
- * Deliberate entry to ipkdbtrap
- */
- .globl _C_LABEL(ipkdb_trap)
-_C_LABEL(ipkdb_trap):
- mtsprg 1,1
- mfmsr 3
- mtsrr1 3
- andi. 3,3,~(PSL_EE|PSL_ME)@l
- mtmsr 3 /* disable interrupts */
- isync
- stmw 28,ipkdbsave(0)
- mflr 28
- li 29,EXC_BPT
- mtlr 29
- mfcr 29
- mtsrr0 28
-
-/*
- * Now the ipkdb trap catching code.
- */
-ipkdbtrap:
- FRAME_SETUP(ipkdbsave)
-/* Call C trap code: */
- addi 3,1,8
- bl _C_LABEL(ipkdb_trap_glue)
- or. 3,3,3
- bne ipkdbleave
-/* This wasn't for IPKDB, so switch to real trap: */
- lwz 3,FRAME_EXC+8(1) /* save exception */
- stw 3,ipkdbsave+8(0)
- FRAME_LEAVE(ipkdbsave)
- mtsprg 1,1 /* prepare for entrance to realtrap */
- stmw 28,tempsave(0)
- mflr 28
- mfcr 29
- lwz 31,ipkdbsave+8(0)
Home |
Main Index |
Thread Index |
Old Index