From 26c002d23fbaa46fa3aa5a903e0920ffe2d1d9a6 Mon Sep 17 00:00:00 2001
From: sheeple <sheeple@oberon.local>
Date: Sat, 29 Nov 2008 00:44:46 -0600
Subject: [PATCH] Fix fixnum* problem; result was shifted to the right by 3
 bits if both input registers were equal

---
 basis/compiler/tests/codegen.factor       |  3 +++
 basis/cpu/ppc/ppc.factor                  | 12 ++++++------
 extra/math/matrices/matrices-tests.factor |  2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/basis/compiler/tests/codegen.factor b/basis/compiler/tests/codegen.factor
index eb818972fc..b32a55fdd5 100644
--- a/basis/compiler/tests/codegen.factor
+++ b/basis/compiler/tests/codegen.factor
@@ -261,3 +261,6 @@ TUPLE: id obj ;
 
 [ 3 ] [ 1 t fixnum-overflow-control-flow-test ] unit-test
 [ 2 ] [ 1 f fixnum-overflow-control-flow-test ] unit-test
+
+[ 4 ] [ 2 [ dup fixnum* ] compile-call ] unit-test
+[ 7 ] [ 2 [ dup fixnum* 3 fixnum+fast ] compile-call ] unit-test
diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor
index aa9126fef0..8632d236cc 100644
--- a/basis/cpu/ppc/ppc.factor
+++ b/basis/cpu/ppc/ppc.factor
@@ -228,12 +228,12 @@ M:: ppc %fixnum-mul ( src1 src2 -- )
     "no-overflow" define-label
     0 0 LI
     0 MTXER
-    src1 src1 tag-bits get SRAWI
-    scratch-reg src1 src2 MULLWO.
+    scratch-reg src1 tag-bits get SRAWI
+    scratch-reg scratch-reg src2 MULLWO.
     scratch-reg ds-reg 0 STW
     "no-overflow" get BNO
     src2 src2 tag-bits get SRAWI
-    src1 src2 move>args
+    scratch-reg src2 move>args
     %prepare-alien-invoke
     "overflow_fixnum_multiply" f %alien-invoke
     "no-overflow" resolve-label ;
@@ -242,14 +242,14 @@ M:: ppc %fixnum-mul-tail ( src1 src2 -- )
     "overflow" define-label
     0 0 LI
     0 MTXER
-    src1 src1 tag-bits get SRAWI
-    scratch-reg src1 src2 MULLWO.
+    scratch-reg src1 tag-bits get SRAWI
+    scratch-reg scratch-reg src2 MULLWO.
     "overflow" get BO
     scratch-reg ds-reg 0 STW
     BLR
     "overflow" resolve-label
     src2 src2 tag-bits get SRAWI
-    src1 src2 move>args
+    scratch-reg src2 move>args
     %prepare-alien-invoke
     "overflow_fixnum_multiply" f %alien-invoke-tail ;
 
diff --git a/extra/math/matrices/matrices-tests.factor b/extra/math/matrices/matrices-tests.factor
index ee2516e9a6..6f87109ba0 100644
--- a/extra/math/matrices/matrices-tests.factor
+++ b/extra/math/matrices/matrices-tests.factor
@@ -102,3 +102,5 @@ USING: math.matrices math.vectors tools.test math ;
 [ { 0 0 -1 } ] [ { 1 0 0 } { 0 1 0 } cross ] unit-test
 [ { 1 0 0 } ] [ { 0 1 0 } { 0 0 1 } cross ] unit-test
 [ { 0 1 0 } ] [ { 0 0 1 } { 1 0 0 } cross ] unit-test
+
+[ { 1 0 0 } ] [ { 1 1 0 } { 1 0 0 } proj ] unit-test