[pypy-commit] pypy jitframe-on-heap: clean up

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r61266:c9ef8d769b0b
Date: 2013-02-15 17:04 +0200
http://bitbucket.org/pypy/pypy/changeset/c9ef8d769b0b/

Log:	clean up

diff --git a/rpython/jit/backend/llsupport/assembler.py b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -147,7 +147,7 @@
         guardtok.faildescr.rd_loop_token = self.current_clt
         return fail_descr, target
 
-    def call_assembler(self, op, guard_op, frame_loc, argloc,
+    def call_assembler(self, op, guard_op, argloc,
                        vloc, result_loc, tmploc):
         self._store_force_index(guard_op)
         descr = op.getdescr()
diff --git a/rpython/jit/backend/llsupport/regalloc.py b/rpython/jit/backend/llsupport/regalloc.py
--- a/rpython/jit/backend/llsupport/regalloc.py
+++ b/rpython/jit/backend/llsupport/regalloc.py
@@ -671,13 +671,11 @@
         descr = op.getdescr()
         assert isinstance(descr, JitCellToken)
         arglist = op.getarglist()
-        self.rm._sync_var(arglist[0])
-        frame_loc = self.fm.loc(op.getarg(0))
         if len(arglist) == 2:
             self.rm._sync_var(arglist[1])
-            return [frame_loc, self.loc(arglist[0]), self.fm.loc(arglist[1])]
+            return [self.loc(arglist[0]), self.fm.loc(arglist[1])]
         else:
-            return [frame_loc, self.loc(arglist[0])]
+            return [self.loc(arglist[0])]
 
 
 def compute_vars_longevity(inputargs, operations):
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -2174,12 +2174,11 @@
     def genop_guard_call_assembler(self, op, guard_op, guard_token,
                                    arglocs, result_loc):
         if len(arglocs) == 3:
-            [frame_loc, argloc, vloc] = arglocs
+            [argloc, vloc] = arglocs
         else:
-            [frame_loc, argloc] = arglocs
+            [argloc] = arglocs
             vloc = self.imm(0)
-        self.call_assembler(op, guard_op, frame_loc, argloc, vloc,
-                            result_loc, eax)
+        self.call_assembler(op, guard_op, argloc, vloc, result_loc, eax)
         self._emit_guard_not_forced(guard_token)
 
     def _call_assembler_check_descr(self, value, tmploc):