[pypy-commit] pypy default: Clean-ups and comments.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r56531:8b362b495864
Date: 2012-08-02 09:10 +0200
http://bitbucket.org/pypy/pypy/changeset/8b362b495864/

Log:	Clean-ups and comments.

diff --git a/pypy/jit/backend/x86/assembler.py b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -1000,6 +1000,8 @@
 
     def _binaryop_or_lea(asmop, is_add):
         def genop_binary_or_lea(self, op, arglocs, result_loc):
+            # use a regular ADD or SUB if result_loc is arglocs[0],
+            # and a LEA only if different.
             if result_loc is arglocs[0]:
                 getattr(self.mc, asmop)(arglocs[0], arglocs[1])
             else:
@@ -1727,15 +1729,15 @@
                             guard_op.getopname())
 
     def genop_guard_int_add_ovf(self, op, guard_op, guard_token, arglocs, result_loc):
-        self.genop_int_add(op, arglocs, result_loc)
+        self.mc.ADD(arglocs[0], arglocs[1])
         return self._gen_guard_overflow(guard_op, guard_token)
 
     def genop_guard_int_sub_ovf(self, op, guard_op, guard_token, arglocs, result_loc):
-        self.genop_int_sub(op, arglocs, result_loc)
+        self.mc.SUB(arglocs[0], arglocs[1])
         return self._gen_guard_overflow(guard_op, guard_token)
 
     def genop_guard_int_mul_ovf(self, op, guard_op, guard_token, arglocs, result_loc):
-        self.genop_int_mul(op, arglocs, result_loc)
+        self.mc.IMUL(arglocs[0], arglocs[1])
         return self._gen_guard_overflow(guard_op, guard_token)
 
     def genop_guard_guard_false(self, ign_1, guard_op, guard_token, locs, ign_2):
diff --git a/pypy/jit/backend/x86/regalloc.py b/pypy/jit/backend/x86/regalloc.py
--- a/pypy/jit/backend/x86/regalloc.py
+++ b/pypy/jit/backend/x86/regalloc.py
@@ -617,7 +617,7 @@
         resloc = self.force_allocate_reg(op.result)
         self.Perform(op, [loc, argloc], resloc)
 
-    def _consider_binop_add(self, op):
+    def consider_int_add(self, op):
         loc = self.loc(op.getarg(0))
         y = op.getarg(1)
         if (isinstance(loc, RegLoc) and
@@ -626,7 +626,7 @@
         else:
             self._consider_binop(op)
 
-    def _consider_binop_sub(self, op):
+    def consider_int_sub(self, op):
         loc = self.loc(op.getarg(0))
         y = op.getarg(1)
         if (isinstance(loc, RegLoc) and
@@ -635,9 +635,7 @@
         else:
             self._consider_binop(op)
 
-    consider_int_add = _consider_binop_add
     consider_int_mul = _consider_binop
-    consider_int_sub = _consider_binop_sub
     consider_int_and = _consider_binop
     consider_int_or  = _consider_binop
     consider_int_xor = _consider_binop