Author: David Schneider <[email protected]>
Branch: arm-backend-2
Changeset: r52057:651ccc6e4f1a
Date: 2012-01-26 12:01 +0100
http://bitbucket.org/pypy/pypy/changeset/651ccc6e4f1a/
Log: partially revert db27ab55d51b
diff --git a/pypy/jit/backend/arm/helper/assembler.py
b/pypy/jit/backend/arm/helper/assembler.py
--- a/pypy/jit/backend/arm/helper/assembler.py
+++ b/pypy/jit/backend/arm/helper/assembler.py
@@ -143,9 +143,8 @@
class saved_registers(object):
- def __init__(self, assembler, regs_to_save, vfp_regs_to_save=None):
- self.assembler = assembler
- self.supports_floats = assembler.cpu.supports_floats
+ def __init__(self, cb, regs_to_save, vfp_regs_to_save=None):
+ self.cb = cb
if vfp_regs_to_save is None:
vfp_regs_to_save = []
self.regs = regs_to_save
@@ -153,15 +152,15 @@
def __enter__(self):
if len(self.regs) > 0:
- self.assembler.PUSH([r.value for r in self.regs])
- if self.supports_floats and len(self.vfp_regs) > 0:
- self.assembler.VPUSH([r.value for r in self.vfp_regs])
+ self.cb.PUSH([r.value for r in self.regs])
+ if len(self.vfp_regs) > 0:
+ self.cb.VPUSH([r.value for r in self.vfp_regs])
def __exit__(self, *args):
- if self.supports_floats and len(self.vfp_regs) > 0:
- self.assembler.VPOP([r.value for r in self.vfp_regs])
+ if len(self.vfp_regs) > 0:
+ self.cb.VPOP([r.value for r in self.vfp_regs])
if len(self.regs) > 0:
- self.assembler.POP([r.value for r in self.regs])
+ self.cb.POP([r.value for r in self.regs])
def count_reg_args(args):
reg_args = 0
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
