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

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

diff --git a/basis/cpu/x86/x86.factor b/basis/cpu/x86/x86.factor
index 431a6156e9504fc48c83220e960667f31866cd55..e5837712738cd35fc44ecf19d9b59c94ffa15520 100644 (file)
--- a/basis/cpu/x86/x86.factor
+++ b/basis/cpu/x86/x86.factor
@@ -400,7 +400,7 @@ M: x86 %convert-integer
     [ [ drop 1array ] [ [+] ] 2bi ] 2dip ;
 
 : (%load-memory) ( dst exclude address rep c-type -- )
-    [
+    or* [
         {
             { c:char   [ 8 %alien-signed-getter ] }
             { c:uchar  [ 8 %alien-unsigned-getter ] }
@@ -409,7 +409,7 @@ M: x86 %convert-integer
             { c:int    [ 32 %alien-signed-getter ] }
             { c:uint   [ 32 [ 2drop ] %alien-integer-getter ] }
         } case
-    ] [ nipd %copy ] ?if-old ;
+    ] [ nipd %copy ] if ;
 
 M: x86 %load-memory
     (%memory) (%load-memory) ;
@@ -418,7 +418,7 @@ M: x86 %load-memory-imm
     (%memory-imm) (%load-memory) ;
 
 : (%store-memory) ( src exclude address rep c-type -- )
-    [
+    or* [
         {
             { c:char   [ 8 %alien-integer-setter ] }
             { c:uchar  [ 8 %alien-integer-setter ] }
@@ -427,7 +427,7 @@ M: x86 %load-memory-imm
             { c:int    [ 32 %alien-integer-setter ] }
             { c:uint   [ 32 %alien-integer-setter ] }
         } case
-    ] [ [ nip swap ] dip %copy ] ?if-old ;
+    ] [ [ nip swap ] dip %copy ] if ;
 
 M: x86 %store-memory
     (%memory) (%store-memory) ;