From dbf52c6176b6b4831898e7fc5c46e23624a2e2b2 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 24 Nov 2008 01:45:36 -0600 Subject: [PATCH] Fix PowerPC bootstrap --- basis/cpu/ppc/bootstrap.factor | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/basis/cpu/ppc/bootstrap.factor b/basis/cpu/ppc/bootstrap.factor index 9003757b78..512fff798b 100644 --- a/basis/cpu/ppc/bootstrap.factor +++ b/basis/cpu/ppc/bootstrap.factor @@ -71,28 +71,23 @@ big-endian on [ 0 B ] rc-relative-ppc-3 rt-xt 0 jit-word-jump jit-define -: jit-jump-quot ( -- ) - 4 3 quot-xt-offset LWZ - 4 MTCTR - BCTR ; - -: jit-call-quot ( -- ) - 4 3 quot-xt-offset LWZ - 4 MTLR - BLRL ; - [ 3 ds-reg 0 LWZ ds-reg dup 4 SUBI 0 3 \ f tag-number CMPI - 2 BNE + 2 BEQ 0 B -] rc-relative-ppc-3 rt-xt 3 jit-if-1 jit-define +] rc-relative-ppc-3 rt-xt 4 jit-if-1 jit-define [ 0 B ] rc-relative-ppc-3 rt-xt 0 jit-if-2 jit-define +: jit-jump-quot ( -- ) + 4 3 quot-xt-offset LWZ + 4 MTCTR + BCTR ; + [ 0 3 LOAD32 3 3 0 LWZ @@ -128,9 +123,9 @@ big-endian on 6 rs-reg -8 STW ; : jit-r> ( -- ) - 4 ds-reg 0 LWZ - ds-reg dup 4 SUBI - 4 rs-reg 4 STWU ; + 4 rs-reg 0 LWZ + rs-reg dup 4 SUBI + 4 ds-reg 4 STWU ; : jit-2r> ( -- ) 4 rs-reg 0 LWZ