Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r60151:0805c40ffe53
Date: 2013-01-17 22:52 +0200
http://bitbucket.org/pypy/pypy/changeset/0805c40ffe53/
Log: maaaaaybe?
diff --git a/pypy/jit/backend/x86/assembler.py
b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -1909,7 +1909,7 @@
if withfloats:
# Push all XMM regs
ofs = len(gpr_reg_mgr_cls.all_regs)
- for i in range(self.cpu.NUM_REGS):
+ for i in range(len(xmm_reg_mgr_cls.all_regs)):
mc.MOVSD_bx((ofs + i) * WORD, i)
def _pop_all_regs_from_frame(self, mc, withfloats):
@@ -1919,7 +1919,7 @@
if withfloats:
# Pop all XMM regs
ofs = len(gpr_reg_mgr_cls.all_regs)
- for i in range(self.cpu.NUM_REGS):
+ for i in range(len(xmm_reg_mgr_cls.all_regs)):
mc.MOVSD_xb(i, (ofs + i) * WORD)
def _build_failure_recovery(self, exc, withfloats=False):
diff --git a/pypy/jit/backend/x86/test/test_gc_integration.py
b/pypy/jit/backend/x86/test/test_gc_integration.py
--- a/pypy/jit/backend/x86/test/test_gc_integration.py
+++ b/pypy/jit/backend/x86/test/test_gc_integration.py
@@ -14,27 +14,6 @@
CPU = getcpuclass()
-class MockGcRootMap(object):
- is_shadow_stack = False
- def get_basic_shape(self):
- return ['shape']
- def add_frame_offset(self, shape, offset):
- shape.append(offset)
- def add_callee_save_reg(self, shape, reg_index):
- index_to_name = { 1: 'ebx', 2: 'esi', 3: 'edi' }
- shape.append(index_to_name[reg_index])
- def compress_callshape(self, shape, datablockwrapper):
- assert datablockwrapper == 'fakedatablockwrapper'
- assert shape[0] == 'shape'
- return ['compressed'] + shape[1:]
-
-class MockGcDescr(GcLLDescr_boehm):
- gcrootmap = MockGcRootMap()
-
-class TestDirectGcIntegration(object):
- def test_gcmap(self):
- pass
-
class TestRegallocGcIntegration(BaseTestRegalloc):
cpu = CPU(None, None)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
