[pypy-commit] pypy arm-backend-2: small fixes

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: arm-backend-2
Changeset: r45217:f5732081f673
Date: 2011-07-01 10:05 +0200
http://bitbucket.org/pypy/pypy/changeset/f5732081f673/

Log:	small fixes

diff --git a/pypy/jit/backend/arm/opassembler.py b/pypy/jit/backend/arm/opassembler.py
--- a/pypy/jit/backend/arm/opassembler.py
+++ b/pypy/jit/backend/arm/opassembler.py
@@ -178,7 +178,8 @@
 
         memaddr = self._gen_path_to_exit_path(op, op.getfailargs(),
                                             arglocs, save_exc=save_exc)
-        self.pending_guards.append(GuardToken(op.getdescr(), pos=pos, memaddr=memaddr))
+        self.pending_guards.append(GuardToken(op.getdescr(), 
+                                    offset=pos, encoded_args=memaddr))
         return c.AL
 
     def _emit_guard_overflow(self, guard, failargs, fcond):
@@ -250,6 +251,7 @@
         pos = self.mc.currpos() # after potential jmp
         memaddr = self.gen_descr_encoding(op, op.getfailargs(), locs)
         self.pending_guards.append(GuardToken(op.getdescr(), pos, memaddr, True))
+        return fcond
 
     def _cmp_guard_class(self, op, locs, regalloc, fcond):
         offset = locs[2]