More PowerPC non-optimizing compiler backend fixes

diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor
index cb39c0dd162e48350a658864747aaf30639e234d..5e49e2d28d016f5fc5415f42017991af4da9cbc5 100644 (file)
--- a/basis/compiler/tests/alien.factor
+++ b/basis/compiler/tests/alien.factor
@@ -377,9 +377,7 @@ FUNCTION: ulonglong ffi_test_38 ( ulonglong x, ulonglong y ) ;
 [ f ] [ namespace global eq? ] unit-test
 
 : callback-8 ( -- callback )
-    void { } "cdecl" [
-        [ continue ] callcc0
-    ] alien-callback ;
+    void { } "cdecl" [ [ ] in-thread yield ] alien-callback ;
 
 [ ] [ callback-8 callback_test_1 ] unit-test
 

diff --git a/basis/cpu/ppc/bootstrap.factor b/basis/cpu/ppc/bootstrap.factor
index 69b6939cda1ac662db0914415470b9dddaf434f5..e3c212bd482648af6f250a1bbd405e13112a37fe 100644 (file)
--- a/basis/cpu/ppc/bootstrap.factor
+++ b/basis/cpu/ppc/bootstrap.factor
@@ -60,7 +60,7 @@ CONSTANT: ctx-reg 16
     1 1 callback-frame-size neg STWU\r
     0 1 callback-frame-size lr-save + STW\r
 \r
-    nv-int-regs [ cells save-int ] each-index\r
+    nv-int-regs [ 4 * save-int ] each-index\r
     nv-fp-regs [ 8 * 80 + save-fp ] each-index\r
     nv-vec-regs [ 16 * 224 + save-vec ] each-index\r
 \r
@@ -72,7 +72,7 @@ CONSTANT: ctx-reg 16
 \r
     nv-vec-regs [ 16 * 224 + restore-vec ] each-index\r
     nv-fp-regs [ 8 * 80 + restore-fp ] each-index\r
-    nv-int-regs [ cells restore-int ] each-index\r
+    nv-int-regs [ 4 * restore-int ] each-index\r
 \r
     0 1 callback-frame-size lr-save + LWZ\r
     1 1 0 LWZ\r
@@ -366,7 +366,7 @@ CONSTANT: ctx-reg 16
     jit-restore-context\r
 \r
     ! We have changed the stack; load return address again\r
-    0 1 stack-frame lr-save + LWZ\r
+    0 1 lr-save LWZ\r
     0 MTLR\r
 \r
     ! Call quotation\r