Alexander Hesse avatar Alexander Hesse committed 8c70875

Fixed more imports

Comments (0)

Files changed (17)

goal/targetpypystandalone.py

 
     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):

pypy/doc/cli-backend.rst

 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.
 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

pypy/doc/rffi.rst

 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=[])
 

rpython/jit/backend/arm/assembler.py

             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)

rpython/jit/backend/arm/opassembler.py

                 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)

rpython/jit/backend/arm/runner.py

         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())
 

rpython/jit/backend/llgraph/runner.py

 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
                 '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
     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)
 
         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:
 
 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]

rpython/jit/backend/x86/assembler.py

 
         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)
             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)

rpython/jit/backend/x86/runner.py

 
         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())
 

rpython/jit/codewriter/effectinfo.py

 =======
                                  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

rpython/jit/codewriter/test/test_call.py

 <<<<<<< 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)
     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)

rpython/jit/metainterp/compile.py

         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)
 

rpython/jit/metainterp/history.py

 
     @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)
 

rpython/jit/metainterp/test/test_ajit.py

         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)
         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)

rpython/jit/metainterp/test/test_fficall.py

 
 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)

rpython/jit/metainterp/test/test_warmspot.py

 
 
     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')
         

rpython/rlib/objectmodel.py

     """ 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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.