patch-2.4.21 linux-2.4.21/arch/sparc/kernel/rtrap.S
Next file: linux-2.4.21/arch/sparc/kernel/signal.c
Previous file: linux-2.4.21/arch/sparc/kernel/process.c
Back to the patch index
Back to the overall index
- Lines: 60
- Date:
2003-06-13 07:51:32.000000000 -0700
- Orig file:
linux-2.4.20/arch/sparc/kernel/rtrap.S
- Orig date:
2001-07-19 18:11:13.000000000 -0700
diff -urN linux-2.4.20/arch/sparc/kernel/rtrap.S linux-2.4.21/arch/sparc/kernel/rtrap.S
@@ -70,16 +70,16 @@
signal_p:
cmp %g2, 0
bz,a ret_trap_continue
- ld [%sp + REGWIN_SZ + PT_PSR], %t_psr
+ ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr
clr %o0
mov %l5, %o2
mov %l6, %o3
call C_LABEL(do_signal)
- add %sp, REGWIN_SZ, %o1 ! pt_regs ptr
+ add %sp, STACKFRAME_SZ, %o1 ! pt_regs ptr
/* Fall through. */
- ld [%sp + REGWIN_SZ + PT_PSR], %t_psr
+ ld [%sp + STACKFRAME_SZ + PT_PSR], %t_psr
clr %l6
ret_trap_continue:
wr %t_psr, 0x0, %psr
@@ -95,7 +95,7 @@
mov 1, %o1
call C_LABEL(try_to_clear_window_buffer)
- add %sp, REGWIN_SZ, %o0
+ add %sp, STACKFRAME_SZ, %o0
b signal_p
ld [%curptr + AOFF_task_sigpending], %g2
@@ -142,7 +142,7 @@
nop
b ret_trap_unaligned_pc
- add %sp, REGWIN_SZ, %o0
+ add %sp, STACKFRAME_SZ, %o0
1:
LOAD_PT_YREG(sp, g1)
@@ -155,9 +155,9 @@
rett %t_npc
ret_trap_unaligned_pc:
- ld [%sp + REGWIN_SZ + PT_PC], %o1
- ld [%sp + REGWIN_SZ + PT_NPC], %o2
- ld [%sp + REGWIN_SZ + PT_PSR], %o3
+ ld [%sp + STACKFRAME_SZ + PT_PC], %o1
+ ld [%sp + STACKFRAME_SZ + PT_NPC], %o2
+ ld [%sp + STACKFRAME_SZ + PT_PSR], %o3
wr %t_wim, 0x0, %wim ! or else...
@@ -215,7 +215,7 @@
WRITE_PAUSE
call C_LABEL(window_ret_fault)
- add %sp, REGWIN_SZ, %o0
+ add %sp, STACKFRAME_SZ, %o0
b signal_p
ld [%curptr + AOFF_task_sigpending], %g2
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)