From e43982009725c81d67d73f4126d50ca467121cfb Mon Sep 17 00:00:00 2001 From: Jakub Jermar Date: Sun, 8 Oct 2006 21:15:14 +0000 Subject: [PATCH] Small change of code organization. No functional difference. --- kernel/arch/sparc64/src/trap/trap_table.S | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/kernel/arch/sparc64/src/trap/trap_table.S b/kernel/arch/sparc64/src/trap/trap_table.S index 7c0e079b6..19d24eae9 100644 --- a/kernel/arch/sparc64/src/trap/trap_table.S +++ b/kernel/arch/sparc64/src/trap/trap_table.S @@ -737,6 +737,7 @@ fill_0_normal_tl1: rdpr %tstate, %g1 rdpr %tpc, %g2 rdpr %tnpc, %g3 + rd %y, %g4 /* * The following memory accesses will not fault @@ -754,7 +755,6 @@ fill_0_normal_tl1: * versions of the SPARC architecture. * Surprisingly, gcc makes use of this register without a notice. */ - rd %y, %g4 stx %g4, [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_Y] wrpr %g0, 0, %tl @@ -787,12 +787,6 @@ fill_0_normal_tl1: ldx [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_TNPC], %g3 /* - * Restore Y. - */ - ldx [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_Y], %g4 - wr %g4, %y - - /* * Copy PSTATE.PEF to the in-register copy of TSTATE. */ and %l1, PSTATE_PEF_BIT, %l1 @@ -808,6 +802,11 @@ fill_0_normal_tl1: wrpr %g2, 0, %tpc wrpr %g3, 0, %tnpc + /* + * Restore Y. + */ + ldx [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_Y], %g4 + wr %g4, %y /* * If OTHERWIN is zero, then all the userspace windows have been -- 2.11.4.GIT