From bb4be4de7eeb9ffd69fbccb001ca26b3d9f4518b Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Tue, 1 Mar 2011 11:24:44 -0700 Subject: [PATCH] fix Linux/PowerPC continuations=true build --- src/compile-powerpc.S | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/compile-powerpc.S b/src/compile-powerpc.S index e97556e483..56fc5222da 100644 --- a/src/compile-powerpc.S +++ b/src/compile-powerpc.S @@ -157,7 +157,11 @@ LOCAL(vmInvoke_continuationTest): LOCAL(vmInvoke_getPC): mflr r10 +#ifdef __APPLE__ la r10,lo16(GLOBAL(vmInvoke_returnAddress)-LOCAL(vmInvoke_getPC))(r10) +#else + lwz r10,LOCAL(vmInvoke_returnAddress_address)-LOCAL(vmInvoke_getPC)(r10) +#endif stwx r10,r1,r7 lwz r7,CONTINUATION_FRAME_POINTER_OFFSET(r5) @@ -228,6 +232,9 @@ LOCAL(vmInvoke_return): // return blr + +LOCAL(vmInvoke_returnAddress_address): + .long GLOBAL(vmInvoke_returnAddress) .globl GLOBAL(vmJumpAndInvoke) GLOBAL(vmJumpAndInvoke): @@ -276,7 +283,11 @@ LOCAL(vmJumpAndInvoke_argumentTest): LOCAL(vmJumpAndInvoke_getPC): mflr r10 +#ifdef __APPLE__ la r10,lo16(GLOBAL(vmInvoke_returnAddress)-LOCAL(vmJumpAndInvoke_getPC))(r10) +#else + lwz r10,LOCAL(vmInvoke_returnAddress_address)-LOCAL(vmJumpAndInvoke_getPC)(r10) +#endif mtlr r10 mtctr r4