massive changes mostly related to stack alignment

SCCS-vsn: sys/hp300/hp300/locore.s 7.19

diff --git a/usr/src/sys/hp300/hp300/locore.s b/usr/src/sys/hp300/hp300/locore.s
index 129609e..65265a2 100644 (file)
--- a/usr/src/sys/hp300/hp300/locore.s
+++ b/usr/src/sys/hp300/hp300/locore.s
@@ -9,17 +9,40 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- * from: Utah $Hdr: locore.s 1.62 92/01/20$
+ * from: Utah $Hdr: locore.s 1.66 92/12/22$

  *
  *

- *     @(#)locore.s    7.18 (Berkeley) %G%
+ *     @(#)locore.s    7.19 (Berkeley) %G%

  */
 
  */
 

+/*
+ * STACKCHECK enables two types of kernel stack checking:
+ *     1. stack "overflow".  On every clock interrupt we ensure that
+ *        the current kernel stack has not grown into the user struct
+ *        page, i.e. size exceeded UPAGES-1 pages.
+ *     2. stack "underflow".  Before every rte to user mode we ensure
+ *        that we will be exactly at the base of the stack after the
+ *        exception frame has been popped.
+ * Both checks are performed at splclock since they operate on the
+ * global temporary stack.
+ */
+/* #define     STACKCHECK */
+

 #include "assym.s"
 #include <hp300/hp300/vectors.s>
 
 #define MMUADDR(ar)    movl    _MMUbase,ar
 #define CLKADDR(ar)    movl    _CLKbase,ar
 
 #include "assym.s"
 #include <hp300/hp300/vectors.s>
 
 #define MMUADDR(ar)    movl    _MMUbase,ar
 #define CLKADDR(ar)    movl    _CLKbase,ar
 

+/*
+ * Temporary stack for a variety of purposes.
+ * Try and make this the first thing is the data segment so it
+ * is page aligned.  Note that if we overflow here, we run into
+ * our text segment.
+ */
+       .data
+       .space  NBPG
+tmpstk:
+

        .text
 /*
  * This is where we wind up if the kernel jumps to location 0.
        .text
 /*
  * This is where we wind up if the kernel jumps to location 0.


@@ -59,14 +82,14 @@ Lberr:
 #if defined(HP380)
        cmpl    #-2,_mmutype            | 68040?
        jne     _addrerr                | no, skip
 #if defined(HP380)
        cmpl    #-2,_mmutype            | 68040?
        jne     _addrerr                | no, skip

-       clrw    sp@-                    | pad SR to longword
+       clrl    sp@-                    | stack adjust count

        moveml  #0xFFFF,sp@-            | save user registers
        movl    usp,a0                  | save the user SP
        moveml  #0xFFFF,sp@-            | save user registers
        movl    usp,a0                  | save the user SP

-       movl    a0,sp@(60)              |   in the savearea
-       lea     sp@(64),a1              | grab base of HW berr frame
+       movl    a0,sp@(FR_SP)           |   in the savearea
+       lea     sp@(FR_HW),a1           | grab base of HW berr frame

        moveq   #0,d0
        moveq   #0,d0

-       movw    a1@(14),d0              | grab SSW
-       movl    a1@(22),d1              | and fault VA
+       movw    a1@(12),d0              | grab SSW
+       movl    a1@(20),d1              | and fault VA

        btst    #11,d0                  | check for mis-aligned access
        jeq     Lberr2                  | no, skip
        addl    #3,d1                   | yes, get into next page
        btst    #11,d0                  | check for mis-aligned access
        jeq     Lberr2                  | no, skip
        addl    #3,d1                   | yes, get into next page


@@ -86,39 +109,39 @@ Lberr2:
        jra     Lismerr
 #endif
 _addrerr:
        jra     Lismerr
 #endif
 _addrerr:

-       clrw    sp@-                    | pad SR to longword
+       clrl    sp@-                    | stack adjust count

        moveml  #0xFFFF,sp@-            | save user registers
        movl    usp,a0                  | save the user SP
        moveml  #0xFFFF,sp@-            | save user registers
        movl    usp,a0                  | save the user SP

-       movl    a0,sp@(60)              |   in the savearea
-       lea     sp@(64),a1              | grab base of HW berr frame
+       movl    a0,sp@(FR_SP)           |   in the savearea
+       lea     sp@(FR_HW),a1           | grab base of HW berr frame

 #if defined(HP380)
        cmpl    #-2,_mmutype            | 68040?
        jne     Lbenot040               | no, skip
 #if defined(HP380)
        cmpl    #-2,_mmutype            | 68040?
        jne     Lbenot040               | no, skip

-       movl    a1@(10),sp@-            | yes, push fault address
+       movl    a1@(8),sp@-             | yes, push fault address

        clrl    sp@-                    | no SSW for address fault
        jra     Lisaerr                 | go deal with it
 Lbenot040:
 #endif
        moveq   #0,d0
        clrl    sp@-                    | no SSW for address fault
        jra     Lisaerr                 | go deal with it
 Lbenot040:
 #endif
        moveq   #0,d0

-       movw    a1@(12),d0              | grab SSW for fault processing
+       movw    a1@(10),d0              | grab SSW for fault processing

        btst    #12,d0                  | RB set?
        jeq     LbeX0                   | no, test RC
        bset    #14,d0                  | yes, must set FB
        btst    #12,d0                  | RB set?
        jeq     LbeX0                   | no, test RC
        bset    #14,d0                  | yes, must set FB

-       movw    d0,a1@(12)              | for hardware too
+       movw    d0,a1@(10)              | for hardware too

 LbeX0:
        btst    #13,d0                  | RC set?
        jeq     LbeX1                   | no, skip
        bset    #15,d0                  | yes, must set FC
 LbeX0:
        btst    #13,d0                  | RC set?
        jeq     LbeX1                   | no, skip
        bset    #15,d0                  | yes, must set FC

-       movw    d0,a1@(12)              | for hardware too
+       movw    d0,a1@(10)              | for hardware too

 LbeX1:
        btst    #8,d0                   | data fault?
        jeq     Lbe0                    | no, check for hard cases
 LbeX1:
        btst    #8,d0                   | data fault?
        jeq     Lbe0                    | no, check for hard cases

-       movl    a1@(18),d1              | fault address is as given in frame
+       movl    a1@(16),d1              | fault address is as given in frame

        jra     Lbe10                   | thats it
 Lbe0:
        jra     Lbe10                   | thats it
 Lbe0:

-       btst    #4,a1@(8)               | long (type B) stack frame?
+       btst    #4,a1@(6)               | long (type B) stack frame?

        jne     Lbe4                    | yes, go handle
        jne     Lbe4                    | yes, go handle

-       movl    a1@(4),d1               | no, can use save PC
+       movl    a1@(2),d1               | no, can use save PC

        btst    #14,d0                  | FB set?
        jeq     Lbe3                    | no, try FC
        addql   #4,d1                   | yes, adjust address
        btst    #14,d0                  | FB set?
        jeq     Lbe3                    | no, try FC
        addql   #4,d1                   | yes, adjust address


@@ -129,14 +152,14 @@ Lbe3:
        addql   #2,d1                   | yes, adjust address
        jra     Lbe10                   | done
 Lbe4:
        addql   #2,d1                   | yes, adjust address
        jra     Lbe10                   | done
 Lbe4:

-       movl    a1@(38),d1              | long format, use stage B address
+       movl    a1@(36),d1              | long format, use stage B address

        btst    #15,d0                  | FC set?
        jeq     Lbe10                   | no, all done
        subql   #2,d1                   | yes, adjust address
 Lbe10:
        movl    d1,sp@-                 | push fault VA
        movl    d0,sp@-                 | and padded SSW
        btst    #15,d0                  | FC set?
        jeq     Lbe10                   | no, all done
        subql   #2,d1                   | yes, adjust address
 Lbe10:
        movl    d1,sp@-                 | push fault VA
        movl    d0,sp@-                 | and padded SSW

-       movw    a1@(8),d0               | get frame format/vector offset
+       movw    a1@(6),d0               | get frame format/vector offset

        andw    #0x0FFF,d0              | clear out frame format
        cmpw    #12,d0                  | address error vector?
        jeq     Lisaerr                 | yes, go to it
        andw    #0x0FFF,d0              | clear out frame format
        cmpw    #12,d0                  | address error vector?
        jeq     Lisaerr                 | yes, go to it


@@ -171,21 +194,21 @@ Lisberr:
 Ltrapnstkadj:
        jbsr    _trap                   | handle the error
        lea     sp@(12),sp              | pop value args
 Ltrapnstkadj:
        jbsr    _trap                   | handle the error
        lea     sp@(12),sp              | pop value args

-       movl    sp@(60),a0              | restore user SP
+       movl    sp@(FR_SP),a0           | restore user SP

        movl    a0,usp                  |   from save area
        movl    a0,usp                  |   from save area

-       movw    sp@(64),d0              | need to adjust stack?
+       movw    sp@(FR_ADJ),d0          | need to adjust stack?

        jne     Lstkadj                 | yes, go to it
        moveml  sp@+,#0x7FFF            | no, restore most user regs
        jne     Lstkadj                 | yes, go to it
        moveml  sp@+,#0x7FFF            | no, restore most user regs

-       addql   #6,sp                   | toss SSP and pad
+       addql   #8,sp                   | toss SSP and stkadj

        jra     rei                     | all done
 Lstkadj:
        jra     rei                     | all done
 Lstkadj:

-       lea     sp@(66),a1              | pointer to HW frame
+       lea     sp@(FR_HW),a1           | pointer to HW frame

        addql   #8,a1                   | source pointer
        movl    a1,a0                   | source
        addw    d0,a0                   |  + hole size = dest pointer
        movl    a1@-,a0@-               | copy
        movl    a1@-,a0@-               |  8 bytes
        addql   #8,a1                   | source pointer
        movl    a1,a0                   | source
        addw    d0,a0                   |  + hole size = dest pointer
        movl    a1@-,a0@-               | copy
        movl    a1@-,a0@-               |  8 bytes

-       movl    a0,sp@(60)              | new SSP
+       movl    a0,sp@(FR_SP)           | new SSP

        moveml  sp@+,#0x7FFF            | restore user registers
        movl    sp@,sp                  | and our SP
        jra     rei                     | all done
        moveml  sp@+,#0x7FFF            | restore user registers
        movl    sp@,sp                  | and our SP
        jra     rei                     | all done


@@ -201,7 +224,7 @@ _fpfline:
        .globl fpsp_unimp
        jmp     fpsp_unimp              | yes, go handle it
 #else
        .globl fpsp_unimp
        jmp     fpsp_unimp              | yes, go handle it
 #else

-       clrw    sp@-                    | yes, pad SR
+       clrl    sp@-                    | stack adjust count

        moveml  #0xFFFF,sp@-            | save registers
        moveq   #T_FPEMULI,d0           | denote as FP emulation trap
        jra     fault                   | do it
        moveml  #0xFFFF,sp@-            | save registers
        moveq   #T_FPEMULI,d0           | denote as FP emulation trap
        jra     fault                   | do it


@@ -218,7 +241,7 @@ _fpunsupp:
        .globl  fpsp_unsupp
        jmp     fpsp_unsupp             | yes, go handle it
 #else
        .globl  fpsp_unsupp
        jmp     fpsp_unsupp             | yes, go handle it
 #else

-       clrw    sp@-                    | yes, pad SR
+       clrl    sp@-                    | stack adjust count

        moveml  #0xFFFF,sp@-            | save registers
        moveq   #T_FPEMULD,d0           | denote as FP emulation trap
        jra     fault                   | do it
        moveml  #0xFFFF,sp@-            | save registers
        moveq   #T_FPEMULD,d0           | denote as FP emulation trap
        jra     fault                   | do it


@@ -235,10 +258,10 @@ _fpunsupp:
  */
 _fpfault:
 #ifdef FPCOPROC
  */
 _fpfault:
 #ifdef FPCOPROC

-       clrw    sp@-            | pad SR to longword
+       clrl    sp@-            | stack adjust count

        moveml  #0xFFFF,sp@-    | save user registers
        movl    usp,a0          | and save
        moveml  #0xFFFF,sp@-    | save user registers
        movl    usp,a0          | and save

-       movl    a0,sp@(60)      |   the user stack pointer
+       movl    a0,sp@(FR_SP)   |   the user stack pointer

        clrl    sp@-            | no VA arg
        movl    _curpcb,a0      | current pcb
        lea     a0@(PCB_FPCTX),a0 | address of FP savearea
        clrl    sp@-            | no VA arg
        movl    _curpcb,a0      | current pcb
        lea     a0@(PCB_FPCTX),a0 | address of FP savearea


@@ -282,7 +305,7 @@ Lfault1:
 Lfault2:
        addl    #Lvectab,d0     | convert to vector table offset
        exg     d0,a0
 Lfault2:
        addl    #Lvectab,d0     | convert to vector table offset
        exg     d0,a0

-       movl    a0@,sp@(8)      | get exception vector and save for rts
+       movl    a0@,sp@(4)      | get exception vector and save for rts

        exg     d0,a0
        movl    sp@+,d0         |   scratch registers
        rts                     | return to handler from vectab
        exg     d0,a0
        movl    sp@+,d0         |   scratch registers
        rts                     | return to handler from vectab


@@ -294,20 +317,20 @@ Lfault2:
  * stack adjustment.
  */
 _coperr:
  * stack adjustment.
  */
 _coperr:

-       clrw    sp@-
+       clrl    sp@-            | stack adjust count

        moveml  #0xFFFF,sp@-
        movl    usp,a0          | get and save
        moveml  #0xFFFF,sp@-
        movl    usp,a0          | get and save

-       movl    a0,sp@(60)      |   the user stack pointer
+       movl    a0,sp@(FR_SP)   |   the user stack pointer

        clrl    sp@-            | no VA arg
        clrl    sp@-            | or code arg
        movl    #T_COPERR,sp@-  | push trap type
        jra     Ltrapnstkadj    | call trap and deal with stack adjustments
 
 _fmterr:
        clrl    sp@-            | no VA arg
        clrl    sp@-            | or code arg
        movl    #T_COPERR,sp@-  | push trap type
        jra     Ltrapnstkadj    | call trap and deal with stack adjustments
 
 _fmterr:

-       clrw    sp@-
+       clrl    sp@-            | stack adjust count

        moveml  #0xFFFF,sp@-
        movl    usp,a0          | get and save
        moveml  #0xFFFF,sp@-
        movl    usp,a0          | get and save

-       movl    a0,sp@(60)      |   the user stack pointer
+       movl    a0,sp@(FR_SP)   |   the user stack pointer

        clrl    sp@-            | no VA arg
        clrl    sp@-            | or code arg
        movl    #T_FMTERR,sp@-  | push trap type
        clrl    sp@-            | no VA arg
        clrl    sp@-            | or code arg
        movl    #T_FMTERR,sp@-  | push trap type


@@ -318,31 +341,31 @@ _fmterr:
  * no post-trap stack adjustment.
  */
 _illinst:
  * no post-trap stack adjustment.
  */
 _illinst:

-       clrw    sp@-
+       clrl    sp@-

        moveml  #0xFFFF,sp@-
        moveq   #T_ILLINST,d0
        jra     fault
 
 _zerodiv:
        moveml  #0xFFFF,sp@-
        moveq   #T_ILLINST,d0
        jra     fault
 
 _zerodiv:

-       clrw    sp@-
+       clrl    sp@-

        moveml  #0xFFFF,sp@-
        moveq   #T_ZERODIV,d0
        jra     fault
 
 _chkinst:
        moveml  #0xFFFF,sp@-
        moveq   #T_ZERODIV,d0
        jra     fault
 
 _chkinst:

-       clrw    sp@-
+       clrl    sp@-

        moveml  #0xFFFF,sp@-
        moveq   #T_CHKINST,d0
        jra     fault
 
 _trapvinst:
        moveml  #0xFFFF,sp@-
        moveq   #T_CHKINST,d0
        jra     fault
 
 _trapvinst:

-       clrw    sp@-
+       clrl    sp@-

        moveml  #0xFFFF,sp@-
        moveq   #T_TRAPVINST,d0
        jra     fault
 
 _privinst:
        moveml  #0xFFFF,sp@-
        moveq   #T_TRAPVINST,d0
        jra     fault
 
 _privinst:

-       clrw    sp@-
+       clrl    sp@-

        moveml  #0xFFFF,sp@-
        moveq   #T_PRIVINST,d0
        jra     fault
        moveml  #0xFFFF,sp@-
        moveq   #T_PRIVINST,d0
        jra     fault


@@ -350,44 +373,42 @@ _privinst:
        .globl  fault
 fault:
        movl    usp,a0                  | get and save
        .globl  fault
 fault:
        movl    usp,a0                  | get and save

-       movl    a0,sp@(60)              |   the user stack pointer
+       movl    a0,sp@(FR_SP)           |   the user stack pointer

        clrl    sp@-                    | no VA arg
        clrl    sp@-                    | or code arg
        movl    d0,sp@-                 | push trap type
        jbsr    _trap                   | handle trap
        lea     sp@(12),sp              | pop value args
        clrl    sp@-                    | no VA arg
        clrl    sp@-                    | or code arg
        movl    d0,sp@-                 | push trap type
        jbsr    _trap                   | handle trap
        lea     sp@(12),sp              | pop value args

-       movl    sp@(60),a0              | restore
+       movl    sp@(FR_SP),a0           | restore

        movl    a0,usp                  |   user SP
        moveml  sp@+,#0x7FFF            | restore most user regs
        movl    a0,usp                  |   user SP
        moveml  sp@+,#0x7FFF            | restore most user regs

-       addql   #6,sp                   | pop SP and pad word
+       addql   #8,sp                   | pop SP and stack adjust

        jra     rei                     | all done
 
        .globl  _straytrap
 _badtrap:
        jra     rei                     | all done
 
        .globl  _straytrap
 _badtrap:

-       clrw    sp@-                    | pad SR

        moveml  #0xC0C0,sp@-            | save scratch regs
        moveml  #0xC0C0,sp@-            | save scratch regs

-       movw    sp@(24),sp@-            | push exception vector info
+       movw    sp@(22),sp@-            | push exception vector info

        clrw    sp@-
        clrw    sp@-

-       movl    sp@(24),sp@-            | and PC
+       movl    sp@(22),sp@-            | and PC

        jbsr    _straytrap              | report
        addql   #8,sp                   | pop args
        moveml  sp@+,#0x0303            | restore regs
        jbsr    _straytrap              | report
        addql   #8,sp                   | pop args
        moveml  sp@+,#0x0303            | restore regs

-       addql   #2,sp                   | pop padding

        jra     rei                     | all done
 
        .globl  _syscall
 _trap0:
        jra     rei                     | all done
 
        .globl  _syscall
 _trap0:

-       clrw    sp@-                    | pad SR to longword
+       clrl    sp@-                    | stack adjust count

        moveml  #0xFFFF,sp@-            | save user registers
        movl    usp,a0                  | save the user SP
        moveml  #0xFFFF,sp@-            | save user registers
        movl    usp,a0                  | save the user SP

-       movl    a0,sp@(60)              |   in the savearea
+       movl    a0,sp@(FR_SP)           |   in the savearea

        movl    d0,sp@-                 | push syscall number
        jbsr    _syscall                | handle it
        addql   #4,sp                   | pop syscall arg
        movl    d0,sp@-                 | push syscall number
        jbsr    _syscall                | handle it
        addql   #4,sp                   | pop syscall arg

-       movl    sp@(60),a0              | grab and restore
+       movl    sp@(FR_SP),a0           | grab and restore

        movl    a0,usp                  |   user SP
        moveml  sp@+,#0x7FFF            | restore most registers
        movl    a0,usp                  |   user SP
        moveml  sp@+,#0x7FFF            | restore most registers

-       addql   #6,sp                   | pop SSP and align word
+       addql   #8,sp                   | pop SP and stack adjust

        jra     rei                     | all done
 
 /*
        jra     rei                     | all done
 
 /*


@@ -398,12 +419,12 @@ _trap0:
  * to make adjustments so that trap 2 is used for sigreturn.
  */
 _trap1:
  * to make adjustments so that trap 2 is used for sigreturn.
  */
 _trap1:

-       btst    #PCB_TRCB,pcbflag       | being traced by an HPUX process?
+       btst    #MDP_TRCB,mdpflag       | being traced by an HPUX process?

        jeq     sigreturn               | no, trap1 is sigreturn
        jra     _trace                  | yes, trap1 is breakpoint
 
 _trap2:
        jeq     sigreturn               | no, trap1 is sigreturn
        jra     _trace                  | yes, trap1 is breakpoint
 
 _trap2:

-       btst    #PCB_TRCB,pcbflag       | being traced by an HPUX process?
+       btst    #MDP_TRCB,mdpflag       | being traced by an HPUX process?

        jeq     _trace                  | no, trap2 is breakpoint
        jra     sigreturn               | yes, trap2 is sigreturn
 
        jeq     _trace                  | no, trap2 is breakpoint
        jra     sigreturn               | yes, trap2 is sigreturn
 


@@ -428,13 +449,13 @@ _trap12:
  * We just pass it on and let trap() sort it all out
  */
 _trap15:
  * We just pass it on and let trap() sort it all out
  */
 _trap15:

-       clrw    sp@-
+       clrl    sp@-

        moveml  #0xFFFF,sp@-
 #ifdef KGDB
        moveq   #T_TRAP15,d0
        moveml  #0xFFFF,sp@-
 #ifdef KGDB
        moveq   #T_TRAP15,d0

-       movl    sp@(64),d1              | from user mode?
-       andl    #PSL_S,d1
-       jeq     fault
+       movw    sp@(FR_HW),d1           | get PSW
+       andw    #PSL_S,d1               | from user mode?
+       jeq     fault                   | yes, just a regular fault

        movl    d0,sp@-
        .globl  _kgdb_trap_glue
        jbsr    _kgdb_trap_glue         | returns if no debugger
        movl    d0,sp@-
        .globl  _kgdb_trap_glue
        jbsr    _kgdb_trap_glue         | returns if no debugger


@@ -448,13 +469,13 @@ _trap15:
  * Push the code and treat as a normal fault.
  */
 _trace:
  * Push the code and treat as a normal fault.
  */
 _trace:

-       clrw    sp@-
+       clrl    sp@-

        moveml  #0xFFFF,sp@-
 #ifdef KGDB
        moveq   #T_TRACE,d0
        moveml  #0xFFFF,sp@-
 #ifdef KGDB
        moveq   #T_TRACE,d0

-       movl    sp@(64),d1              | from user mode?
-       andl    #PSL_S,d1
-       jeq     fault
+       movw    sp@(FR_HW),d1           | get SSW
+       andw    #PSL_S,d1               | from user mode?
+       jeq     fault                   | no, regular fault

        movl    d0,sp@-
        jbsr    _kgdb_trap_glue         | returns if no debugger
        addl    #4,sp
        movl    d0,sp@-
        jbsr    _kgdb_trap_glue         | returns if no debugger
        addl    #4,sp


@@ -471,17 +492,17 @@ sigreturn:
        lea     sp@(-84),sp             | leave enough space for largest frame
        movl    sp@(84),sp@             | move up current 8 byte frame
        movl    sp@(88),sp@(4)
        lea     sp@(-84),sp             | leave enough space for largest frame
        movl    sp@(84),sp@             | move up current 8 byte frame
        movl    sp@(88),sp@(4)

-       movw    #84,sp@-                | default: adjust by 84 bytes
+       movl    #84,sp@-                | default: adjust by 84 bytes

        moveml  #0xFFFF,sp@-            | save user registers
        movl    usp,a0                  | save the user SP
        moveml  #0xFFFF,sp@-            | save user registers
        movl    usp,a0                  | save the user SP

-       movl    a0,sp@(60)              |   in the savearea
+       movl    a0,sp@(FR_SP)           |   in the savearea

        movl    #SYS_sigreturn,sp@-     | push syscall number
        jbsr    _syscall                | handle it
        addql   #4,sp                   | pop syscall#
        movl    #SYS_sigreturn,sp@-     | push syscall number
        jbsr    _syscall                | handle it
        addql   #4,sp                   | pop syscall#

-       movl    sp@(60),a0              | grab and restore
+       movl    sp@(FR_SP),a0           | grab and restore

        movl    a0,usp                  |   user SP
        movl    a0,usp                  |   user SP

-       lea     sp@(64),a1              | pointer to HW frame
-       movw    a1@+,d0                 | do we need to adjust the stack?
+       lea     sp@(FR_HW),a1           | pointer to HW frame
+       movw    sp@(FR_ADJ),d0          | do we need to adjust the stack?

        jeq     Lsigr1                  | no, just continue
        moveq   #92,d1                  | total size
        subw    d0,d1                   |  - hole size = frame size
        jeq     Lsigr1                  | no, just continue
        moveq   #92,d1                  | total size
        subw    d0,d1                   |  - hole size = frame size


@@ -494,7 +515,7 @@ Lsigrlp:
        dbf     d1,Lsigrlp              | continue
        movl    a0,a1                   | new HW frame base
 Lsigr1:
        dbf     d1,Lsigrlp              | continue
        movl    a0,a1                   | new HW frame base
 Lsigr1:

-       movl    a1,sp@(60)              | new SP value
+       movl    a1,sp@(FR_SP)           | new SP value

        moveml  sp@+,#0x7FFF            | restore user registers
        movl    sp@,sp                  | and our SP
        jra     rei                     | all done
        moveml  sp@+,#0x7FFF            | restore user registers
        movl    sp@,sp                  | and our SP
        jra     rei                     | all done


@@ -513,7 +534,8 @@ Lsigr1:
  *     Level 6:        Clock
  *     Level 7:        Non-maskable: parity errors, RESET key
  */
  *     Level 6:        Clock
  *     Level 7:        Non-maskable: parity errors, RESET key
  */

-       .globl  _hilint, _intrhand, _hardclock, _nmihand
+       .globl  _hilint, _intrhand, _hardclock, _nmihand, _dmaintr
+       .globl  _dcafastservice

 
 _spurintr:
        addql   #1,_intrcnt+0
 
 _spurintr:
        addql   #1,_intrcnt+0


@@ -521,36 +543,47 @@ _spurintr:
        jra     rei
 
 _lev1intr:
        jra     rei
 
 _lev1intr:

-       addql   #1,_intrcnt+4
-       clrw    sp@-

        moveml  #0xC0C0,sp@-
        jbsr    _hilint
        moveml  sp@+,#0x0303
        moveml  #0xC0C0,sp@-
        jbsr    _hilint
        moveml  sp@+,#0x0303

-       addql   #2,sp
+       addql   #1,_intrcnt+4

        addql   #1,_cnt+V_INTR
        jra     rei
 
        addql   #1,_cnt+V_INTR
        jra     rei
 

-/* check for DMA first to reduce overhead */
+/*
+ * Check for unbuffered serial port (DCA) interrupts first in an attempt
+ * to minimize received character lossage.  Then we check for DMA activity
+ * to reduce overhead there.
+ */

 _lev5intr:
 _lev5intr:

-       clrw    sp@-

        moveml  #0xC0C0,sp@-
        moveml  #0xC0C0,sp@-

-       jbsr    _dmaintr
-       tstl    d0
-       jeq     Lnotdma
-       addql   #1,_intrcnt+24
+       tstl    _dcafastservice         | unbuffered port active?
+       jeq     Ltrydma                 | no, check DMA
+       clrl    sp@-                    | yes, check DCA port 0
+       jbsr    _dcaintr                |    first to avoid overflow
+       addql   #4,sp
+       tstl    d0                      | did it belong to DCA?
+       jeq     Ltrydma                 | no, go try DMA
+       moveml  sp@+,#0x0303
+       addql   #1,_intrcnt+20
+       addql   #1,_cnt+V_INTR
+       jra     rei
+Ltrydma:
+       jbsr    _dmaintr                | check DMA channels
+       tstl    d0                      | was it ours?
+       jeq     Lnotdma                 | no, go poll other devices

        moveml  sp@+,#0x0303
        moveml  sp@+,#0x0303

-       addql   #2,sp
+       addql   #1,_intrcnt+24

        addql   #1,_cnt+V_INTR
        jra     rei
 
 _lev2intr:
 _lev3intr:
 _lev4intr:
        addql   #1,_cnt+V_INTR
        jra     rei
 
 _lev2intr:
 _lev3intr:
 _lev4intr:

-       clrw    sp@-

        moveml  #0xC0C0,sp@-
 Lnotdma:
        lea     _intrcnt,a0
        moveml  #0xC0C0,sp@-
 Lnotdma:
        lea     _intrcnt,a0

-       movw    sp@(24),d0              | use vector offset
+       movw    sp@(22),d0              | use vector offset

        andw    #0xfff,d0               |   sans frame type
        addql   #1,a0@(-0x60,d0:w)      |     to increment apropos counter
        movw    sr,sp@-                 | push current SR value
        andw    #0xfff,d0               |   sans frame type
        addql   #1,a0@(-0x60,d0:w)      |     to increment apropos counter
        movw    sr,sp@-                 | push current SR value


@@ -558,49 +591,43 @@ Lnotdma:
        jbsr    _intrhand               | handle interrupt
        addql   #4,sp                   | pop SR
        moveml  sp@+,#0x0303
        jbsr    _intrhand               | handle interrupt
        addql   #4,sp                   | pop SR
        moveml  sp@+,#0x0303

-       addql   #2,sp

        addql   #1,_cnt+V_INTR
        jra     rei
 
 _lev6intr:
        addql   #1,_cnt+V_INTR
        jra     rei
 
 _lev6intr:

-       clrw    sp@-                    | pad ps
-       moveml  #0xC0C0,sp@-
-#ifdef DEBUG
-       .globl  _panicstr, _regdump, _panic
-       cmpl    #_kstack+NBPG,sp        | are we still in stack pages?
+#ifdef STACKCHECK
+       .globl  _panicstr,_badkstack
+       cmpl    #_kstack+NBPG,sp        | are we still in stack page?

        jcc     Lstackok                | yes, continue normally
        tstl    _curproc                | if !curproc could have swtch_exit'ed,
        jeq     Lstackok                |     might be on tmpstk
        tstl    _panicstr               | have we paniced?
        jne     Lstackok                | yes, do not re-panic
        jcc     Lstackok                | yes, continue normally
        tstl    _curproc                | if !curproc could have swtch_exit'ed,
        jeq     Lstackok                |     might be on tmpstk
        tstl    _panicstr               | have we paniced?
        jne     Lstackok                | yes, do not re-panic

-       lea     tmpstk,sp               | no, switch to tmpstk
-       moveml  #0xFFFF,sp@-            | push all registers
-       movl    #Lstkrip,sp@-           | push panic message
-       jbsr    _printf                 | preview
+       movl    sp@(4),tmpstk-4         | no, copy common
+       movl    sp@,tmpstk-8            |  frame info
+       movl    sp,tmpstk-16            | no, save original SP
+       lea     tmpstk-16,sp            | switch to tmpstk
+       moveml  #0xFFFE,sp@-            | push remaining registers
+       movl    #1,sp@-                 | is an overflow
+       jbsr    _badkstack              | badkstack(1, frame)

        addql   #4,sp
        addql   #4,sp

-       movl    sp,a0                   | remember this spot
-       movl    #256,sp@-               | longword count
-       movl    a0,sp@-                 | and reg pointer
-       jbsr    _regdump                | dump core
-       addql   #8,sp                   | pop params
-       movl    #Lstkrip,sp@-           | push panic message
-       jbsr    _panic                  | ES and D
-Lstkrip:
-       .asciz  "k-stack overflow"
-       .even
+       moveml  sp@+,#0x7FFF            | restore most registers
+       movl    sp@,sp                  | and SP

 Lstackok:
 #endif
 Lstackok:
 #endif

+       moveml  #0xC0C0,sp@-            | save scratch registers

        CLKADDR(a0)
        lea     sp@(16),a1              | a1 = &clockframe
        movb    a0@(CLKSR),d0           | read clock status
        btst    #2,d0                   | timer3 interrupt?
        jeq     1f                      | no, skip statintr
        CLKADDR(a0)
        lea     sp@(16),a1              | a1 = &clockframe
        movb    a0@(CLKSR),d0           | read clock status
        btst    #2,d0                   | timer3 interrupt?
        jeq     1f                      | no, skip statintr

+       movb    a0@(CLKMSB3),d1         | clear timer3 interrupt

        addql   #1,_intrcnt+32          | count statclock interrupts
        movl    d0,sp@-                 | save status
        movl    a1,sp@-
        jbsr    _statintr               | statintr(&frame)
        addql   #4,sp
        addql   #1,_intrcnt+32          | count statclock interrupts
        movl    d0,sp@-                 | save status
        movl    a1,sp@-
        jbsr    _statintr               | statintr(&frame)
        addql   #4,sp

-       movl    sp@+,d0                 | restore registers
+       movl    sp@+,d0                 | restore status

        CLKADDR(a0)
        lea     sp@(16),a1
 1:
        CLKADDR(a0)
        lea     sp@(16),a1
 1:


@@ -612,22 +639,21 @@ Lstackok:
        jbsr    _hardclock              | hardclock(&frame)
        addql   #4,sp
 2:
        jbsr    _hardclock              | hardclock(&frame)
        addql   #4,sp
 2:

-       moveml  sp@+,#0x0303            | restore scratch regs
-       addql   #2,sp                   | pop pad word
+       moveml  sp@+,#0x0303            | restore scratch registers

        addql   #1,_cnt+V_INTR          | chalk up another interrupt
        jra     rei                     | all done
 
 _lev7intr:
        addql   #1,_intrcnt+36
        addql   #1,_cnt+V_INTR          | chalk up another interrupt
        jra     rei                     | all done
 
 _lev7intr:
        addql   #1,_intrcnt+36

-       clrw    sp@-                    | pad SR to longword
+       clrl    sp@-

        moveml  #0xFFFF,sp@-            | save registers
        movl    usp,a0                  | and save
        moveml  #0xFFFF,sp@-            | save registers
        movl    usp,a0                  | and save

-       movl    a0,sp@(60)              |   the user stack pointer
+       movl    a0,sp@(FR_SP)           |   the user stack pointer

        jbsr    _nmihand                | call handler
        jbsr    _nmihand                | call handler

-       movl    sp@(60),a0              | restore
+       movl    sp@(FR_SP),a0           | restore

        movl    a0,usp                  |   user SP
        moveml  sp@+,#0x7FFF            | and remaining registers
        movl    a0,usp                  |   user SP
        moveml  sp@+,#0x7FFF            | and remaining registers

-       addql   #6,sp                   | pop SSP and align word
+       addql   #8,sp                   | pop SP and stack adjust

        jra     rei                     | all done
 
 /*
        jra     rei                     | all done
 
 /*


@@ -637,7 +663,8 @@ _lev7intr:
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we

- * do not have to do it here.
+ * do not have to do it here.  After identifing that we need an AST we
+ * drop the IPL to allow device interrupts.

  *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.


@@ -645,42 +672,51 @@ _lev7intr:
        .comm   _ssir,1
        .globl  _astpending
 rei:
        .comm   _ssir,1
        .globl  _astpending
 rei:

-#ifdef DEBUG
+#ifdef STACKCHECK

        tstl    _panicstr               | have we paniced?
        tstl    _panicstr               | have we paniced?

-       jne     Ldorte                  | yes, do not make matters worse
+       jne     Ldorte1                 | yes, do not make matters worse

 #endif
        tstl    _astpending             | AST pending?
        jeq     Lchksir                 | no, go check for SIR
 Lrei1:
        btst    #5,sp@                  | yes, are we returning to user mode?
        jne     Lchksir                 | no, go check for SIR
 #endif
        tstl    _astpending             | AST pending?
        jeq     Lchksir                 | no, go check for SIR
 Lrei1:
        btst    #5,sp@                  | yes, are we returning to user mode?
        jne     Lchksir                 | no, go check for SIR

-       clrw    sp@-                    | pad SR to longword
+       movw    #PSL_LOWIPL,sr          | lower SPL
+       clrl    sp@-                    | stack adjust

        moveml  #0xFFFF,sp@-            | save all registers
        movl    usp,a1                  | including
        moveml  #0xFFFF,sp@-            | save all registers
        movl    usp,a1                  | including

-       movl    a1,sp@(60)              |    the users SP
+       movl    a1,sp@(FR_SP)           |    the users SP

        clrl    sp@-                    | VA == none
        clrl    sp@-                    | code == none
        movl    #T_ASTFLT,sp@-          | type == async system trap
        jbsr    _trap                   | go handle it
        lea     sp@(12),sp              | pop value args
        clrl    sp@-                    | VA == none
        clrl    sp@-                    | code == none
        movl    #T_ASTFLT,sp@-          | type == async system trap
        jbsr    _trap                   | go handle it
        lea     sp@(12),sp              | pop value args

-       movl    sp@(60),a0              | restore user SP
+       movl    sp@(FR_SP),a0           | restore user SP

        movl    a0,usp                  |   from save area
        movl    a0,usp                  |   from save area

-       movw    sp@(64),d0              | need to adjust stack?
+       movw    sp@(FR_ADJ),d0          | need to adjust stack?

        jne     Laststkadj              | yes, go to it
        moveml  sp@+,#0x7FFF            | no, restore most user regs
        jne     Laststkadj              | yes, go to it
        moveml  sp@+,#0x7FFF            | no, restore most user regs

-       addql   #6,sp                   | toss SSP and pad
+       addql   #8,sp                   | toss SP and stack adjust
+#ifdef STACKCHECK
+       jra     Ldorte
+#else

        rte                             | and do real RTE
        rte                             | and do real RTE

+#endif

 Laststkadj:
 Laststkadj:

-       lea     sp@(66),a1              | pointer to HW frame
+       lea     sp@(FR_HW),a1           | pointer to HW frame

        addql   #8,a1                   | source pointer
        movl    a1,a0                   | source
        addw    d0,a0                   |  + hole size = dest pointer
        movl    a1@-,a0@-               | copy
        movl    a1@-,a0@-               |  8 bytes
        addql   #8,a1                   | source pointer
        movl    a1,a0                   | source
        addw    d0,a0                   |  + hole size = dest pointer
        movl    a1@-,a0@-               | copy
        movl    a1@-,a0@-               |  8 bytes

-       movl    a0,sp@(60)              | new SSP
+       movl    a0,sp@(FR_SP)           | new SSP

        moveml  sp@+,#0x7FFF            | restore user registers
        movl    sp@,sp                  | and our SP
        moveml  sp@+,#0x7FFF            | restore user registers
        movl    sp@,sp                  | and our SP

-       rte                             | and return
+#ifdef STACKCHECK
+       jra     Ldorte
+#else
+       rte                             | and do real RTE
+#endif

 Lchksir:
        tstb    _ssir                   | SIR pending?
        jeq     Ldorte                  | no, all done
 Lchksir:
        tstb    _ssir                   | SIR pending?
        jeq     Ldorte                  | no, all done


@@ -693,23 +729,63 @@ Lgotsir:
        movw    #SPL1,sr                | prevent others from servicing int
        tstb    _ssir                   | too late?
        jeq     Ldorte                  | yes, oh well...
        movw    #SPL1,sr                | prevent others from servicing int
        tstb    _ssir                   | too late?
        jeq     Ldorte                  | yes, oh well...

-       clrw    sp@-                    | pad SR to longword
+       clrl    sp@-                    | stack adjust

        moveml  #0xFFFF,sp@-            | save all registers
        movl    usp,a1                  | including
        moveml  #0xFFFF,sp@-            | save all registers
        movl    usp,a1                  | including

-       movl    a1,sp@(60)              |    the users SP
+       movl    a1,sp@(FR_SP)           |    the users SP

        clrl    sp@-                    | VA == none
        clrl    sp@-                    | code == none
        movl    #T_SSIR,sp@-            | type == software interrupt
        jbsr    _trap                   | go handle it
        lea     sp@(12),sp              | pop value args
        clrl    sp@-                    | VA == none
        clrl    sp@-                    | code == none
        movl    #T_SSIR,sp@-            | type == software interrupt
        jbsr    _trap                   | go handle it
        lea     sp@(12),sp              | pop value args

-       movl    sp@(60),a0              | restore
+       movl    sp@(FR_SP),a0           | restore

        movl    a0,usp                  |   user SP
        moveml  sp@+,#0x7FFF            | and all remaining registers
        movl    a0,usp                  |   user SP
        moveml  sp@+,#0x7FFF            | and all remaining registers

-       addql   #6,sp                   | pop SSP and align word
+       addql   #8,sp                   | pop SP and stack adjust
+#ifdef STACKCHECK
+       jra     Ldorte
+#else

        rte
        rte

+#endif

 Lnosir:
        movl    sp@+,d0                 | restore scratch register
 Ldorte:
 Lnosir:
        movl    sp@+,d0                 | restore scratch register
 Ldorte:

+#ifdef STACKCHECK
+       movw    #SPL6,sr                | avoid trouble
+       btst    #5,sp@                  | are we returning to user mode?
+       jne     Ldorte1                 | no, skip it
+       movl    a6,tmpstk-20
+       movl    d0,tmpstk-76
+       moveq   #0,d0
+       movb    sp@(6),d0               | get format/vector
+       lsrl    #3,d0                   | convert to index
+       lea     _exframesize,a6         |  into exframesize
+       addl    d0,a6                   |  to get pointer to correct entry
+       movw    a6@,d0                  | get size for this frame
+       addql   #8,d0                   | adjust for unaccounted for bytes
+       lea     _kstackatbase,a6        | desired stack base
+       subl    d0,a6                   |   - frame size == our stack
+       cmpl    a6,sp                   | are we where we think?
+       jeq     Ldorte2                 | yes, skip it
+       lea     tmpstk,a6               | will be using tmpstk
+       movl    sp@(4),a6@-             | copy common
+       movl    sp@,a6@-                |   frame info
+       clrl    a6@-
+       movl    sp,a6@-                 | save sp
+       subql   #4,a6                   | skip over already saved a6
+       moveml  #0x7FFC,a6@-            | push remaining regs (d0/a6/a7 done)
+       lea     a6@(-4),sp              | switch to tmpstk (skip saved d0)
+       clrl    sp@-                    | is an underflow
+       jbsr    _badkstack              | badkstack(0, frame)
+       addql   #4,sp
+       moveml  sp@+,#0x7FFF            | restore most registers
+       movl    sp@,sp                  | and SP
+       rte
+Ldorte2:
+       movl    tmpstk-76,d0
+       movl    tmpstk-20,a6
+Ldorte1:
+#endif

        rte                             | real return
 
 /*
        rte                             | real return
 
 /*


@@ -719,6 +795,8 @@ Ldorte:
  */
        .data
        .set    _kstack,USRSTACK
  */
        .data
        .set    _kstack,USRSTACK

+       .set    _kstackatbase,USRSTACK+UPAGES*NBPG-4
+       .globl  _kstackatbase

 _Umap: .long   0
        .globl  _kstack, _Umap
 
 _Umap: .long   0
        .globl  _kstack, _Umap
 


@@ -791,8 +869,6 @@ Lnot68030:
        beq     Lis68020                | yes, we have 68020
        moveq   #0,d0                   | now turn it back off
        movec   d0,cacr                 |   before we access any data
        beq     Lis68020                | yes, we have 68020
        moveq   #0,d0                   | now turn it back off
        movec   d0,cacr                 |   before we access any data

-       RELOC(_machineid, a0)
-       movl    #7,a0@                  | we have a 380

        RELOC(_mmutype, a0)
        movl    #-2,a0@                 | with a 68040 MMU
        RELOC(_ectype, a0)
        RELOC(_mmutype, a0)
        movl    #-2,a0@                 | with a 68040 MMU
        RELOC(_ectype, a0)


@@ -801,6 +877,15 @@ Lnot68030:
        RELOC(_processor, a0)
        movl    #3,a0@                  | HP-UX style processor id
 #endif
        RELOC(_processor, a0)
        movl    #3,a0@                  | HP-UX style processor id
 #endif

+       RELOC(_machineid, a0)
+       movl    a1@(MMUCMD),d0          | read MMU register
+       lsrl    #8,d0                   | get apparent ID
+       cmpb    #6,d0                   | id == 6?
+       jeq     Lis33mhz                | yes, we have a 433s
+       movl    #7,a0@                  | no, we have a 380/425t
+       jra     Lstart1
+Lis33mhz:
+       movl    #8,a0@                  | 433s (XXX 425s returns same ID, ugh!)

        jra     Lstart1
 Lis68020:
        movl    #1,a1@(MMUCMD)          | a 68020, write HP MMU location
        jra     Lstart1
 Lis68020:
        movl    #1,a1@(MMUCMD)          | a 68020, write HP MMU location


@@ -938,12 +1023,6 @@ Lfinish:
 /* select the software page size now */
        lea     tmpstk,sp               | temporary stack
        jbsr    _vm_set_page_size       | select software page size
 /* select the software page size now */
        lea     tmpstk,sp               | temporary stack
        jbsr    _vm_set_page_size       | select software page size

-#ifdef BOOTDEBUG
-       movl    a5,sp@-                 | phys load address (assumes VA 0)
-       movl    a4,sp@-                 | first available PA
-       jbsr    _Opmap_bootstrap        | sync up pmap module
-       addql   #8,sp
-#endif

 /* set kernel stack, user SP, and initial pcb */
        lea     _kstack,a1              | proc0 kernel stack
        lea     a1@(UPAGES*NBPG-4),sp   | set kernel stack to end of area
 /* set kernel stack, user SP, and initial pcb */
        lea     _kstack,a1              | proc0 kernel stack
        lea     a1@(UPAGES*NBPG-4),sp   | set kernel stack to end of area


@@ -951,7 +1030,6 @@ Lfinish:
        movl    a2,usp                  | init user SP
        movl    _proc0paddr,a1          | get proc0 pcb addr
        movl    a1,_curpcb              | proc0 is running
        movl    a2,usp                  | init user SP
        movl    _proc0paddr,a1          | get proc0 pcb addr
        movl    a1,_curpcb              | proc0 is running

-       clrw    a1@(PCB_FLAGS)          | clear flags

 #ifdef FPCOPROC
        clrl    a1@(PCB_FPCTX)          | ensure null FP context
        movl    a1,sp@-
 #ifdef FPCOPROC
        clrl    a1@(PCB_FPCTX)          | ensure null FP context
        movl    a1,sp@-


@@ -970,6 +1048,7 @@ Lfinish:
        orl     #MMU_CEN,a0@(MMUCMD)    | turn on external cache
 Lnocache0:
 /* final setup for C code */
        orl     #MMU_CEN,a0@(MMUCMD)    | turn on external cache
 Lnocache0:
 /* final setup for C code */

+       jbsr    _isrinit                | be ready for stray ints

        movw    #PSL_LOWIPL,sr          | lower SPL
        movl    d7,_boothowto           | save reboot flags
        movl    d6,_bootdev             |   and boot device
        movw    #PSL_LOWIPL,sr          | lower SPL
        movl    d7,_boothowto           | save reboot flags
        movl    d6,_bootdev             |   and boot device


@@ -1059,6 +1138,12 @@ _szicode:
        .globl _/**/name; _/**/name:
 #endif
 
        .globl _/**/name; _/**/name:
 #endif
 

+/*
+ * For gcc2
+ */
+ENTRY(__main)
+       rts
+

 /*
  * copyinstr(fromaddr, toaddr, maxlength, &lencopied)
  *
 /*
  * copyinstr(fromaddr, toaddr, maxlength, &lencopied)
  *


@@ -1177,10 +1262,16 @@ Lcsflt2:
        jra     Lcsdone 
 
 /* 
        jra     Lcsdone 
 
 /* 

- * Copyin(from, to, len)
+ * Copyin(from_user, to_kernel, len)
+ * Copyout(from_kernel, to_user, len)
+ *
+ * Copy specified amount of data between kernel and user space.

  *
  *

- * Copy specified amount of data from user space into the kernel.
- * NOTE: len must be < 64K
+ * XXX both use the DBcc instruction which has 16-bit limitation so only
+ * 64k units can be copied, where "unit" is either a byte or a longword
+ * depending on alignment.  To be safe, assume it can copy at most
+ * 64k bytes.  Don't make MAXBSIZE or MAXPHYS larger than 64k without
+ * fixing this code!

  */
 ENTRY(copyin)
        movl    d2,sp@-                 | scratch register
  */
 ENTRY(copyin)
        movl    d2,sp@-                 | scratch register


@@ -1232,12 +1323,6 @@ Lciflt:
        moveq   #EFAULT,d0              | got a fault
        jra     Lciexit
 
        moveq   #EFAULT,d0              | got a fault
        jra     Lciexit
 

-/* 
- * Copyout(from, to, len)
- *
- * Copy specified amount of data from kernel to the user space
- * NOTE: len must be < 64K
- */

 ENTRY(copyout)
        movl    d2,sp@-                 | scratch register
        movl    _curpcb,a0              | current pcb
 ENTRY(copyout)
        movl    d2,sp@-                 | scratch register
        movl    _curpcb,a0              | current pcb


@@ -1298,15 +1383,6 @@ ENTRY(setjmp)
        moveq   #0,d0           | return 0
        rts
 
        moveq   #0,d0           | return 0
        rts
 

-ENTRY(qsetjmp)
-       movl    sp@(4),a0       | savearea pointer
-       lea     a0@(40),a0      | skip regs we do not save
-       movl    a6,a0@+         | save FP
-       movl    sp,a0@+         | save SP
-       movl    sp@,a0@         | and return address
-       moveq   #0,d0           | return 0
-       rts
-

 ENTRY(longjmp)
        movl    sp@(4),a0
        moveml  a0@+,#0xFCFC
 ENTRY(longjmp)
        movl    sp@(4),a0
        moveml  a0@+,#0xFCFC


@@ -1405,8 +1481,8 @@ Lsw0:
 _masterpaddr:                  | XXX compatibility (debuggers)
 _curpcb:
        .long   0
 _masterpaddr:                  | XXX compatibility (debuggers)
 _curpcb:
        .long   0

-pcbflag:
-       .byte   0               | copy of pcb_flags low byte
+mdpflag:
+       .byte   0               | copy of proc md_flags low byte

        .align  2
        .comm   nullpcb,SIZEOF_PCB
        .text
        .align  2
        .comm   nullpcb,SIZEOF_PCB
        .text


@@ -1421,15 +1497,20 @@ ENTRY(swtch_exit)
        movl    #nullpcb,_curpcb        | save state into garbage pcb
        lea     tmpstk,sp               | goto a tmp stack
        jra     _cpu_swtch
        movl    #nullpcb,_curpcb        | save state into garbage pcb
        lea     tmpstk,sp               | goto a tmp stack
        jra     _cpu_swtch

+#ifdef GPROF
+       nop
+       nop
+       nop
+       nop
+#endif

 
 /*
  * When no processes are on the runq, Swtch branches to idle
  * to wait for something to come ready.
  */
 
 /*
  * When no processes are on the runq, Swtch branches to idle
  * to wait for something to come ready.
  */

-       .globl  Idle
+       .globl  idle

 Lidle:
        stop    #PSL_LOWIPL
 Lidle:
        stop    #PSL_LOWIPL

-Idle:

 idle:
        movw    #PSL_HIGHIPL,sr
        tstl    _whichqs
 idle:
        movw    #PSL_HIGHIPL,sr
        tstl    _whichqs


@@ -1540,9 +1621,9 @@ Lswnofpsave:
        jne     Lbadsw
 #endif
        clrl    a0@(P_RLINK)            | clear back link
        jne     Lbadsw
 #endif
        clrl    a0@(P_RLINK)            | clear back link

+       movb    a0@(P_MDFLAG+3),mdpflag | low byte of p_md.md_flags

        movl    a0@(P_ADDR),a1          | get p_addr
        movl    a1,_curpcb
        movl    a0@(P_ADDR),a1          | get p_addr
        movl    a1,_curpcb

-       movb    a1@(PCB_FLAGS+1),pcbflag | copy of pcb_flags low byte

 
        /* see if pmap_activate needs to be called; should remove this */
        movl    a0@(P_VMSPACE),a0       | vmspace = p->p_vmspace
 
        /* see if pmap_activate needs to be called; should remove this */
        movl    a0@(P_VMSPACE),a0       | vmspace = p->p_vmspace


@@ -2187,24 +2268,6 @@ Lhpmmu9:
 #endif
        rts
 
 #endif
        rts
 

-/*
- * Flush any hardware context associated with given USTP.
- * Only does something for HP330 where we must flush RPT
- * and ATC entries in PMMU.
- */
-ENTRY(flushustp)
-#if defined(HP330)
-       tstl    _mmutype                | 68851 PMMU?
-       jle     Lnot68851               | no, nothing to do
-       movl    sp@(4),d0               | get USTP to flush
-       moveq   #PGSHIFT,d1
-       lsll    d1,d0                   | convert to address
-       movl    d0,_protorp+4           | stash USTP
-       pflushr _protorp                | flush RPT/TLB entries
-Lnot68851:
-#endif
-       rts
-

 ENTRY(ploadw)
 #if defined(HP330) || defined(HP360) || defined(HP370)
        movl    sp@(4),a0               | address to load
 ENTRY(ploadw)
 #if defined(HP330) || defined(HP360) || defined(HP370)
        movl    sp@(4),a0               | address to load


@@ -2550,8 +2613,6 @@ LhpmmuB:
 Lebootcode:
 
        .data
 Lebootcode:
 
        .data

-       .space  NBPG
-tmpstk:

        .globl  _machineid
 _machineid:
        .long   0               | default to 320
        .globl  _machineid
 _machineid:
        .long   0               | default to 320


@@ -2592,9 +2653,6 @@ fulltflush:
        .long   0
 fullcflush:
        .long   0
        .long   0
 fullcflush:
        .long   0

-       .globl  timebomb
-timebomb:
-       .long   0

 #endif
 #ifdef HPFPLIB
 /*
 #endif
 #ifdef HPFPLIB
 /*