Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r60016:8c70875be135
Date: 2013-01-13 08:34 +0100
http://bitbucket.org/pypy/pypy/changeset/8c70875be135/
Log: Fixed more imports
diff --git a/goal/targetpypystandalone.py b/goal/targetpypystandalone.py
--- a/goal/targetpypystandalone.py
+++ b/goal/targetpypystandalone.py
@@ -31,7 +31,7 @@
if withjit:
from pypy.module.pypyjit.interp_jit import callback_hook
- from pypy.rlib import objectmodel
+ from rpython.rlib import objectmodel
objectmodel.register_around_callback_hook(callback_hook)
def entry_point(argv):
diff --git a/pypy/doc/cli-backend.rst b/pypy/doc/cli-backend.rst
--- a/pypy/doc/cli-backend.rst
+++ b/pypy/doc/cli-backend.rst
@@ -395,7 +395,7 @@
confidence not to break anything.
The core of the testing framework is in the module
-pypy.translator.cli.test.runtest; one of the most important function
+rpython.translator.cli.test.runtest; one of the most important function
of this module is compile_function(): it takes a Python function,
compiles it to CLI and returns a Python object that runs the just
created executable when called.
@@ -407,7 +407,7 @@
on the standard output::
# Python source: foo.py
- from pypy.translator.cli.test.runtest import compile_function
+ from rpython.translator.cli.test.runtest import compile_function
def foo(x, y):
return x+y, x*y
diff --git a/pypy/doc/rffi.rst b/pypy/doc/rffi.rst
--- a/pypy/doc/rffi.rst
+++ b/pypy/doc/rffi.rst
@@ -32,7 +32,7 @@
parameter::
from pypy.rpython.lltypesystem import rffi
- from pypy.translator.tool.cbuild import ExternalCompilationInfo
+ from rpython.translator.tool.cbuild import ExternalCompilationInfo
info = ExternalCompilationInfo(includes=[], libraries=[])
diff --git a/rpython/jit/backend/arm/assembler.py
b/rpython/jit/backend/arm/assembler.py
--- a/rpython/jit/backend/arm/assembler.py
+++ b/rpython/jit/backend/arm/assembler.py
@@ -574,7 +574,7 @@
mc.BL(rffi.cast(lltype.Signed, failure_recovery))
if exc:
# save ebx into 'jf_guard_exc'
- from pypy.jit.backend.llsupport.descr import unpack_fielddescr
+ from rpython.jit.backend.llsupport.descr import
unpack_fielddescr
descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
offset, size, _ = unpack_fielddescr(descrs.jf_guard_exc)
mc.STR_rr(r.r4.value, r.r0.value, offset, cond=c.AL)
diff --git a/rpython/jit/backend/arm/opassembler.py
b/rpython/jit/backend/arm/opassembler.py
--- a/rpython/jit/backend/arm/opassembler.py
+++ b/rpython/jit/backend/arm/opassembler.py
@@ -1118,8 +1118,8 @@
value = self.cpu.done_with_this_frame_float_v
else:
raise AssertionError(kind)
- from pypy.jit.backend.llsupport.descr import unpack_fielddescr
- from pypy.jit.backend.llsupport.descr import unpack_interiorfielddescr
+ from rpython.jit.backend.llsupport.descr import unpack_fielddescr
+ from rpython.jit.backend.llsupport.descr import
unpack_interiorfielddescr
descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
_offset, _size, _ = unpack_fielddescr(descrs.jf_descr)
fail_descr = self.cpu.get_fail_descr_from_number(value)
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
@@ -23,7 +23,7 @@
AbstractLLCPU.__init__(self, rtyper, stats, opts,
translate_support_code, gcdescr)
- from pypy.jit.backend.llsupport import jitframe
+ from rpython.jit.backend.llsupport import jitframe
self.deadframe_size_max = llmemory.sizeof(jitframe.DEADFRAME,
self.get_failargs_limit())
diff --git a/rpython/jit/backend/llgraph/runner.py
b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -11,8 +11,8 @@
from rpython.rtyper.llinterp import LLInterpreter, LLException
from rpython.rtyper.lltypesystem import lltype, llmemory, rffi, rclass, rstr
-from pypy.rlib.rarithmetic import ovfcheck, r_uint, r_ulonglong
-from pypy.rlib.rtimer import read_timestamp
+from rpython.rlib.rarithmetic import ovfcheck, r_uint, r_ulonglong
+from rpython.rlib.rtimer import read_timestamp
class LLTrace(object):
has_been_freed = False
@@ -159,7 +159,7 @@
'f': 0.0}
class LLGraphCPU(model.AbstractCPU):
- from pypy.jit.metainterp.typesystem import llhelper as ts
+ from rpython.jit.metainterp.typesystem import llhelper as ts
supports_floats = True
supports_longlong = r_uint is not r_ulonglong
supports_singlefloats = True
@@ -338,7 +338,7 @@
def _calldescr_dynamic_for_tests(self, atypes, rtype,
abiname='FFI_DEFAULT_ABI'):
# XXX WTF is that and why it breaks all abstractions?
- from pypy.jit.backend.llsupport import ffisupport
+ from rpython.jit.backend.llsupport import ffisupport
return ffisupport.calldescr_dynamic_for_tests(self, atypes, rtype,
abiname)
@@ -892,7 +892,7 @@
return x
def execute_debug_merge_point(self, descr, *args):
- from pypy.jit.metainterp.warmspot import get_stats
+ from rpython.jit.metainterp.warmspot import get_stats
try:
stats = get_stats()
except AttributeError:
@@ -925,7 +925,7 @@
def _setup():
def _make_impl_from_blackhole_interp(opname):
- from pypy.jit.metainterp.blackhole import BlackholeInterpreter
+ from rpython.jit.metainterp.blackhole import BlackholeInterpreter
name = 'bhimpl_' + opname.lower()
try:
func = BlackholeInterpreter.__dict__[name]
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -2152,7 +2152,7 @@
if exc:
# save ebx into 'jf_guard_exc'
- from pypy.jit.backend.llsupport.descr import unpack_fielddescr
+ from rpython.jit.backend.llsupport.descr import unpack_fielddescr
descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
offset, size, _ = unpack_fielddescr(descrs.jf_guard_exc)
mc.MOV_mr((eax.value, offset), ebx.value)
@@ -2400,8 +2400,8 @@
else:
raise AssertionError(kind)
- from pypy.jit.backend.llsupport.descr import unpack_fielddescr
- from pypy.jit.backend.llsupport.descr import unpack_interiorfielddescr
+ from rpython.jit.backend.llsupport.descr import unpack_fielddescr
+ from rpython.jit.backend.llsupport.descr import
unpack_interiorfielddescr
descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
_offset, _size, _ = unpack_fielddescr(descrs.jf_descr)
fail_descr = self.cpu.get_fail_descr_from_number(value)
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
@@ -45,7 +45,7 @@
self.profile_agent = profile_agent
- from pypy.jit.backend.llsupport import jitframe
+ from rpython.jit.backend.llsupport import jitframe
self.deadframe_size_max = llmemory.sizeof(jitframe.DEADFRAME,
self.get_failargs_limit())
diff --git a/rpython/jit/codewriter/effectinfo.py
b/rpython/jit/codewriter/effectinfo.py
--- a/rpython/jit/codewriter/effectinfo.py
+++ b/rpython/jit/codewriter/effectinfo.py
@@ -169,7 +169,7 @@
=======
can_invalidate=False,
call_release_gil_target=llmemory.NULL):
- from pypy.translator.backendopt.writeanalyze import top_set
+ from rpython.translator.backendopt.writeanalyze import top_set
>>>>>>> other
if effects is top_set or extraeffect == EffectInfo.EF_RANDOM_EFFECTS:
readonly_descrs_fields = None
diff --git a/rpython/jit/codewriter/test/test_call.py
b/rpython/jit/codewriter/test/test_call.py
--- a/rpython/jit/codewriter/test/test_call.py
+++ b/rpython/jit/codewriter/test/test_call.py
@@ -176,7 +176,7 @@
<<<<<<< local
from rpython.jit.backend.llgraph.runner import LLtypeCPU
=======
- from pypy.jit.backend.llgraph.runner import LLGraphCPU
+ from rpython.jit.backend.llgraph.runner import LLGraphCPU
>>>>>>> other
T = rffi.CArrayPtr(rffi.TIME_T)
@@ -199,7 +199,7 @@
assert call_descr.extrainfo.is_call_release_gil() is False
def test_call_release_gil():
- from pypy.jit.backend.llgraph.runner import LLGraphCPU
+ from rpython.jit.backend.llgraph.runner import LLGraphCPU
T = rffi.CArrayPtr(rffi.TIME_T)
external = rffi.llexternal("time", [T], rffi.TIME_T, threadsafe=True)
diff --git a/rpython/jit/metainterp/compile.py
b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -658,7 +658,7 @@
return cpu.ts.cast_to_ref(ptr)
@staticmethod
def show(cpu, gcref):
- from pypy.rpython.annlowlevel import cast_base_ptr_to_instance
+ from rpython.rtyper.annlowlevel import cast_base_ptr_to_instance
ptr = cpu.ts.cast_to_baseclass(gcref)
return cast_base_ptr_to_instance(AllVirtuals, ptr)
diff --git a/rpython/jit/metainterp/history.py
b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -159,7 +159,7 @@
@staticmethod
def show(cpu, descr_gcref):
- from pypy.rpython.annlowlevel import cast_base_ptr_to_instance
+ from rpython.rtyper.annlowlevel import cast_base_ptr_to_instance
descr_ptr = cpu.ts.cast_to_baseclass(descr_gcref)
return cast_base_ptr_to_instance(AbstractDescr, descr_ptr)
diff --git a/rpython/jit/metainterp/test/test_ajit.py
b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -3973,7 +3973,7 @@
assert self.interp_operations(f, [3]) == 6
def test_gc_add_memory_pressure(self):
- from pypy.rlib import rgc
+ from rpython.rlib import rgc
def f():
rgc.add_memory_pressure(1234)
@@ -3982,7 +3982,7 @@
self.interp_operations(f, [])
def test_external_call(self):
- from pypy.rlib.objectmodel import invoke_around_extcall
+ from rpython.rlib.objectmodel import invoke_around_extcall
T = rffi.CArrayPtr(rffi.TIME_T)
external = rffi.llexternal("time", [T], rffi.TIME_T)
diff --git a/rpython/jit/metainterp/test/test_fficall.py
b/rpython/jit/metainterp/test/test_fficall.py
--- a/rpython/jit/metainterp/test/test_fficall.py
+++ b/rpython/jit/metainterp/test/test_fficall.py
@@ -105,8 +105,8 @@
class TestFfiCall(FfiCallTests, LLJitMixin):
def test_jit_fii_vref(self):
- from pypy.rlib import clibffi
- from pypy.rlib.jit_libffi import jit_ffi_prep_cif, jit_ffi_call
+ from rpython.rlib import clibffi
+ from rpython.rlib.jit_libffi import jit_ffi_prep_cif, jit_ffi_call
math_sin = intmask(ctypes.cast(ctypes.CDLL(None).sin,
ctypes.c_void_p).value)
diff --git a/rpython/jit/metainterp/test/test_warmspot.py
b/rpython/jit/metainterp/test/test_warmspot.py
--- a/rpython/jit/metainterp/test/test_warmspot.py
+++ b/rpython/jit/metainterp/test/test_warmspot.py
@@ -537,9 +537,9 @@
def test_callback_jit_merge_point(self):
- from pypy.rlib.objectmodel import register_around_callback_hook
- from pypy.rpython.lltypesystem import lltype, rffi
- from pypy.translator.tool.cbuild import ExternalCompilationInfo
+ from rpython.rlib.objectmodel import register_around_callback_hook
+ from rpython.rtyper.lltypesystem import lltype, rffi
+ from rpython.translator.tool.cbuild import ExternalCompilationInfo
callback_jit_driver = JitDriver(greens = ['name'], reds = 'auto')
diff --git a/rpython/rlib/objectmodel.py b/rpython/rlib/objectmodel.py
--- a/rpython/rlib/objectmodel.py
+++ b/rpython/rlib/objectmodel.py
@@ -599,8 +599,8 @@
""" Register a hook that's called before a callback from C calls RPython.
Primary usage is for JIT to have 'started from' hook.
"""
- from pypy.rpython.lltypesystem import rffi
- from pypy.rpython.annlowlevel import llhelper
+ from rpython.rtyper.lltypesystem import rffi
+ from rpython.rtyper.annlowlevel import llhelper
rffi.aroundstate.callback_hook = hook
llhelper(rffi.CallbackHookPtr, hook)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
