Delete empty unit tests files, remove 1- and 1+, reorder IN: lines in a lot of places...

[factor.git] / basis / compiler / cfg / two-operand / two-operand-tests.factor

diff --git a/basis/compiler/cfg/two-operand/two-operand-tests.factor b/basis/compiler/cfg/two-operand/two-operand-tests.factor
index 0d0c57e0f736d87342e4779ed76c3c4305c9e070..09d88a29598c676fe569f66f3eac837821ee239a 100644 (file)
--- a/basis/compiler/cfg/two-operand/two-operand-tests.factor
+++ b/basis/compiler/cfg/two-operand/two-operand-tests.factor
@@ -1,45 +1,52 @@
-IN: compiler.cfg.two-operand.tests
-USING: compiler.cfg.two-operand compiler.cfg.instructions
+USING: kernel compiler.cfg.two-operand compiler.cfg.instructions
 compiler.cfg.registers cpu.architecture namespaces tools.test ;
+IN: compiler.cfg.two-operand.tests
 
 3 vreg-counter set-global
 
 [
     V{
-        T{ ##copy f V int-regs 1 V int-regs 2 }
-        T{ ##sub f V int-regs 1 V int-regs 1 V int-regs 3 }
+        T{ ##copy f 1 2 int-rep }
+        T{ ##sub f 1 1 3 }
     }
 ] [
+    H{
+        { 1 int-rep }
+        { 2 int-rep }
+        { 3 int-rep }
+    } clone representations set
     {
-        T{ ##sub f V int-regs 1 V int-regs 2 V int-regs 3 }
+        T{ ##sub f 1 2 3 }
     } (convert-two-operand)
 ] unit-test
 
 [
     V{
-        T{ ##sub f V int-regs 1 V int-regs 1 V int-regs 2 }
+        T{ ##copy f 1 2 double-float-rep }
+        T{ ##sub-float f 1 1 3 }
     }
 ] [
+    H{
+        { 1 double-float-rep }
+        { 2 double-float-rep }
+        { 3 double-float-rep }
+    } clone representations set
     {
-        T{ ##sub f V int-regs 1 V int-regs 1 V int-regs 2 }
+        T{ ##sub-float f 1 2 3 }
     } (convert-two-operand)
 ] unit-test
 
 [
     V{
-        T{ ##copy f V int-regs 4 V int-regs 2 }
-        T{ ##sub f V int-regs 4 V int-regs 4 V int-regs 1 }
-        T{ ##copy f V int-regs 1 V int-regs 4 }
+        T{ ##copy f 1 2 double-float-rep }
+        T{ ##mul-float f 1 1 1 }
     }
 ] [
+    H{
+        { 1 double-float-rep }
+        { 2 double-float-rep }
+    } clone representations set
     {
-        T{ ##sub f V int-regs 1 V int-regs 2 V int-regs 1 }
+        T{ ##mul-float f 1 2 2 }
     } (convert-two-operand)
 ] unit-test
-
-! This should never come up after coalescing
-[
-    V{
-        T{ ##fixnum-add f V int-regs 2 V int-regs 4 V int-regs 2 }
-    } (convert-two-operand)
-] must-fail