[SPARC64]: Fix trap stack allocations so gcc-3.x builds work.

1) Use PTREGS_OFF consistently
2) Define it to allocate STACKFRAME_SZ instead of REGWIN_SZ
3) Kill off REGWIN_SZ, replace with sizeof(struct reg_window).

diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 8b617acad3afc503d8aa414b3315a0d0cdf63a25..61fde72e8bc807c830f527a536b00d976419ffe4 100644 (file)
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -272,7 +272,7 @@ fpdis_exit2:
        .align          32
 fp_other_bounce:
        call            do_fpother
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -499,7 +499,7 @@ do_ivec_spurious:
        ba,pt           %xcc, etrap
 109:    or             %g7, %lo(109b), %g7
        call            catch_disabled_ivec
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -606,7 +606,7 @@ utrap:      brz,pn          %g1, etrap
        done
 utrap_ill:
         call           bad_trap
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -711,7 +711,7 @@ floppy_dosoftint:
        mov             11, %o0
        mov             0, %o1
        call            sparc_floppy_irq
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o2
+        add            %sp, PTREGS_OFF, %o2
 
        b,pt            %xcc, rtrap_irq
         nop
@@ -757,7 +757,7 @@ __do_data_access_exception:
        mov             %l4, %o1
        mov             %l5, %o2
        call            data_access_exception
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -778,7 +778,7 @@ __do_instruction_access_exception_tl1:
        mov             %l4, %o1
        mov             %l5, %o2
        call            instruction_access_exception_tl1
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -797,7 +797,7 @@ __do_instruction_access_exception:
        mov             %l4, %o1
        mov             %l5, %o2
        call            instruction_access_exception
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -889,7 +889,7 @@ cee_trap:
 
        mov     %l5, %o1
        call    cee_log
-        add    %sp, STACK_BIAS + REGWIN_SZ, %o2
+        add    %sp, PTREGS_OFF, %o2
        ba,a,pt %xcc, rtrap_irq
 
        /* Capture I/D/E-cache state into per-cpu error scoreboard.
@@ -1104,7 +1104,7 @@ do_cheetah_plus_data_parity:
         rd             %pc, %g7
        mov             0x0, %o0
        call            cheetah_plus_parity_error
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o1
+        add            %sp, PTREGS_OFF, %o1
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -1134,7 +1134,7 @@ do_cheetah_plus_insn_parity:
         rd             %pc, %g7
        mov             0x1, %o0
        call            cheetah_plus_parity_error
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o1
+        add            %sp, PTREGS_OFF, %o1
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -1196,7 +1196,7 @@ do_dcpe_tl1_fatal:
 1:     or              %g7, %lo(1b), %g7
        mov             0x2, %o0
        call            cheetah_plus_parity_error
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o1
+        add            %sp, PTREGS_OFF, %o1
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -1234,7 +1234,7 @@ do_icpe_tl1_fatal:
 1:     or              %g7, %lo(1b), %g7
        mov             0x3, %o0
        call            cheetah_plus_parity_error
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o1
+        add            %sp, PTREGS_OFF, %o1
        ba,pt           %xcc, rtrap
         clr            %l6
        
@@ -1290,7 +1290,7 @@ cheetah_fast_ecc:
        mov             %l4, %o1
        mov             %l5, %o2
        call            cheetah_fecc_handler
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,a,pt         %xcc, rtrap_irq
 
        /* Our caller has disabled I-cache and performed membar Sync. */
@@ -1316,7 +1316,7 @@ cheetah_cee:
        mov             %l4, %o1
        mov             %l5, %o2
        call            cheetah_cee_handler
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,a,pt         %xcc, rtrap_irq
 
        /* Our caller has disabled I-cache+D-cache and performed membar Sync. */
@@ -1342,7 +1342,7 @@ cheetah_deferred_trap:
        mov             %l4, %o1
        mov             %l5, %o2
        call            cheetah_deferred_handler
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,a,pt         %xcc, rtrap_irq
 
        .globl          __do_privact
@@ -1354,7 +1354,7 @@ __do_privact:
        ba,pt           %xcc, etrap
 109:   or              %g7, %lo(109b), %g7
        call            do_privact
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -1381,7 +1381,7 @@ do_mna:
        mov             %l4, %o1
        mov             %l5, %o2
        call            mem_address_unaligned
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -1399,7 +1399,7 @@ do_lddfmna:
        mov             %l4, %o1
        mov             %l5, %o2
        call            handle_lddfmna
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
@@ -1417,14 +1417,14 @@ do_stdfmna:
        mov             %l4, %o1
        mov             %l5, %o2
        call            handle_stdfmna
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
 
        .globl  breakpoint_trap
 breakpoint_trap:
        call            sparc_breakpoint
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         nop
 
@@ -1460,9 +1460,9 @@ sunos_getpid:
        call    sys_getppid
         nop
        call    sys_getpid
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]
+        stx    %o0, [%sp + PTREGS_OFF + PT_V9_I1]
        b,pt    %xcc, ret_sys_call
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+        stx    %o0, [%sp + PTREGS_OFF + PT_V9_I0]
 
        /* SunOS getuid() returns uid in %o0 and euid in %o1 */
        .globl  sunos_getuid
@@ -1470,9 +1470,9 @@ sunos_getuid:
        call    sys32_geteuid16
         nop
        call    sys32_getuid16
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]
+        stx    %o0, [%sp + PTREGS_OFF + PT_V9_I1]
        b,pt    %xcc, ret_sys_call
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+        stx    %o0, [%sp + PTREGS_OFF + PT_V9_I0]
 
        /* SunOS getgid() returns gid in %o0 and egid in %o1 */
        .globl  sunos_getgid
@@ -1480,9 +1480,9 @@ sunos_getgid:
        call    sys32_getegid16
         nop
        call    sys32_getgid16
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]
+        stx    %o0, [%sp + PTREGS_OFF + PT_V9_I1]
        b,pt    %xcc, ret_sys_call
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+        stx    %o0, [%sp + PTREGS_OFF + PT_V9_I0]
 #endif
 
        /* SunOS's execv() call only specifies the argv argument, the
@@ -1494,14 +1494,14 @@ sys_execve:
        ba,pt           %xcc, execve_merge
         or             %g1, %lo(sparc_execve), %g1
 sunos_execv:
-       stx             %g0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I2]
+       stx             %g0, [%sp + PTREGS_OFF + PT_V9_I2]
 sys32_execve:
        sethi           %hi(sparc32_execve), %g1
        or              %g1, %lo(sparc32_execve), %g1
 execve_merge:
        flushw
        jmpl            %g1, %g0
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
 
        .globl  sys_pipe, sys_sigpause, sys_nis_syscall
        .globl  sys_sigsuspend, sys_rt_sigsuspend, sys32_rt_sigsuspend
@@ -1512,12 +1512,12 @@ execve_merge:
        .globl  sys32_sigstack
        .align  32
 sys_pipe:      ba,pt           %xcc, sparc_pipe
-                add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+                add            %sp, PTREGS_OFF, %o0
 sys_nis_syscall:ba,pt          %xcc, c_sys_nis_syscall
-                add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+                add            %sp, PTREGS_OFF, %o0
 sys_memory_ordering:
                ba,pt           %xcc, sparc_memory_ordering
-                add            %sp, STACK_BIAS + REGWIN_SZ, %o1
+                add            %sp, PTREGS_OFF, %o1
 sys_sigaltstack:ba,pt          %xcc, do_sigaltstack
                 add            %i6, STACK_BIAS, %o2
 sys32_sigstack:        ba,pt           %xcc, do_sys32_sigstack
@@ -1527,41 +1527,41 @@ sys32_sigaltstack:
                 mov            %i6, %o2
 
                .align          32
-sys_sigsuspend:        add             %sp, STACK_BIAS + REGWIN_SZ, %o0
+sys_sigsuspend:        add             %sp, PTREGS_OFF, %o0
                call            do_sigsuspend
                 add            %o7, 1f-.-4, %o7
                nop
 sys_rt_sigsuspend: /* NOTE: %o0,%o1 have a correct value already */
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o2
+               add             %sp, PTREGS_OFF, %o2
                call            do_rt_sigsuspend
                 add            %o7, 1f-.-4, %o7
                nop
 sys32_rt_sigsuspend: /* NOTE: %o0,%o1 have a correct value already */
                srl             %o0, 0, %o0
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o2
+               add             %sp, PTREGS_OFF, %o2
                call            do_rt_sigsuspend32
                 add            %o7, 1f-.-4, %o7
                /* NOTE: %o0 has a correct value already */
-sys_sigpause:  add             %sp, STACK_BIAS + REGWIN_SZ, %o1
+sys_sigpause:  add             %sp, PTREGS_OFF, %o1
                call            do_sigpause
                 add            %o7, 1f-.-4, %o7
                nop
 sys32_sigreturn:
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
+               add             %sp, PTREGS_OFF, %o0
                call            do_sigreturn32
                 add            %o7, 1f-.-4, %o7
                nop
 sys_rt_sigreturn:
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
+               add             %sp, PTREGS_OFF, %o0
                call            do_rt_sigreturn
                 add            %o7, 1f-.-4, %o7
                nop
 sys32_rt_sigreturn:
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
+               add             %sp, PTREGS_OFF, %o0
                call            do_rt_sigreturn32
                 add            %o7, 1f-.-4, %o7
                nop
-sys_ptrace:    add             %sp, STACK_BIAS + REGWIN_SZ, %o0
+sys_ptrace:    add             %sp, PTREGS_OFF, %o0
                call            do_ptrace
                 add            %o7, 1f-.-4, %o7
                nop
@@ -1612,7 +1612,7 @@ sys_clone:        flushw
                movrz           %o1, %fp, %o1
                mov             0, %o3
                ba,pt           %xcc, sparc_do_fork
-                add            %sp, STACK_BIAS + REGWIN_SZ, %o2
+                add            %sp, PTREGS_OFF, %o2
 ret_from_syscall:
                /* Clear SPARC_FLAG_NEWCHILD, switch_to leaves thread.flags in
                 * %o7 for us.  Check performance counter stuff too.
@@ -1638,7 +1638,7 @@ ret_from_syscall:
                rd              %pic, %g0
 
 1:             b,pt            %xcc, ret_sys_call
-                ldx            [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0], %o0
+                ldx            [%sp + PTREGS_OFF + PT_V9_I0], %o0
 sparc_exit:    wrpr            %g0, (PSTATE_RMO | PSTATE_PEF | PSTATE_PRIV), %pstate
                rdpr            %otherwin, %g1
                rdpr            %cansave, %g3
@@ -1686,7 +1686,7 @@ linux_sparc_syscall32:
        sll             %g1, 2, %l4                             ! IEU0  Group
 #ifdef SYSCALL_TRACING
        call            syscall_trace_entry
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        srl             %i0, 0, %o0
 #endif
        mov             %i4, %o4                                ! IEU1
@@ -1714,7 +1714,7 @@ linux_sparc_syscall:
        sll             %g1, 2, %l4                             ! IEU0  Group
 #ifdef SYSCALL_TRACING
        call            syscall_trace_entry
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        mov             %i0, %o0
 #endif
        mov             %i1, %o1                                ! IEU1
@@ -1731,16 +1731,16 @@ linux_sparc_syscall:
         mov            %i5, %o5                                ! IEU0
        nop
 
-3:     stx             %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+3:     stx             %o0, [%sp + PTREGS_OFF + PT_V9_I0]
 ret_sys_call:
 #ifdef SYSCALL_TRACING
        mov             %o0, %o1
        call            syscall_trace_exit
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        mov             %o1, %o0
 #endif
-       ldx             [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE], %g3
-       ldx             [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1 ! pc = npc
+       ldx             [%sp + PTREGS_OFF + PT_V9_TSTATE], %g3
+       ldx             [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
        sra             %o0, 0, %o0
        mov             %ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2
        cmp             %o0, -ENOIOCTLCMD
@@ -1749,12 +1749,12 @@ ret_sys_call:
 
         andcc          %l0, _TIF_SYSCALL_TRACE, %l6    
        andn            %g3, %g2, %g3           /* System call success, clear Carry condition code. */
-       stx             %g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]      
+       stx             %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]  
        bne,pn          %icc, linux_syscall_trace2
         add            %l1, 0x4, %l2                                    ! npc = npc+4
-       stx             %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
+       stx             %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
        ba,pt           %xcc, rtrap_clr_l6
-        stx            %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
+        stx            %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
 
 1:
        /* System call failure, set Carry condition code.
@@ -1762,21 +1762,21 @@ ret_sys_call:
         */
        sub             %g0, %o0, %o0
        or              %g3, %g2, %g3
-       stx             %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+       stx             %o0, [%sp + PTREGS_OFF + PT_V9_I0]
        mov             1, %l6
-       stx             %g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]
+       stx             %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]
        bne,pn          %icc, linux_syscall_trace2
         add            %l1, 0x4, %l2                                    !npc = npc+4
-       stx             %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
+       stx             %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
 
        b,pt            %xcc, rtrap
-        stx            %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
+        stx            %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
 linux_syscall_trace2:
        call            syscall_trace
         nop
-       stx             %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
+       stx             %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
        ba,pt           %xcc, rtrap
-        stx            %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
+        stx            %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
 
        .align          32
        .globl          __flushw_user

diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S
index 527f2c02b51f3546e74215f1b7c94739049c4935..9468eacdc9c0c7a2893d990a524977b486c5901c 100644 (file)
--- a/arch/sparc64/kernel/etrap.S
+++ b/arch/sparc64/kernel/etrap.S
@@ -15,7 +15,7 @@
 #include <asm/head.h>
 #include <asm/processor.h>
 
-#define                TASK_REGOFF             (THREAD_SIZE-TRACEREG_SZ-REGWIN_SZ)
+#define                TASK_REGOFF             (THREAD_SIZE-TRACEREG_SZ-STACKFRAME_SZ)
 #define                ETRAP_PSTATE1           (PSTATE_RMO | PSTATE_PRIV)
 #define                ETRAP_PSTATE2           (PSTATE_RMO | PSTATE_PEF | PSTATE_PRIV | PSTATE_IE)
 
@@ -33,8 +33,8 @@ etrap_irq:
                sllx    %g2, 20, %g3                                            ! IEU0          Group
                andcc   %g1, TSTATE_PRIV, %g0                                   ! IEU1
                or      %g1, %g3, %g1                                           ! IEU0          Group
-               bne,pn  %xcc, 1f                                                        ! CTI
-                sub    %sp, REGWIN_SZ+TRACEREG_SZ-STACK_BIAS, %g2              ! IEU1
+               bne,pn  %xcc, 1f                                                ! CTI
+                sub    %sp, STACKFRAME_SZ+TRACEREG_SZ-STACK_BIAS, %g2          ! IEU1
                wrpr    %g0, 7, %cleanwin                                       ! Single        Group+4bubbles
 
                sethi   %hi(TASK_REGOFF), %g2                                   ! IEU0          Group           
@@ -46,12 +46,12 @@ etrap_irq:
                wr      %g0, 0, %fprs                                           ! Single        Group+4bubbles
 1:             rdpr    %tpc, %g3                                               ! Single        Group
 
-               stx     %g1, [%g2 + REGWIN_SZ + PT_V9_TSTATE]                   ! Store         Group
+               stx     %g1, [%g2 + STACKFRAME_SZ + PT_V9_TSTATE]               ! Store         Group
                rdpr    %tnpc, %g1                                              ! Single        Group
-               stx     %g3, [%g2 + REGWIN_SZ + PT_V9_TPC]                      ! Store         Group
+               stx     %g3, [%g2 + STACKFRAME_SZ + PT_V9_TPC]                  ! Store         Group
                rd      %y, %g3                                                 ! Single        Group+4bubbles
-               stx     %g1, [%g2 + REGWIN_SZ + PT_V9_TNPC]                     ! Store         Group
-               st      %g3, [%g2 + REGWIN_SZ + PT_V9_Y]                        ! Store         Group
+               stx     %g1, [%g2 + STACKFRAME_SZ + PT_V9_TNPC]                 ! Store         Group
+               st      %g3, [%g2 + STACKFRAME_SZ + PT_V9_Y]                    ! Store         Group
                save    %g2, -STACK_BIAS, %sp   ! Ordering here is critical     ! Single        Group
                mov     %g6, %l6                                                ! IEU0          Group
 
@@ -75,23 +75,23 @@ etrap_irq:
 
                mov     %g7, %l2                                                ! IEU1
                wrpr    %g0, ETRAP_PSTATE1, %pstate                             ! Single        Group+4bubbles
-               stx     %g1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G1]          ! Store         Group
-               stx     %g2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G2]          ! Store         Group
-               stx     %g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G3]          ! Store         Group
-               stx     %g4, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G4]          ! Store         Group
-               stx     %g5, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G5]          ! Store         Group
-               stx     %g6, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G6]          ! Store         Group
-
-               stx     %g7, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G7]          ! Store         Group
-               stx     %i0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]          ! Store         Group
-               stx     %i1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]          ! Store         Group
-               stx     %i2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I2]          ! Store         Group
-               stx     %i3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I3]          ! Store         Group
-               stx     %i4, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I4]          ! Store         Group
-               stx     %i5, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I5]          ! Store         Group
-
-               stx     %i6, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I6]          ! Store         Group
-               stx     %i7, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I7]          ! Store         Group
+               stx     %g1, [%sp + PTREGS_OFF + PT_V9_G1]                      ! Store         Group
+               stx     %g2, [%sp + PTREGS_OFF + PT_V9_G2]                      ! Store         Group
+               stx     %g3, [%sp + PTREGS_OFF + PT_V9_G3]                      ! Store         Group
+               stx     %g4, [%sp + PTREGS_OFF + PT_V9_G4]                      ! Store         Group
+               stx     %g5, [%sp + PTREGS_OFF + PT_V9_G5]                      ! Store         Group
+               stx     %g6, [%sp + PTREGS_OFF + PT_V9_G6]                      ! Store         Group
+
+               stx     %g7, [%sp + PTREGS_OFF + PT_V9_G7]                      ! Store         Group
+               stx     %i0, [%sp + PTREGS_OFF + PT_V9_I0]                      ! Store         Group
+               stx     %i1, [%sp + PTREGS_OFF + PT_V9_I1]                      ! Store         Group
+               stx     %i2, [%sp + PTREGS_OFF + PT_V9_I2]                      ! Store         Group
+               stx     %i3, [%sp + PTREGS_OFF + PT_V9_I3]                      ! Store         Group
+               stx     %i4, [%sp + PTREGS_OFF + PT_V9_I4]                      ! Store         Group
+               stx     %i5, [%sp + PTREGS_OFF + PT_V9_I5]                      ! Store         Group
+
+               stx     %i6, [%sp + PTREGS_OFF + PT_V9_I6]                      ! Store         Group
+               stx     %i7, [%sp + PTREGS_OFF + PT_V9_I7]                      ! Store         Group
                wrpr    %g0, ETRAP_PSTATE2, %pstate                             ! Single        Group+4bubbles
                mov     %l6, %g6                                                ! IEU0
                jmpl    %l2 + 0x4, %g0                                          ! CTI           Group
@@ -167,7 +167,7 @@ etraptl1:   /* Save tstate/tpc/tnpc of TL 1-->4 and the tl register itself.
                stx     %g1, [%g2 + STACK_BIAS + 0x80]
 
                rdpr    %tstate, %g1                                            ! Single        Group+4bubbles
-               sub     %g2, REGWIN_SZ + TRACEREG_SZ - STACK_BIAS, %g2          ! IEU1
+               sub     %g2, STACKFRAME_SZ + TRACEREG_SZ - STACK_BIAS, %g2      ! IEU1
                ba,pt   %xcc, 1b                                                ! CTI           Group
                 andcc  %g1, TSTATE_PRIV, %g0                                   ! IEU0
 
@@ -179,7 +179,7 @@ scetrap:    rdpr    %pil, %g2                                               ! Single        Group
                andcc   %g1, TSTATE_PRIV, %g0                                   ! IEU1
                or      %g1, %g3, %g1                                           ! IEU0          Group
                bne,pn  %xcc, 1f                                                ! CTI
-                sub    %sp, (REGWIN_SZ+TRACEREG_SZ-STACK_BIAS), %g2            ! IEU1
+                sub    %sp, (STACKFRAME_SZ+TRACEREG_SZ-STACK_BIAS), %g2        ! IEU1
                wrpr    %g0, 7, %cleanwin                                       ! Single        Group+4bubbles
 
                sllx    %g1, 51, %g3                                            ! IEU0          Group
@@ -189,11 +189,11 @@ scetrap:  rdpr    %pil, %g2                                               ! Single        Group
                 add    %g6, %g2, %g2                                           ! IEU0          Group
                wr      %g0, 0, %fprs                                           ! Single        Group+4bubbles
 1:             rdpr    %tpc, %g3                                               ! Single        Group
-               stx     %g1, [%g2 + REGWIN_SZ + PT_V9_TSTATE]                   ! Store         Group
+               stx     %g1, [%g2 + STACKFRAME_SZ + PT_V9_TSTATE]               ! Store         Group
 
                rdpr    %tnpc, %g1                                              ! Single        Group
-               stx     %g3, [%g2 + REGWIN_SZ + PT_V9_TPC]                      ! Store         Group
-               stx     %g1, [%g2 + REGWIN_SZ + PT_V9_TNPC]                     ! Store         Group
+               stx     %g3, [%g2 + STACKFRAME_SZ + PT_V9_TPC]                  ! Store         Group
+               stx     %g1, [%g2 + STACKFRAME_SZ + PT_V9_TNPC]                 ! Store         Group
                save    %g2, -STACK_BIAS, %sp   ! Ordering here is critical     ! Single        Group
                mov     %g6, %l6                                                ! IEU0          Group
                bne,pn  %xcc, 2f                                                ! CTI           
@@ -214,32 +214,32 @@ scetrap:  rdpr    %pil, %g2                                               ! Single        Group
                mov     %g5, %l5                                                ! IEU0          Group
                add     %g7, 0x4, %l2                                           ! IEU1
                wrpr    %g0, ETRAP_PSTATE1, %pstate                             ! Single        Group+4bubbles
-               stx     %g1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G1]          ! Store         Group
-               stx     %g2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G2]          ! Store         Group
+               stx     %g1, [%sp + PTREGS_OFF + PT_V9_G1]                      ! Store         Group
+               stx     %g2, [%sp + PTREGS_OFF + PT_V9_G2]                      ! Store         Group
                sllx    %l7, 24, %l7                                            ! IEU0
 
-               stx     %g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G3]          ! Store         Group
+               stx     %g3, [%sp + PTREGS_OFF + PT_V9_G3]                      ! Store         Group
                rdpr    %cwp, %l0                                               ! Single        Group
-               stx     %g4, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G4]          ! Store         Group
-               stx     %g5, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G5]          ! Store         Group
-               stx     %g6, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G6]          ! Store         Group
-               stx     %g7, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_G7]          ! Store         Group
+               stx     %g4, [%sp + PTREGS_OFF + PT_V9_G4]                      ! Store         Group
+               stx     %g5, [%sp + PTREGS_OFF + PT_V9_G5]                      ! Store         Group
+               stx     %g6, [%sp + PTREGS_OFF + PT_V9_G6]                      ! Store         Group
+               stx     %g7, [%sp + PTREGS_OFF + PT_V9_G7]                      ! Store         Group
                or      %l7, %l0, %l7                                           ! IEU0
                sethi   %hi(TSTATE_RMO | TSTATE_PEF), %l0                       ! IEU1
 
                or      %l7, %l0, %l7                                           ! IEU0          Group
                wrpr    %l2, %tnpc                                              ! Single        Group+4bubbles
                wrpr    %l7, (TSTATE_PRIV | TSTATE_IE), %tstate                 ! Single        Group+4bubbles
-               stx     %i0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]          ! Store         Group
-               stx     %i1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]          ! Store         Group
-               stx     %i2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I2]          ! Store         Group
-               stx     %i3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I3]          ! Store         Group
-               stx     %i4, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I4]          ! Store         Group
-
-               stx     %i5, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I5]          ! Store         Group
-               stx     %i6, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I6]          ! Store         Group
+               stx     %i0, [%sp + PTREGS_OFF + PT_V9_I0]                      ! Store         Group
+               stx     %i1, [%sp + PTREGS_OFF + PT_V9_I1]                      ! Store         Group
+               stx     %i2, [%sp + PTREGS_OFF + PT_V9_I2]                      ! Store         Group
+               stx     %i3, [%sp + PTREGS_OFF + PT_V9_I3]                      ! Store         Group
+               stx     %i4, [%sp + PTREGS_OFF + PT_V9_I4]                      ! Store         Group
+
+               stx     %i5, [%sp + PTREGS_OFF + PT_V9_I5]                      ! Store         Group
+               stx     %i6, [%sp + PTREGS_OFF + PT_V9_I6]                      ! Store         Group
                mov     %l6, %g6                                                ! IEU1
-               stx     %i7, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I7]          ! Store         Group
+               stx     %i7, [%sp + PTREGS_OFF + PT_V9_I7]                      ! Store         Group
                ldx     [%g6 + TI_TASK], %g4                                    ! Load          Group
                done
                nop

diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 9ba2bf0c1b834c0e0bc19f44d236a74799342eb0..589b7c52371276e8f798ca8adfe810157ef68604 100644 (file)
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -549,7 +549,7 @@ tlb_fixup_done:
        wr      %g0, ASI_P, %asi
        mov     1, %g5
        sllx    %g5, THREAD_SHIFT, %g5
-       sub     %g5, (REGWIN_SZ + STACK_BIAS), %g5
+       sub     %g5, (STACKFRAME_SZ + STACK_BIAS), %g5
        add     %g6, %g5, %sp
        mov     0, %fp
 

diff --git a/arch/sparc64/kernel/itlb_base.S b/arch/sparc64/kernel/itlb_base.S
index 577274ef693c8ea441e3e22f3fa2eff5a5a9a9c8..36c41501a344caf35affb7efc6d1800afbaf8b2d 100644 (file)
--- a/arch/sparc64/kernel/itlb_base.S
+++ b/arch/sparc64/kernel/itlb_base.S
@@ -59,7 +59,7 @@ sparc64_realfault_common:                             ! Called by TL0 dtlb_miss too
 
 /* ITLB ** ICACHE line 3: Finish faults + window fixups        */
        call            do_sparc64_fault                ! Call fault handler
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0! Compute pt_regs arg
+        add            %sp, PTREGS_OFF, %o0! Compute pt_regs arg
        ba,pt           %xcc, rtrap_clr_l6              ! Restore cpu state
         nop
 winfix_trampoline:

diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 7b19a0dbb481df0fa8b0754013df78022ea96407..b072e04964c48c9fcadc31204da8ca2f33673253 100644 (file)
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -39,6 +39,7 @@
 #include <asm/pstate.h>
 #include <asm/elf.h>
 #include <asm/fpumacro.h>
+#include <asm/head.h>
 
 /* #define VERBOSE_SHOWREGS */
 
@@ -341,8 +342,8 @@ void show_regs(struct pt_regs *regs)
            regs->u_regs[14] >= (long)current - PAGE_SIZE &&
            regs->u_regs[14] < (long)current + 6 * PAGE_SIZE) {
                printk ("*********parent**********\n");
-               __show_regs((struct pt_regs *)(regs->u_regs[14] + STACK_BIAS + REGWIN_SZ));
-               idump_from_user(((struct pt_regs *)(regs->u_regs[14] + STACK_BIAS + REGWIN_SZ))->tpc);
+               __show_regs((struct pt_regs *)(regs->u_regs[14] + PTREGS_OFF));
+               idump_from_user(((struct pt_regs *)(regs->u_regs[14] + PTREGS_OFF))->tpc);
                printk ("*********endpar**********\n");
        }
 #endif
@@ -508,11 +509,11 @@ void synchronize_user_stack(void)
 
        flush_user_windows();
        if ((window = get_thread_wsaved()) != 0) {
-               int winsize = REGWIN_SZ;
+               int winsize = sizeof(struct reg_window);
                int bias = 0;
 
                if (test_thread_flag(TIF_32BIT))
-                       winsize = REGWIN32_SZ;
+                       winsize = sizeof(struct reg_window32);
                else
                        bias = STACK_BIAS;
 
@@ -533,11 +534,11 @@ void fault_in_user_windows(void)
 {
        struct thread_info *t = current_thread_info();
        unsigned long window;
-       int winsize = REGWIN_SZ;
+       int winsize = sizeof(struct reg_window);
        int bias = 0;
 
        if (test_thread_flag(TIF_32BIT))
-               winsize = REGWIN32_SZ;
+               winsize = sizeof(struct reg_window32);
        else
                bias = STACK_BIAS;
 
@@ -610,14 +611,14 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
        p->set_child_tid = p->clear_child_tid = NULL;
 
        /* Calculate offset to stack_frame & pt_regs */
-       child_trap_frame = ((char *)t) + (THREAD_SIZE - (TRACEREG_SZ+REGWIN_SZ));
-       memcpy(child_trap_frame, (((struct reg_window *)regs)-1), (TRACEREG_SZ+REGWIN_SZ));
+       child_trap_frame = ((char *)t) + (THREAD_SIZE - (TRACEREG_SZ+STACKFRAME_SZ));
+       memcpy(child_trap_frame, (((struct sparc_stackf *)regs)-1), (TRACEREG_SZ+STACKFRAME_SZ));
 
        t->flags = (t->flags & ~((0xffUL << TI_FLAG_CWP_SHIFT) | (0xffUL << TI_FLAG_CURRENT_DS_SHIFT))) |
                _TIF_NEWCHILD |
                (((regs->tstate + 1) & TSTATE_CWP) << TI_FLAG_CWP_SHIFT);
        t->ksp = ((unsigned long) child_trap_frame) - STACK_BIAS;
-       t->kregs = (struct pt_regs *)(child_trap_frame+sizeof(struct reg_window));
+       t->kregs = (struct pt_regs *)(child_trap_frame+sizeof(struct sparc_stackf));
        t->fpsaved[0] = 0;
 
        if (regs->tstate & TSTATE_PRIV) {
@@ -636,7 +637,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
                flush_register_windows();
                memcpy((void *)(t->ksp + STACK_BIAS),
                       (void *)(regs->u_regs[UREG_FP] + STACK_BIAS),
-                      sizeof(struct reg_window));
+                      sizeof(struct sparc_stackf));
                t->kregs->u_regs[UREG_G6] = (unsigned long) t;
                t->kregs->u_regs[UREG_G4] = (unsigned long) t->task;
        } else {

diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S
index d7e95b64963c39b0372ce684dba45f63ec5ce2bc..e2a6a3fca5d87b10b6e50ee2f3ec4d3887543237 100644 (file)
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
@@ -59,7 +59,7 @@ __handle_user_windows:
                clr                     %o0
                mov                     %l5, %o2
                mov                     %l6, %o3
-               add                     %sp, STACK_BIAS + REGWIN_SZ, %o1
+               add                     %sp, PTREGS_OFF, %o1
                mov                     %l0, %o4
 
                call                    do_notify_resume
@@ -103,7 +103,7 @@ __handle_perfctrs:
                clr                     %o0
                mov                     %l5, %o2
                mov                     %l6, %o3
-               add                     %sp, STACK_BIAS + REGWIN_SZ, %o1
+               add                     %sp, PTREGS_OFF, %o1
                mov                     %l0, %o4
                call                    do_notify_resume
 
@@ -132,7 +132,7 @@ __handle_signal:
                clr                     %o0
                mov                     %l5, %o2
                mov                     %l6, %o3
-               add                     %sp, STACK_BIAS + REGWIN_SZ, %o1
+               add                     %sp, PTREGS_OFF, %o1
                mov                     %l0, %o4
                call                    do_notify_resume
                 wrpr                   %g0, RTRAP_PSTATE, %pstate

diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
index 7aba15e7efc062b8959c28411083ab0ef53e9691..3d4ddd7d952a0a7a5b76fdca1ca7554374a70aff 100644 (file)
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
@@ -812,7 +812,7 @@ setup_svr4_frame32(struct sigaction *sa, unsigned long pc, unsigned long npc,
        save_and_clear_fpu();
        
        regs->u_regs[UREG_FP] &= 0x00000000ffffffffUL;
-       sfp = (svr4_signal_frame_t *) get_sigframe(sa, regs, REGWIN_SZ + SVR4_SF_ALIGNED);
+       sfp = (svr4_signal_frame_t *) get_sigframe(sa, regs, sizeof(struct reg_window32) + SVR4_SF_ALIGNED);
 
        if (invalid_frame_pointer (sfp, sizeof (*sfp)))
                do_exit(SIGILL);

diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index 93191d18bc94a84a175a969315a3a22450106339..5291251cb7a9d37beab61b79308c3ad0cb7aa25a 100644 (file)
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -195,7 +195,7 @@ startup_continue:
 
        mov             1, %g5
        sllx            %g5, THREAD_SHIFT, %g5
-       sub             %g5, (REGWIN_SZ + STACK_BIAS), %g5
+       sub             %g5, (STACKFRAME_SZ + STACK_BIAS), %g5
        add             %g6, %g5, %sp
        mov             0, %fp
 

diff --git a/arch/sparc64/kernel/winfixup.S b/arch/sparc64/kernel/winfixup.S
index 707e85e8f59bae9ad533ea7399f96027c785e0ce..3427d7a743e1fb2d9a414e54ef65937e90142ac7 100644 (file)
--- a/arch/sparc64/kernel/winfixup.S
+++ b/arch/sparc64/kernel/winfixup.S
@@ -80,7 +80,7 @@ fill_fixup:
         * since we must preserve %l5 and %l6, see comment above.
         */
        call            do_sparc64_fault
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         nop                                            ! yes, nop is correct
 
@@ -158,7 +158,7 @@ window_scheisse_from_user_common:
        ba,pt           %xcc, etrap
         rd             %pc, %g7
        call            do_sparc64_fault
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,a,pt         %xcc, rtrap_clr_l6
 
        .globl          winfix_mna, fill_fixup_mna, spill_fixup_mna
@@ -197,7 +197,7 @@ fill_fixup_mna:
        mov             %o7, %g6                        ! Get current back.
        ldx             [%g6 + TI_TASK], %g4            ! Finish it.
        call            mem_address_unaligned
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
 
        b,pt            %xcc, rtrap
         nop                                            ! yes, the nop is correct
@@ -258,7 +258,7 @@ window_mna_from_user_common:
        mov             %l4, %o2
        mov             %l5, %o1
        call            mem_address_unaligned
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
        
@@ -303,7 +303,7 @@ fill_fixup_dax:
        mov             %o7, %g6                        ! Get current back.
        ldx             [%g6 + TI_TASK], %g4            ! Finish it.
        call            data_access_exception
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
 
        b,pt            %xcc, rtrap
         nop                                            ! yes, the nop is correct
@@ -364,7 +364,7 @@ window_dax_from_user_common:
        mov             %l4, %o1
        mov             %l5, %o2
        call            data_access_exception
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, rtrap
         clr            %l6
        

diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S
index 28fbcaec41e20dffa4ff155696c460597a56d97d..8e977212002833695c9b677e1210a0e27e666c0d 100644 (file)
--- a/arch/sparc64/mm/ultra.S
+++ b/arch/sparc64/mm/ultra.S
@@ -594,7 +594,7 @@ xcall_report_regs:
        b,pt            %xcc, etrap_irq
 109:    or             %g7, %lo(109b), %g7
        call            __show_regs
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        clr             %l6
        /* Has to be a non-v9 branch due to the large distance. */
        b               rtrap_xcall

diff --git a/arch/sparc64/solaris/entry64.S b/arch/sparc64/solaris/entry64.S
index 31444a936caf416dcdf1b567e2982f07c817c5ca..f710edf1d6cdc150c21b0d970c71444c603b4132 100644 (file)
--- a/arch/sparc64/solaris/entry64.S
+++ b/arch/sparc64/solaris/entry64.S
@@ -34,7 +34,7 @@ solaris_syscall_trace:
        be,pt           %icc, 2f
         srl            %i2, 0, %o2
        b,pt            %xcc, 2f
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
 
 solaris_sucks:
 /* Solaris is a big system which needs to be able to do all the things
@@ -91,7 +91,7 @@ entry64_personality_patch:
         sethi          %hi(sys_call_table32), %l6
        andcc           %l3, 1, %g0
        bne,a,pn        %icc, 10f
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
 10:    srl             %i2, 0, %o2
        mov             %i5, %o5
        andn            %l3, 3, %l7
@@ -101,11 +101,11 @@ entry64_personality_patch:
 2:     call            %l7
         srl            %i3, 0, %o3
 ret_from_solaris:
-       stx             %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+       stx             %o0, [%sp + PTREGS_OFF + PT_V9_I0]
        ldx             [%g6 + TI_FLAGS], %l6
        sra             %o0, 0, %o0
        mov             %ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2
-       ldx             [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE], %g3
+       ldx             [%sp + PTREGS_OFF + PT_V9_TSTATE], %g3
        cmp             %o0, -ENOIOCTLCMD
        sllx            %g2, 32, %g2
        bgeu,pn         %xcc, 1f
@@ -113,21 +113,21 @@ ret_from_solaris:
 
        /* System call success, clear Carry condition code. */
        andn            %g3, %g2, %g3
-       stx             %g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]      
+       stx             %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]  
        bne,pn          %icc, solaris_syscall_trace2
-        ldx            [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1
+        ldx            [%sp + PTREGS_OFF + PT_V9_TNPC], %l1
        andcc           %l1, 1, %g0
        bne,pn          %icc, 2f
         clr            %l6
        add             %l1, 0x4, %l2                                    
-       stx             %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]  ! pc = npc
+       stx             %l1, [%sp + PTREGS_OFF + PT_V9_TPC]      ! pc = npc
        call            rtrap
-        stx            %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC] !npc = npc+4
+        stx            %l2, [%sp + PTREGS_OFF + PT_V9_TNPC] !npc = npc+4
 
        /* When tnpc & 1, this comes from setcontext and we don't want to advance pc */
 2:     andn            %l1, 3, %l1
        call            rtrap
-        stx            %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC] !npc = npc&~3
+        stx            %l1, [%sp + PTREGS_OFF + PT_V9_TNPC] !npc = npc&~3
 
 1:
        /* System call failure, set Carry condition code.
@@ -143,17 +143,17 @@ ret_from_solaris:
        sll             %o0, 2, %o0
        or              %l6, %lo(solaris_err_table), %l6
        ldsw            [%l6 + %o0], %o0
-1:     stx             %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+1:     stx             %o0, [%sp + PTREGS_OFF + PT_V9_I0]
        mov             1, %l6
-       stx             %g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]
+       stx             %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]
        bne,pn          %icc, solaris_syscall_trace2
-        ldx            [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1
+        ldx            [%sp + PTREGS_OFF + PT_V9_TNPC], %l1
        andcc           %l1, 1, %g0
        bne,pn          %icc, 2b
         add            %l1, 0x4, %l2
-       stx             %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]  ! pc = npc
+       stx             %l1, [%sp + PTREGS_OFF + PT_V9_TPC]  ! pc = npc
        call            rtrap
-        stx            %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC] !npc = npc+4 
+        stx            %l2, [%sp + PTREGS_OFF + PT_V9_TNPC] !npc = npc+4 
 
 solaris_syscall_trace2:
        call            syscall_trace
@@ -161,9 +161,9 @@ solaris_syscall_trace2:
        andcc           %l1, 1, %g0
        bne,pn          %icc, 2b
         nop
-       stx             %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
+       stx             %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
        call            rtrap
-        stx            %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
+        stx            %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
 
        /* This one is tricky, so that's why we do it in assembly */
        .globl          solaris_sigsuspend
@@ -173,14 +173,14 @@ solaris_sigsuspend:
        brlz,pn         %o0, ret_from_solaris
         nop
        call            sys_sigsuspend
-        stx            %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
+        stx            %o0, [%sp + PTREGS_OFF + PT_V9_I0]
 
        .globl          solaris_getpid
 solaris_getpid:
        call            sys_getppid
         nop
        call            sys_getpid
-        stx            %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]
+        stx            %o0, [%sp + PTREGS_OFF + PT_V9_I1]
        b,pt            %xcc, ret_from_solaris
         nop
 
@@ -189,7 +189,7 @@ solaris_getuid:
        call            sys_geteuid
         nop
        call            sys_getuid
-        stx            %o1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]
+        stx            %o1, [%sp + PTREGS_OFF + PT_V9_I1]
        b,pt            %xcc, ret_from_solaris
         nop
 
@@ -198,14 +198,14 @@ solaris_getgid:
        call            sys_getegid
         nop
        call            sys_getgid
-        stx            %o1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]
+        stx            %o1, [%sp + PTREGS_OFF + PT_V9_I1]
        b,pt            %xcc, ret_from_solaris
         nop
 
        .globl          solaris_unimplemented
 solaris_unimplemented:
        call            do_sol_unimplemented
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
+        add            %sp, PTREGS_OFF, %o0
        ba,pt           %xcc, ret_from_solaris
         nop
 

diff --git a/include/asm-sparc64/head.h b/include/asm-sparc64/head.h
index 41f7cb2543dfb61a5b231d612cc0b8c7b1f31171..c3ab5543edf4c21870882803dde7f34cbda22b74 100644 (file)
--- a/include/asm-sparc64/head.h
+++ b/include/asm-sparc64/head.h
@@ -6,7 +6,7 @@
 
 #define KERNBASE       0x400000
 
-#define        PTREGS_OFF      (STACK_BIAS + REGWIN_SZ)
+#define        PTREGS_OFF      (STACK_BIAS + STACKFRAME_SZ)
 
 #define __CHEETAH_ID   0x003e0014
 

diff --git a/include/asm-sparc64/processor.h b/include/asm-sparc64/processor.h
index 4adc999066f80fe7c0c3fb07c78a78f9a7be363e..7f9fbccb3de25fc686de07d643f082b59c1f7214 100644 (file)
--- a/include/asm-sparc64/processor.h
+++ b/include/asm-sparc64/processor.h
@@ -139,7 +139,7 @@ do { \
        "stx            %%g0, [%0 + %2 + 0x78]\n\t" \
        "wrpr           %%g0, (1 << 3), %%wstate\n\t" \
        : \
-       : "r" (regs), "r" (sp - REGWIN_SZ - STACK_BIAS), \
+       : "r" (regs), "r" (sp - sizeof(struct reg_window) - STACK_BIAS), \
          "i" ((const unsigned long)(&((struct pt_regs *)0)->u_regs[0]))); \
 } while (0)
 
@@ -179,7 +179,7 @@ do { \
        "stx            %%g0, [%0 + %2 + 0x78]\n\t" \
        "wrpr           %%g0, (2 << 3), %%wstate\n\t" \
        : \
-       : "r" (regs), "r" (sp - REGWIN32_SZ), \
+       : "r" (regs), "r" (sp - sizeof(struct reg_window32)), \
          "i" ((const unsigned long)(&((struct pt_regs *)0)->u_regs[0]))); \
 } while (0)
 

diff --git a/include/asm-sparc64/ptrace.h b/include/asm-sparc64/ptrace.h
index 872e3ebc03790bb2ad2dbebe3ae2c43c08fb86ed..ec7698b8467fe5ff7338f8008fb2e7fe662c2f21 100644 (file)
--- a/include/asm-sparc64/ptrace.h
+++ b/include/asm-sparc64/ptrace.h
@@ -89,11 +89,9 @@ struct sparc_trapf {
 
 #define TRACEREG_SZ    sizeof(struct pt_regs)
 #define STACKFRAME_SZ  sizeof(struct sparc_stackf)
-#define REGWIN_SZ      sizeof(struct reg_window)
 
 #define TRACEREG32_SZ  sizeof(struct pt_regs32)
 #define STACKFRAME32_SZ        sizeof(struct sparc_stackf32)
-#define REGWIN32_SZ    sizeof(struct reg_window32)
 
 #ifdef __KERNEL__
 #define user_mode(regs) (!((regs)->tstate & TSTATE_PRIV))
@@ -105,11 +103,9 @@ extern void show_regs(struct pt_regs *);
 /* For assembly code. */
 #define TRACEREG_SZ            0xa0
 #define STACKFRAME_SZ          0xc0
-#define REGWIN_SZ              0x80
 
 #define TRACEREG32_SZ          0x50
 #define STACKFRAME32_SZ                0x60
-#define REGWIN32_SZ            0x40
 #endif
 
 #ifdef __KERNEL__

diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h
index 659479cc32446156a86c47a00ebefc11382e7197..828d1e145e6f749133b321061d697b8bc346dc9d 100644 (file)
--- a/include/asm-sparc64/ttable.h
+++ b/include/asm-sparc64/ttable.h
@@ -27,7 +27,7 @@
        ba,pt   %xcc, etrap;                            \
 109:    or     %g7, %lo(109b), %g7;                    \
        call    routine;                                \
-        add    %sp, STACK_BIAS + REGWIN_SZ, %o0;       \
+        add    %sp, PTREGS_OFF, %o0;                   \
        ba,pt   %xcc, rtrap;                            \
         clr    %l6;                                    \
        nop;
@@ -37,7 +37,7 @@
        ba,pt   %xcc, etrap;                            \
 109:    or     %g7, %lo(109b), %g7;                    \
        call    routine;                                \
-        add    %sp, STACK_BIAS + REGWIN_SZ, %o0;       \
+        add    %sp, PTREGS_OFF, %o0;                   \
        ba,pt   %xcc, rtrap;                            \
         clr    %l6;
 
@@ -46,7 +46,7 @@
        ba,pt   %xcc, do_fptrap;                        \
 109:    or     %g7, %lo(109b), %g7;                    \
        call    routine;                                \
-        add    %sp, STACK_BIAS + REGWIN_SZ, %o0;       \
+        add    %sp, PTREGS_OFF, %o0;                   \
        ba,pt   %xcc, rtrap;                            \
         clr    %l6;                                    \
        nop;
@@ -66,7 +66,7 @@
        ba,pt   %xcc, etraptl1;                         \
 109:    or     %g7, %lo(109b), %g7;                    \
        call    routine;                                \
-        add    %sp, STACK_BIAS + REGWIN_SZ, %o0;       \
+        add    %sp, PTREGS_OFF, %o0;                   \
        ba,pt   %xcc, rtrap;                            \
         clr    %l6;                                    \
        nop;
@@ -75,7 +75,7 @@
        sethi   %hi(109f), %g7;                         \
        ba,pt   %xcc, etrap;                            \
 109:    or     %g7, %lo(109b), %g7;                    \
-       add     %sp, STACK_BIAS + REGWIN_SZ, %o0;       \
+       add     %sp, PTREGS_OFF, %o0;                   \
        call    routine;                                \
         mov    arg, %o1;                               \
        ba,pt   %xcc, rtrap;                            \
@@ -85,7 +85,7 @@
        sethi   %hi(109f), %g7;                         \
        ba,pt   %xcc, etraptl1;                         \
 109:    or     %g7, %lo(109b), %g7;                    \
-       add     %sp, STACK_BIAS + REGWIN_SZ, %o0;       \
+       add     %sp, PTREGS_OFF, %o0;                   \
        call    routine;                                \
         mov    arg, %o1;                               \
        ba,pt   %xcc, rtrap;                            \
@@ -142,7 +142,7 @@
         rd     %pc, %g7;                               \
        mov     level, %o0;                             \
        call    routine;                                \
-        add    %sp, STACK_BIAS + REGWIN_SZ, %o1;       \
+        add    %sp, PTREGS_OFF, %o1;                   \
        ba,a,pt %xcc, rtrap_irq;
        
 #define TICK_SMP_IRQ                                   \
@@ -152,7 +152,7 @@
        b,pt    %xcc, etrap_irq;                        \
 109:    or     %g7, %lo(109b), %g7;                    \
        call    smp_percpu_timer_interrupt;             \
-        add    %sp, STACK_BIAS + REGWIN_SZ, %o0;       \
+        add    %sp, PTREGS_OFF, %o0;                   \
        ba,a,pt %xcc, rtrap_irq;
 
 #define TRAP_IVEC TRAP_NOSAVE(do_ivec)
@@ -165,11 +165,11 @@
        ba,pt   %xcc, etrap;                                            \
         rd     %pc, %g7;                                               \
        flushw;                                                         \
-       ldx     [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1;       \
+       ldx     [%sp + PTREGS_OFF + PT_V9_TNPC], %l1;                   \
        add     %l1, 4, %l2;                                            \
-       stx     %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC];        \
+       stx     %l1, [%sp + PTREGS_OFF + PT_V9_TPC];                    \
        ba,pt   %xcc, rtrap_clr_l6;                                     \
-        stx    %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC];
+        stx    %l2, [%sp + PTREGS_OFF + PT_V9_TNPC];
                
 /* Before touching these macros, you owe it to yourself to go and
  * see how arch/sparc64/kernel/winfixup.S works... -DaveM