From a14e1ebcb5a78e0a90ebdd12eee4b5fe5b799668 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 13 Nov 2008 05:55:34 -0600 Subject: [PATCH 1/2] Fix PowerPC bootstrap --- basis/cpu/ppc/ppc.factor | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor index 1bc8d6975d..2ff9921abf 100644 --- a/basis/cpu/ppc/ppc.factor +++ b/basis/cpu/ppc/ppc.factor @@ -112,9 +112,10 @@ M: ppc %jump-label ( label -- ) B ; M: ppc %return ( -- ) BLR ; M:: ppc %dispatch ( src temp offset -- ) - 0 temp LOAD32 rc-absolute-ppc-2/2 rel-here + 0 temp LOAD32 + 5 offset + cells rc-absolute-ppc-2/2 rel-here temp temp src ADD - temp temp 5 offset + cells LWZ + temp temp 0 LWZ temp MTCTR BCTR ; From eef45a1cc3a66b22ddb09b9bb4288b7ec4e74bec Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 13 Nov 2008 05:58:49 -0600 Subject: [PATCH 2/2] Tweak PowerPC %dispatch --- basis/cpu/ppc/ppc.factor | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor index 2ff9921abf..c656ae4d89 100644 --- a/basis/cpu/ppc/ppc.factor +++ b/basis/cpu/ppc/ppc.factor @@ -113,9 +113,8 @@ M: ppc %return ( -- ) BLR ; M:: ppc %dispatch ( src temp offset -- ) 0 temp LOAD32 - 5 offset + cells rc-absolute-ppc-2/2 rel-here - temp temp src ADD - temp temp 0 LWZ + 4 offset + cells rc-absolute-ppc-2/2 rel-here + temp temp src LWZX temp MTCTR BCTR ;