kernel: ?if-old is just `[ or* ] 2dip if`

[factor.git] / basis / cpu / ppc / ppc.factor

diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor
index 7a5e3a3ad6042229b7aa07557ce0c5ad16a3517a..81a549118a249a025d8509d4ff040516dc543ff5 100644 (file)
--- a/basis/cpu/ppc/ppc.factor
+++ b/basis/cpu/ppc/ppc.factor
@@ -701,7 +701,7 @@ M:: ppc.64 %convert-integer ( dst src c-type -- )
     } case ;
 
 M: ppc.32 %load-memory-imm
-    [
+    or* [
         pick %trap-null
         {
             { c:char   [ [ dup ] 2dip LBZ dup EXTSB ] }
@@ -717,10 +717,10 @@ M: ppc.32 %load-memory-imm
             { float-rep  [ LFS ] }
             { double-rep [ LFD ] }
         } case
-    ] ?if-old ;
+    ] if ;
 
 M: ppc.64 %load-memory-imm
-    [
+    or* [
         pick %trap-null
         {
             { c:char      [ [ dup ] 2dip LBZ dup EXTSB ] }
@@ -738,12 +738,12 @@ M: ppc.64 %load-memory-imm
             { float-rep  [ [ scratch-reg ] dip LI scratch-reg LFSX ] }
             { double-rep [ [ scratch-reg ] dip LI scratch-reg LFDX ] }
         } case
-    ] ?if-old ;
+    ] if ;
 
 
 M: ppc.32 %load-memory
     [ [ 0 assert= ] bi@ ] 2dip
-    [
+    or* [
         pick %trap-null
         {
             { c:char   [ [ LBZX ] [ drop dup EXTSB ] 2bi ] }
@@ -759,11 +759,11 @@ M: ppc.32 %load-memory
             { float-rep  [ LFSX ] }
             { double-rep [ LFDX ] }
         } case
-    ] ?if-old ;
+    ] if ;
 
 M: ppc.64 %load-memory
     [ [ 0 assert= ] bi@ ] 2dip
-    [
+    or* [
         pick %trap-null
         {
             { c:char      [ [ LBZX ] [ drop dup EXTSB ] 2bi ] }
@@ -781,11 +781,11 @@ M: ppc.64 %load-memory
             { float-rep  [ LFSX ] }
             { double-rep [ LFDX ] }
         } case
-    ] ?if-old ;
+    ] if ;
 
 
 M: ppc.32 %store-memory-imm
-    [
+    or* [
         {
             { c:char   [ STB ] }
             { c:uchar  [ STB ] }
@@ -800,10 +800,10 @@ M: ppc.32 %store-memory-imm
             { float-rep  [ STFS ] }
             { double-rep [ STFD ] }
         } case
-    ] ?if-old ;
+    ] if ;
 
 M: ppc.64 %store-memory-imm
-    [
+    or* [
         {
             { c:char      [ STB ] }
             { c:uchar     [ STB ] }
@@ -820,11 +820,11 @@ M: ppc.64 %store-memory-imm
             { float-rep  [ [ scratch-reg ] dip LI scratch-reg STFSX ] }
             { double-rep [ [ scratch-reg ] dip LI scratch-reg STFDX ] }
         } case
-    ] ?if-old ;
+    ] if ;
 
 M: ppc.32 %store-memory
     [ [ 0 assert= ] bi@ ] 2dip
-    [
+    or* [
         {
             { c:char   [ STBX ] }
             { c:uchar  [ STBX ] }
@@ -839,11 +839,11 @@ M: ppc.32 %store-memory
             { float-rep  [ STFSX ] }
             { double-rep [ STFDX ] }
         } case
-    ] ?if-old ;
+    ] if ;
 
 M: ppc.64 %store-memory
     [ [ 0 assert= ] bi@ ] 2dip
-    [
+    or* [
         {
             { c:char      [ STBX ] }
             { c:uchar     [ STBX ] }
@@ -860,7 +860,7 @@ M: ppc.64 %store-memory
             { float-rep  [ STFSX ] }
             { double-rep [ STFDX ] }
         } case
-    ] ?if-old ;
+    ] if ;
 
 M:: ppc %allot ( dst size class nursery-ptr -- )
     ! dst = vm->nursery.here;