[pypy-commit] pypy result-in-resops: fix argument order

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: result-in-resops
Changeset: r57607:dce7398be877
Date: 2012-09-26 13:54 +0200
http://bitbucket.org/pypy/pypy/changeset/dce7398be877/

Log:	fix argument order

diff --git a/pypy/jit/metainterp/optimizeopt/intbounds.py b/pypy/jit/metainterp/optimizeopt/intbounds.py
--- a/pypy/jit/metainterp/optimizeopt/intbounds.py
+++ b/pypy/jit/metainterp/optimizeopt/intbounds.py
@@ -175,10 +175,9 @@
                 self.pure(args[0], rop.INT_SUB, result, args[1])
                 self.pure(args[1], rop.INT_SUB, result, args[0])
             elif opnum == rop.INT_SUB_OVF:
-                xxxx
-                self.pure(rop.INT_SUB, args[:], result)
-                self.pure(rop.INT_ADD, [result, args[1]], args[0])
-                self.pure(rop.INT_SUB, [args[0], result], args[1])
+                self.pure(result, rop.INT_SUB, args[0], args[1])
+                self.pure(args[0], rop.INT_ADD, result, args[1])
+                self.pure(args[1], rop.INT_SUB, args[0], result)
             elif opnum == rop.INT_MUL_OVF:
                 xxxx
                 self.pure(rop.INT_MUL, args[:], result)
diff --git a/pypy/jit/metainterp/optimizeopt/rewrite.py b/pypy/jit/metainterp/optimizeopt/rewrite.py
--- a/pypy/jit/metainterp/optimizeopt/rewrite.py
+++ b/pypy/jit/metainterp/optimizeopt/rewrite.py
@@ -54,7 +54,8 @@
 
         oldopnum = opboolreflex[op.getopnum()] # FIXME: add INT_ADD, INT_MUL
         if oldopnum != -1:
-            key_op = op.copy_and_change(oldopnum)
+            key_op = op.copy_and_change(oldopnum, arg0=op.getarg(1),
+                                        arg1=op.getarg(0))
             oldop = self.get_pure_result(key_op)
             if oldop is not None and oldop.getdescr() is op.getdescr():
                 self.replace(op, oldop)
@@ -62,7 +63,8 @@
 
         oldopnum = opboolinvers[opboolreflex[op.getopnum()]]
         if oldopnum != -1:
-            key_op = op.copy_and_change(oldopnum)
+            key_op = op.copy_and_change(oldopnum, arg0=op.getarg(1),
+                                        arg1=op.getarg(0))
             if self.try_boolinvers(op, key_op):
                 return True