Author: Maciej Fijalkowski <[email protected]>
Branch: jitframe-on-heap
Changeset: r60248:73672862e880
Date: 2013-01-20 21:47 +0200
http://bitbucket.org/pypy/pypy/changeset/73672862e880/
Log: fix the merge
diff --git a/rpython/jit/backend/llsupport/gc.py
b/rpython/jit/backend/llsupport/gc.py
--- a/rpython/jit/backend/llsupport/gc.py
+++ b/rpython/jit/backend/llsupport/gc.py
@@ -232,12 +232,18 @@
class GcRootMap_asmgcc(object):
is_shadow_stack = False
+ def __init__(self, gcdescr):
+ pass
+
def register_asm_addr(self, start, mark):
pass
class GcRootMap_shadowstack(object):
is_shadow_stack = True
+ def __init__(self, gcdescr):
+ pass
+
def register_asm_addr(self, start, mark):
pass
@@ -507,7 +513,8 @@
return rffi.cast(lltype.Signed, nurs_top_addr)
def initialize(self):
- self.gcrootmap.initialize()
+ pass
+ #self.gcrootmap.initialize()
def init_size_descr(self, S, descr):
if self.layoutbuilder is not None:
diff --git a/rpython/jit/backend/llsupport/test/test_asmmemmgr.py
b/rpython/jit/backend/llsupport/test/test_asmmemmgr.py
--- a/rpython/jit/backend/llsupport/test/test_asmmemmgr.py
+++ b/rpython/jit/backend/llsupport/test/test_asmmemmgr.py
@@ -155,7 +155,7 @@
def test_insert_gcroot_marker(self):
puts = []
class FakeGcRootMap:
- def put(self, retaddr, mark):
+ def register_asm_addr(self, retaddr, mark):
puts.append((retaddr, mark))
#
mc = BlockBuilderMixin()
diff --git a/rpython/jit/backend/llsupport/test/test_rewrite.py
b/rpython/jit/backend/llsupport/test/test_rewrite.py
--- a/rpython/jit/backend/llsupport/test/test_rewrite.py
+++ b/rpython/jit/backend/llsupport/test/test_rewrite.py
@@ -1,6 +1,6 @@
from rpython.jit.backend.llsupport.descr import get_size_descr,\
get_field_descr, get_array_descr, ArrayDescr, FieldDescr,\
- SizeDescrWithVTable
+ SizeDescrWithVTable, get_interiorfield_descr
from rpython.jit.backend.llsupport.gc import GcLLDescr_boehm,\
GcLLDescr_framework
from rpython.jit.backend.llsupport import jitframe
@@ -9,7 +9,8 @@
from rpython.jit.metainterp.optimizeopt.util import equaloplists
from rpython.jit.codewriter.heaptracker import register_known_gctype
from rpython.jit.metainterp.history import JitCellToken, FLOAT
-from rpython.rtyper.lltypesystem import lltype
+from rpython.rtyper.lltypesystem import lltype, rclass, llmemory
+from rpython.jit.backend.x86.arch import WORD
class Evaluator(object):
def __init__(self, scope):
diff --git a/rpython/jit/backend/test/runner_test.py
b/rpython/jit/backend/test/runner_test.py
--- a/rpython/jit/backend/test/runner_test.py
+++ b/rpython/jit/backend/test/runner_test.py
@@ -12,10 +12,9 @@
from rpython.jit.metainterp.typesystem import deref
from rpython.jit.codewriter.effectinfo import EffectInfo
from rpython.jit.tool.oparser import parse
-from rpython.rpython.lltypesystem import lltype, llmemory, rstr, rffi, rclass
-from rpython.rpython.ootypesystem import ootype
-from rpython.rpython.annlowlevel import llhelper, cast_instance_to_gcref
-from rpython.rpython.llinterp import LLException
+from rpython.rtyper.lltypesystem import lltype, llmemory, rstr, rffi, rclass
+from rpython.rtyper.annlowlevel import llhelper
+from rpython.rtyper.llinterp import LLException
from rpython.jit.codewriter import heaptracker, longlong
from rpython.rlib import longlong2float
from rpython.rlib.rarithmetic import intmask, is_valid_int
diff --git a/rpython/rtyper/annlowlevel.py b/rpython/rtyper/annlowlevel.py
--- a/rpython/rtyper/annlowlevel.py
+++ b/rpython/rtyper/annlowlevel.py
@@ -3,15 +3,15 @@
"""
from rpython.tool.sourcetools import valid_identifier
-from rpython.annotation import model as annmodel
-from rpython.annotation.policy import AnnotatorPolicy, Sig
-from rpython.annotation.specialize import flatten_star_args
-from rpython.rpython.lltypesystem import lltype, llmemory
-from rpython.rpython.ootypesystem import ootype
-from rpython.rpython import extregistry
-from rpython.objspace.flow.model import Constant
+from rpython.annotator import model as annmodel
+from rpython.annotator.policy import AnnotatorPolicy, Sig
+from rpython.annotator.specialize import flatten_star_args
+from rpython.rtyper.lltypesystem import lltype, llmemory
+from rpython.rtyper.ootypesystem import ootype
+from rpython.rtyper import extregistry
+from rpython.flowspace.model import Constant
from rpython.translator.simplify import get_functype
-from rpython.rpython.rmodel import warning
+from rpython.rtyper.rmodel import warning
from rpython.rlib.objectmodel import specialize
class KeyComp(object):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
