Index: kernel/arch/amd64/src/context.S
===================================================================
--- kernel/arch/amd64/src/context.S	(revision 088cecc97a4e21cb1647840c41cee125f006a3b3)
+++ kernel/arch/amd64/src/context.S	(revision 1dbfe988113fb7d5276fcfd861f794b1971bb5bc)
@@ -41,14 +41,7 @@
 context_save_arch:
 	movq (%rsp), %rdx     # the caller's return %eip
+
 	# In %edi is passed 1st argument
-	movq %rdx, OFFSET_PC(%rdi)
-	movq %rsp, OFFSET_SP(%rdi)
-	
-	movq %rbx, OFFSET_RBX(%rdi)
-	movq %rbp, OFFSET_RBP(%rdi)
-	movq %r12, OFFSET_R12(%rdi)
-	movq %r13, OFFSET_R13(%rdi)
-	movq %r14, OFFSET_R14(%rdi)
-	movq %r15, OFFSET_R15(%rdi)
+	CONTEXT_SAVE_ARCH_CORE %rdi %rdx 
 	
 	xorq %rax,%rax		# context_save returns 1
@@ -63,14 +56,7 @@
 #
 context_restore_arch:	
-	movq OFFSET_R15(%rdi), %r15
-	movq OFFSET_R14(%rdi), %r14
-	movq OFFSET_R13(%rdi), %r13
-	movq OFFSET_R12(%rdi), %r12
-	movq OFFSET_RBP(%rdi), %rbp
-	movq OFFSET_RBX(%rdi), %rbx	
-	
-	movq OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
-	
-	movq OFFSET_PC(%rdi), %rdx
+
+	CONTEXT_RESTORE_ARCH_CORE %rdi %rdx
+
 	movq %rdx,(%rsp)