Index: kernel/arch/sparc64/src/context.S
===================================================================
--- kernel/arch/sparc64/src/context.S	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/arch/sparc64/src/context.S	(revision 0c1ad7ac5d4d3b64fa89aa6d9d4b6de137d1066d)
@@ -37,4 +37,6 @@
  */
 	
+#include <arch/context_offset.h>
+
 .text   
 
@@ -42,48 +44,6 @@
 .global context_restore_arch
 
-.macro CONTEXT_STORE r
-	stx %sp, [\r + OFFSET_SP]
-	stx %o7, [\r + OFFSET_PC]
-	stx %i0, [\r + OFFSET_I0]
-	stx %i1, [\r + OFFSET_I1]
-	stx %i2, [\r + OFFSET_I2]
-	stx %i3, [\r + OFFSET_I3]
-	stx %i4, [\r + OFFSET_I4]
-	stx %i5, [\r + OFFSET_I5]
-	stx %fp, [\r + OFFSET_FP]
-	stx %i7, [\r + OFFSET_I7]
-	stx %l0, [\r + OFFSET_L0]
-	stx %l1, [\r + OFFSET_L1]
-	stx %l2, [\r + OFFSET_L2]
-	stx %l3, [\r + OFFSET_L3]
-	stx %l4, [\r + OFFSET_L4]
-	stx %l5, [\r + OFFSET_L5]
-	stx %l6, [\r + OFFSET_L6]
-	stx %l7, [\r + OFFSET_L7]
-.endm
-
-.macro CONTEXT_LOAD r
-	ldx [\r + OFFSET_SP], %sp
-	ldx [\r + OFFSET_PC], %o7
-	ldx [\r + OFFSET_I0], %i0
-	ldx [\r + OFFSET_I1], %i1
-	ldx [\r + OFFSET_I2], %i2
-	ldx [\r + OFFSET_I3], %i3
-	ldx [\r + OFFSET_I4], %i4
-	ldx [\r + OFFSET_I5], %i5
-	ldx [\r + OFFSET_FP], %fp
-	ldx [\r + OFFSET_I7], %i7
-	ldx [\r + OFFSET_L0], %l0
-	ldx [\r + OFFSET_L1], %l1
-	ldx [\r + OFFSET_L2], %l2
-	ldx [\r + OFFSET_L3], %l3
-	ldx [\r + OFFSET_L4], %l4
-	ldx [\r + OFFSET_L5], %l5
-	ldx [\r + OFFSET_L6], %l6
-	ldx [\r + OFFSET_L7], %l7
-.endm
-
 context_save_arch:
-	CONTEXT_STORE %o0
+	CONTEXT_SAVE_ARCH_CORE %o0
 	retl
 	mov 1, %o0		! context_save_arch returns 1
@@ -99,5 +59,5 @@
 	flushw
 	
-	CONTEXT_LOAD %o0
+	CONTEXT_RESTORE_ARCH_CORE %o0
 	retl
 	xor %o0, %o0, %o0	! context_restore_arch returns 0