From 988c8d06016f703e99e932701532614df4d8c0d5 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 13 Jan 2010 03:09:43 +1300
Subject: [PATCH] More PowerPC non-optimizing compiler backend fixes
---
basis/compiler/tests/alien.factor | 4 +---
basis/cpu/ppc/bootstrap.factor | 6 +++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor
index cb39c0dd16..5e49e2d28d 100644
--- 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 69b6939cda..e3c212bd48 100644
--- 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
0 1 callback-frame-size lr-save + STW
- nv-int-regs [ cells save-int ] each-index
+ nv-int-regs [ 4 * save-int ] each-index
nv-fp-regs [ 8 * 80 + save-fp ] each-index
nv-vec-regs [ 16 * 224 + save-vec ] each-index
@@ -72,7 +72,7 @@ CONSTANT: ctx-reg 16
nv-vec-regs [ 16 * 224 + restore-vec ] each-index
nv-fp-regs [ 8 * 80 + restore-fp ] each-index
- nv-int-regs [ cells restore-int ] each-index
+ nv-int-regs [ 4 * restore-int ] each-index
0 1 callback-frame-size lr-save + LWZ
1 1 0 LWZ
@@ -366,7 +366,7 @@ CONSTANT: ctx-reg 16
jit-restore-context
! We have changed the stack; load return address again
- 0 1 stack-frame lr-save + LWZ
+ 0 1 lr-save LWZ
0 MTLR
! Call quotation