Author: David Schneider <david.schnei...@picle.org>
Branch: emit-call-arm
Changeset: r64525:e94293df0639
Date: 2013-05-23 06:39 -0500
http://bitbucket.org/pypy/pypy/changeset/e94293df0639/

Log:    guard_call_may_force

diff --git a/rpython/jit/backend/arm/opassembler.py 
b/rpython/jit/backend/arm/opassembler.py
--- a/rpython/jit/backend/arm/opassembler.py
+++ b/rpython/jit/backend/arm/opassembler.py
@@ -1028,11 +1028,11 @@
                                                                     fcond):
         self._store_force_index(guard_op)
         numargs = op.numargs()
-        callargs = arglocs[2:numargs + 3]  # extract the arguments to the call
-        assert 0, 'xxx revisit this'
+        callargs = arglocs[:numargs + 3]  # extract the arguments to the call
+        guardargs = arglocs[len(callargs):]
         #
         self._emit_call(op, callargs, fcond)
-        self._emit_guard_may_force(guard_op, arglocs[1 + numargs:])
+        self._emit_guard_may_force(guard_op, guardargs)
         return fcond
 
     def _emit_guard_may_force(self, guard_op, arglocs):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to