Index: kernel/arch/ppc32/src/context.S =================================================================== --- kernel/arch/ppc32/src/context.S (revision f93ba6d5f7e19b94e89a6ccab96897a149761b41) +++ kernel/arch/ppc32/src/context.S (revision a595f5a870609327cc2a8359997728004f3d034c) @@ -27,5 +27,6 @@ # -#include +#include +#include .text @@ -35,11 +36,31 @@ context_save_arch: - CONTEXT_SAVE_ARCH_CORE r3 + stw sp, CONTEXT_OFFSET_SP(r3) + stw r2, CONTEXT_OFFSET_R2(r3) + stw r13, CONTEXT_OFFSET_R13(r3) + stw r14, CONTEXT_OFFSET_R14(r3) + stw r15, CONTEXT_OFFSET_R15(r3) + stw r16, CONTEXT_OFFSET_R16(r3) + stw r17, CONTEXT_OFFSET_R17(r3) + stw r18, CONTEXT_OFFSET_R18(r3) + stw r19, CONTEXT_OFFSET_R19(r3) + stw r20, CONTEXT_OFFSET_R20(r3) + stw r21, CONTEXT_OFFSET_R21(r3) + stw r22, CONTEXT_OFFSET_R22(r3) + stw r23, CONTEXT_OFFSET_R23(r3) + stw r24, CONTEXT_OFFSET_R24(r3) + stw r25, CONTEXT_OFFSET_R25(r3) + stw r26, CONTEXT_OFFSET_R26(r3) + stw r27, CONTEXT_OFFSET_R27(r3) + stw r28, CONTEXT_OFFSET_R28(r3) + stw r29, CONTEXT_OFFSET_R29(r3) + stw r30, CONTEXT_OFFSET_R30(r3) + stw r31, CONTEXT_OFFSET_R31(r3) mflr r4 - stw r4, OFFSET_PC(r3) + stw r4, CONTEXT_OFFSET_PC(r3) mfcr r4 - stw r4, OFFSET_CR(r3) + stw r4, CONTEXT_OFFSET_CR(r3) # context_save returns 1 @@ -48,10 +69,30 @@ context_restore_arch: - CONTEXT_RESTORE_ARCH_CORE r3 + lwz sp, CONTEXT_OFFSET_SP(r3) + lwz r2, CONTEXT_OFFSET_R2(r3) + lwz r13, CONTEXT_OFFSET_R13(r3) + lwz r14, CONTEXT_OFFSET_R14(r3) + lwz r15, CONTEXT_OFFSET_R15(r3) + lwz r16, CONTEXT_OFFSET_R16(r3) + lwz r17, CONTEXT_OFFSET_R17(r3) + lwz r18, CONTEXT_OFFSET_R18(r3) + lwz r19, CONTEXT_OFFSET_R19(r3) + lwz r20, CONTEXT_OFFSET_R20(r3) + lwz r21, CONTEXT_OFFSET_R21(r3) + lwz r22, CONTEXT_OFFSET_R22(r3) + lwz r23, CONTEXT_OFFSET_R23(r3) + lwz r24, CONTEXT_OFFSET_R24(r3) + lwz r25, CONTEXT_OFFSET_R25(r3) + lwz r26, CONTEXT_OFFSET_R26(r3) + lwz r27, CONTEXT_OFFSET_R27(r3) + lwz r28, CONTEXT_OFFSET_R28(r3) + lwz r29, CONTEXT_OFFSET_R29(r3) + lwz r30, CONTEXT_OFFSET_R30(r3) + lwz r31, CONTEXT_OFFSET_R31(r3) - lwz r4, OFFSET_CR(r3) + lwz r4, CONTEXT_OFFSET_CR(r3) mtcr r4 - lwz r4, OFFSET_PC(r3) + lwz r4, CONTEXT_OFFSET_PC(r3) mtlr r4 Index: kernel/arch/ppc32/src/fpu_context.S =================================================================== --- kernel/arch/ppc32/src/fpu_context.S (revision f93ba6d5f7e19b94e89a6ccab96897a149761b41) +++ kernel/arch/ppc32/src/fpu_context.S (revision a595f5a870609327cc2a8359997728004f3d034c) @@ -28,5 +28,5 @@ #include -#include +#include #include @@ -40,71 +40,71 @@ .macro FPU_CONTEXT_STORE r - stfd fr0, OFFSET_FR0(\r) - stfd fr1, OFFSET_FR1(\r) - stfd fr2, OFFSET_FR2(\r) - stfd fr3, OFFSET_FR3(\r) - stfd fr4, OFFSET_FR4(\r) - stfd fr5, OFFSET_FR5(\r) - stfd fr6, OFFSET_FR6(\r) - stfd fr7, OFFSET_FR7(\r) - stfd fr8, OFFSET_FR8(\r) - stfd fr9, OFFSET_FR9(\r) - stfd fr10, OFFSET_FR10(\r) - stfd fr11, OFFSET_FR11(\r) - stfd fr12, OFFSET_FR12(\r) - stfd fr13, OFFSET_FR13(\r) - stfd fr14, OFFSET_FR14(\r) - stfd fr15, OFFSET_FR15(\r) - stfd fr16, OFFSET_FR16(\r) - stfd fr17, OFFSET_FR17(\r) - stfd fr18, OFFSET_FR18(\r) - stfd fr19, OFFSET_FR19(\r) - stfd fr20, OFFSET_FR20(\r) - stfd fr21, OFFSET_FR21(\r) - stfd fr22, OFFSET_FR22(\r) - stfd fr23, OFFSET_FR23(\r) - stfd fr24, OFFSET_FR24(\r) - stfd fr25, OFFSET_FR25(\r) - stfd fr26, OFFSET_FR26(\r) - stfd fr27, OFFSET_FR27(\r) - stfd fr28, OFFSET_FR28(\r) - stfd fr29, OFFSET_FR29(\r) - stfd fr30, OFFSET_FR30(\r) - stfd fr31, OFFSET_FR31(\r) + stfd fr0, FPU_CONTEXT_OFFSET_FR0(\r) + stfd fr1, FPU_CONTEXT_OFFSET_FR1(\r) + stfd fr2, FPU_CONTEXT_OFFSET_FR2(\r) + stfd fr3, FPU_CONTEXT_OFFSET_FR3(\r) + stfd fr4, FPU_CONTEXT_OFFSET_FR4(\r) + stfd fr5, FPU_CONTEXT_OFFSET_FR5(\r) + stfd fr6, FPU_CONTEXT_OFFSET_FR6(\r) + stfd fr7, FPU_CONTEXT_OFFSET_FR7(\r) + stfd fr8, FPU_CONTEXT_OFFSET_FR8(\r) + stfd fr9, FPU_CONTEXT_OFFSET_FR9(\r) + stfd fr10, FPU_CONTEXT_OFFSET_FR10(\r) + stfd fr11, FPU_CONTEXT_OFFSET_FR11(\r) + stfd fr12, FPU_CONTEXT_OFFSET_FR12(\r) + stfd fr13, FPU_CONTEXT_OFFSET_FR13(\r) + stfd fr14, FPU_CONTEXT_OFFSET_FR14(\r) + stfd fr15, FPU_CONTEXT_OFFSET_FR15(\r) + stfd fr16, FPU_CONTEXT_OFFSET_FR16(\r) + stfd fr17, FPU_CONTEXT_OFFSET_FR17(\r) + stfd fr18, FPU_CONTEXT_OFFSET_FR18(\r) + stfd fr19, FPU_CONTEXT_OFFSET_FR19(\r) + stfd fr20, FPU_CONTEXT_OFFSET_FR20(\r) + stfd fr21, FPU_CONTEXT_OFFSET_FR21(\r) + stfd fr22, FPU_CONTEXT_OFFSET_FR22(\r) + stfd fr23, FPU_CONTEXT_OFFSET_FR23(\r) + stfd fr24, FPU_CONTEXT_OFFSET_FR24(\r) + stfd fr25, FPU_CONTEXT_OFFSET_FR25(\r) + stfd fr26, FPU_CONTEXT_OFFSET_FR26(\r) + stfd fr27, FPU_CONTEXT_OFFSET_FR27(\r) + stfd fr28, FPU_CONTEXT_OFFSET_FR28(\r) + stfd fr29, FPU_CONTEXT_OFFSET_FR29(\r) + stfd fr30, FPU_CONTEXT_OFFSET_FR30(\r) + stfd fr31, FPU_CONTEXT_OFFSET_FR31(\r) .endm .macro FPU_CONTEXT_LOAD r - lfd fr0, OFFSET_FR0(\r) - lfd fr1, OFFSET_FR1(\r) - lfd fr2, OFFSET_FR2(\r) - lfd fr3, OFFSET_FR3(\r) - lfd fr4, OFFSET_FR4(\r) - lfd fr5, OFFSET_FR5(\r) - lfd fr6, OFFSET_FR6(\r) - lfd fr7, OFFSET_FR7(\r) - lfd fr8, OFFSET_FR8(\r) - lfd fr9, OFFSET_FR9(\r) - lfd fr10, OFFSET_FR10(\r) - lfd fr11, OFFSET_FR11(\r) - lfd fr12, OFFSET_FR12(\r) - lfd fr13, OFFSET_FR13(\r) - lfd fr14, OFFSET_FR14(\r) - lfd fr15, OFFSET_FR15(\r) - lfd fr16, OFFSET_FR16(\r) - lfd fr17, OFFSET_FR17(\r) - lfd fr18, OFFSET_FR18(\r) - lfd fr19, OFFSET_FR19(\r) - lfd fr20, OFFSET_FR20(\r) - lfd fr21, OFFSET_FR21(\r) - lfd fr22, OFFSET_FR22(\r) - lfd fr23, OFFSET_FR23(\r) - lfd fr24, OFFSET_FR24(\r) - lfd fr25, OFFSET_FR25(\r) - lfd fr26, OFFSET_FR26(\r) - lfd fr27, OFFSET_FR27(\r) - lfd fr28, OFFSET_FR28(\r) - lfd fr29, OFFSET_FR29(\r) - lfd fr30, OFFSET_FR30(\r) - lfd fr31, OFFSET_FR31(\r) + lfd fr0, FPU_CONTEXT_OFFSET_FR0(\r) + lfd fr1, FPU_CONTEXT_OFFSET_FR1(\r) + lfd fr2, FPU_CONTEXT_OFFSET_FR2(\r) + lfd fr3, FPU_CONTEXT_OFFSET_FR3(\r) + lfd fr4, FPU_CONTEXT_OFFSET_FR4(\r) + lfd fr5, FPU_CONTEXT_OFFSET_FR5(\r) + lfd fr6, FPU_CONTEXT_OFFSET_FR6(\r) + lfd fr7, FPU_CONTEXT_OFFSET_FR7(\r) + lfd fr8, FPU_CONTEXT_OFFSET_FR8(\r) + lfd fr9, FPU_CONTEXT_OFFSET_FR9(\r) + lfd fr10, FPU_CONTEXT_OFFSET_FR10(\r) + lfd fr11, FPU_CONTEXT_OFFSET_FR11(\r) + lfd fr12, FPU_CONTEXT_OFFSET_FR12(\r) + lfd fr13, FPU_CONTEXT_OFFSET_FR13(\r) + lfd fr14, FPU_CONTEXT_OFFSET_FR14(\r) + lfd fr15, FPU_CONTEXT_OFFSET_FR15(\r) + lfd fr16, FPU_CONTEXT_OFFSET_FR16(\r) + lfd fr17, FPU_CONTEXT_OFFSET_FR17(\r) + lfd fr18, FPU_CONTEXT_OFFSET_FR18(\r) + lfd fr19, FPU_CONTEXT_OFFSET_FR19(\r) + lfd fr20, FPU_CONTEXT_OFFSET_FR20(\r) + lfd fr21, FPU_CONTEXT_OFFSET_FR21(\r) + lfd fr22, FPU_CONTEXT_OFFSET_FR22(\r) + lfd fr23, FPU_CONTEXT_OFFSET_FR23(\r) + lfd fr24, FPU_CONTEXT_OFFSET_FR24(\r) + lfd fr25, FPU_CONTEXT_OFFSET_FR25(\r) + lfd fr26, FPU_CONTEXT_OFFSET_FR26(\r) + lfd fr27, FPU_CONTEXT_OFFSET_FR27(\r) + lfd fr28, FPU_CONTEXT_OFFSET_FR28(\r) + lfd fr29, FPU_CONTEXT_OFFSET_FR29(\r) + lfd fr30, FPU_CONTEXT_OFFSET_FR30(\r) + lfd fr31, FPU_CONTEXT_OFFSET_FR31(\r) .endm @@ -113,10 +113,10 @@ mffs fr0 - stfd fr0, OFFSET_FPSCR(r3) + stfd fr0, FPU_CONTEXT_OFFSET_FPSCR(r3) blr fpu_context_restore: - lfd fr0, OFFSET_FPSCR(r3) + lfd fr0, FPU_CONTEXT_OFFSET_FPSCR(r3) mtfsf 7, fr0