Author: Armin Rigo <ar...@tunes.org>
Branch: optresult-unroll
Changeset: r79487:9fc1d9a8777c
Date: 2015-09-06 21:39 +0200
http://bitbucket.org/pypy/pypy/changeset/9fc1d9a8777c/
Log: arm: fixes
diff --git a/rpython/jit/backend/arm/helper/assembler.py
b/rpython/jit/backend/arm/helper/assembler.py
--- a/rpython/jit/backend/arm/helper/assembler.py
+++ b/rpython/jit/backend/arm/helper/assembler.py
@@ -50,7 +50,7 @@
helper = getattr(InstrBuilder, opname)
def f(self, op, arglocs, regalloc, fcond):
assert fcond is not None
- if op.result:
+ if op.type != 'v':
regs = r.caller_resp[1:] + [r.ip]
else:
regs = r.caller_resp
diff --git a/rpython/jit/backend/arm/helper/regalloc.py
b/rpython/jit/backend/arm/helper/regalloc.py
--- a/rpython/jit/backend/arm/helper/regalloc.py
+++ b/rpython/jit/backend/arm/helper/regalloc.py
@@ -111,7 +111,7 @@
def prepare_unary_cmp(self, op, fcond):
assert fcond is not None
a0 = op.getarg(0)
- assert isinstance(a0, Box)
+ assert not isinstance(a0, Const)
reg = self.make_sure_var_in_reg(a0)
self.possibly_free_vars_for_op(op)
res = self.force_allocate_reg_or_cc(op)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
