Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r61182:f8277f4b139d
Date: 2013-02-13 20:37 +0200
http://bitbucket.org/pypy/pypy/changeset/f8277f4b139d/
Log: fix fix fix
diff --git a/rpython/jit/backend/arm/arch.py b/rpython/jit/backend/arm/arch.py
--- a/rpython/jit/backend/arm/arch.py
+++ b/rpython/jit/backend/arm/arch.py
@@ -14,7 +14,7 @@
# ABI required information
# All the rest of the data is in a GC-managed variable-size "frame".
# This jitframe object's address is always stored in the register FP
-# A jitframe is a jit.backend.llsupport.llmodel.JITFRAME = GcArray(Signed).
+# A jitframe is a jit.backend.llsupport.llmodel.jitframe.JITFRAME
# Stack frame fixed area
# Currently only the force_index
JITFRAME_FIXED_SIZE = 16 + 16 * 2 # 16 GPR + 16 VFP Regs (64bit)
diff --git a/rpython/jit/backend/arm/runner.py
b/rpython/jit/backend/arm/runner.py
--- a/rpython/jit/backend/arm/runner.py
+++ b/rpython/jit/backend/arm/runner.py
@@ -1,6 +1,6 @@
from rpython.jit.backend.arm.arch import JITFRAME_FIXED_SIZE
from rpython.jit.backend.arm.assembler import AssemblerARM
-from rpython.jit.backend.arm.registers import all_regs, all_vfp_regs
+from rpython.jit.backend.arm.registers import all_regs
from rpython.jit.backend.llsupport import jitframe
from rpython.jit.backend.llsupport.symbolic import WORD
from rpython.jit.backend.llsupport.llmodel import AbstractLLCPU
@@ -9,7 +9,6 @@
from rpython.rlib.unroll import unrolling_iterable
from rpython.rtyper.llinterp import LLInterpreter
from rpython.rtyper.lltypesystem import lltype, rffi, llmemory
-from rpython.rtyper.lltypesystem.lloperation import llop
jitframe.STATICSIZE = JITFRAME_FIXED_SIZE
@@ -20,7 +19,10 @@
supports_longlong = False # XXX requires an implementation of
# read_timestamp that works in user mode
supports_singlefloats = True
-
+
+ from rpython.jit.backend.arm.arch import JITFRAME_FIXED_SIZE
+ all_reg_indexes = range(16)
+
use_hf_abi = False # use hard float abi flag
def __init__(self, rtyper, stats, opts=None, translate_support_code=False,
diff --git a/rpython/jit/backend/llsupport/assembler.py
b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -30,7 +30,7 @@
if arg.type == REF:
loc = fail_locs[i]
if loc.is_reg():
- val = self.cpu.gpr_reg_mgr_cls.all_reg_indexes[loc.value]
+ val = self.cpu.all_reg_indexes[loc.value]
else:
val = loc.get_position() + self.cpu.JITFRAME_FIXED_SIZE
gcmap[val // WORD // 8] |= r_uint(1) << (val % (WORD * 8))
diff --git a/rpython/jit/backend/x86/runner.py
b/rpython/jit/backend/x86/runner.py
--- a/rpython/jit/backend/x86/runner.py
+++ b/rpython/jit/backend/x86/runner.py
@@ -2,6 +2,7 @@
from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
from rpython.rlib.jit_hooks import LOOP_RUN_CONTAINER
from rpython.jit.backend.x86.assembler import Assembler386
+from rpython.jit.backend.x86.regalloc import gpr_reg_mgr_cls
from rpython.jit.backend.x86.profagent import ProfileAgent
from rpython.jit.backend.llsupport.llmodel import AbstractLLCPU
from rpython.jit.backend.x86 import regloc
@@ -22,6 +23,7 @@
with_threads = False
from rpython.jit.backend.x86.arch import JITFRAME_FIXED_SIZE
+ all_reg_indexes = gpr_reg_mgr_cls.all_reg_indexes
def __init__(self, rtyper, stats, opts=None, translate_support_code=False,
gcdescr=None):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
