From 50c2a5ae84ab5c06faff1727c912f5047c52eb57 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 4 Feb 2010 08:08:31 +1300
Subject: [PATCH] cpu.ppc: load fixes

---
 basis/cpu/ppc/ppc.factor | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor
index 88e54d5a88..4f4411b314 100644
--- a/basis/cpu/ppc/ppc.factor
+++ b/basis/cpu/ppc/ppc.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2005, 2009 Slava Pestov.
+! Copyright (C) 2005, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs sequences kernel combinators make math
 math.order math.ranges system namespaces locals layouts words
@@ -384,7 +384,7 @@ M: ppc %set-alien-float -rot STFS ;
 M: ppc %set-alien-double -rot STFD ;
 
 : load-zone-ptr ( reg -- )
-    "nursery" %load-vm-field-addr ;
+    "nursery" %vm-field-ptr ;
 
 : load-allot-ptr ( nursery-ptr allot-ptr -- )
     [ drop load-zone-ptr ] [ swap 0 LWZ ] 2bi ;
@@ -676,19 +676,17 @@ M: ppc %box-large-struct ( n c-type -- )
     "from_value_struct" f %alien-invoke ;
 
 M:: ppc %restore-context ( temp1 temp2 -- )
-    temp1 "ctx" %load-vm-field-addr
-    temp1 temp1 0 LWZ
+    temp1 "ctx" %vm-field
     temp2 1 stack-frame get total-size>> ADDI
     temp2 temp1 "callstack-bottom" context-field-offset STW
-    ds-reg temp1 8 LWZ
-    rs-reg temp1 12 LWZ ;
+    ds-reg temp1 "datastack" context-field-offset LWZ
+    rs-reg temp1 "retainstack" context-field-offset LWZ ;
 
 M:: ppc %save-context ( temp1 temp2 -- )
-    temp1 "ctx" %load-vm-field-addr
-    temp1 temp1 0 LWZ
-    1 temp1 0 STW
-    ds-reg temp1 8 STW
-    rs-reg temp1 12 STW ;
+    temp1 "ctx" %vm-field-ptr
+    1 temp1 "callstack-bottom" context-field-offset STW
+    ds-reg temp1 "datastack" context-field-offset STW
+    rs-reg temp1 "retainstack" context-field-offset STW ;
 
 M: ppc %alien-invoke ( symbol dll -- )
     [ 11 ] 2dip %alien-global 11 MTLR BLRL ;