diff -r a5b94c79e115 pypy/jit/backend/ppc/ppcgen/func_builder.py --- a/pypy/jit/backend/ppc/ppcgen/func_builder.py Mon Aug 15 17:00:00 2011 +0200 +++ b/pypy/jit/backend/ppc/ppcgen/func_builder.py Thu Aug 18 11:19:27 2011 -0400 @@ -1,6 +1,6 @@ -from pypy.jit.codegen.ppc.ppcgen.ppc_assembler import MyPPCAssembler -from pypy.jit.codegen.ppc.ppcgen.symbol_lookup import lookup -from pypy.jit.codegen.ppc.ppcgen.regname import * +from pypy.jit.backend.ppc.ppcgen.ppc_assembler import PPCAssembler +from pypy.jit.backend.ppc.ppcgen.symbol_lookup import lookup +from pypy.jit.backend.ppc.ppcgen.regname import * def load_arg(code, argi, typecode): rD = r3+argi diff -r a5b94c79e115 pypy/jit/backend/ppc/ppcgen/rassemblermaker.py --- a/pypy/jit/backend/ppc/ppcgen/rassemblermaker.py Mon Aug 15 17:00:00 2011 +0200 +++ b/pypy/jit/backend/ppc/ppcgen/rassemblermaker.py Thu Aug 18 11:19:27 2011 -0400 @@ -1,6 +1,6 @@ from pypy.tool.sourcetools import compile2 from pypy.rlib.rarithmetic import r_uint -from pypy.jit.codegen.ppc.ppcgen.form import IDesc, IDupDesc +from pypy.jit.backend.ppc.ppcgen.form import IDesc, IDupDesc ## "opcode": ( 0, 5), ## "rA": (11, 15, 'unsigned', regname._R), diff -r a5b94c79e115 pypy/jit/backend/ppc/ppcgen/test/test_field.py --- a/pypy/jit/backend/ppc/ppcgen/test/test_field.py Mon Aug 15 17:00:00 2011 +0200 +++ b/pypy/jit/backend/ppc/ppcgen/test/test_field.py Thu Aug 18 11:19:27 2011 -0400 @@ -1,6 +1,6 @@ import autopath -from pypy.jit.codegen.ppc.ppcgen.field import Field +from pypy.jit.backend.ppc.ppcgen.field import Field from py.test import raises import random diff -r a5b94c79e115 pypy/jit/backend/ppc/ppcgen/test/test_form.py --- a/pypy/jit/backend/ppc/ppcgen/test/test_form.py Mon Aug 15 17:00:00 2011 +0200 +++ b/pypy/jit/backend/ppc/ppcgen/test/test_form.py Thu Aug 18 11:19:27 2011 -0400 @@ -1,11 +1,11 @@ import autopath -from pypy.jit.codegen.ppc.ppcgen.ppc_assembler import b +from pypy.jit.backend.ppc.ppcgen.ppc_assembler import b import random import sys -from pypy.jit.codegen.ppc.ppcgen.form import Form, FormException -from pypy.jit.codegen.ppc.ppcgen.field import Field -from pypy.jit.codegen.ppc.ppcgen.assembler import Assembler +from pypy.jit.backend.ppc.ppcgen.form import Form, FormException +from pypy.jit.backend.ppc.ppcgen.field import Field +from pypy.jit.backend.ppc.ppcgen.assembler import Assembler # 0 31 # +-------------------------------+ diff -r a5b94c79e115 pypy/jit/backend/ppc/ppcgen/test/test_func_builder.py --- a/pypy/jit/backend/ppc/ppcgen/test/test_func_builder.py Mon Aug 15 17:00:00 2011 +0200 +++ b/pypy/jit/backend/ppc/ppcgen/test/test_func_builder.py Thu Aug 18 11:19:27 2011 -0400 @@ -1,11 +1,11 @@ import py import random, sys, os -from pypy.jit.codegen.ppc.ppcgen.ppc_assembler import MyPPCAssembler -from pypy.jit.codegen.ppc.ppcgen.symbol_lookup import lookup -from pypy.jit.codegen.ppc.ppcgen.func_builder import make_func -from pypy.jit.codegen.ppc.ppcgen import form, func_builder -from pypy.jit.codegen.ppc.ppcgen.regname import * +from pypy.jit.backend.ppc.ppcgen.ppc_assembler import PPCAssembler +from pypy.jit.backend.ppc.ppcgen.symbol_lookup import lookup +from pypy.jit.backend.ppc.ppcgen.func_builder import make_func +from pypy.jit.backend.ppc.ppcgen import form, func_builder +from pypy.jit.backend.ppc.ppcgen.regname import * class TestFuncBuilderTest(object): def setup_class(cls): @@ -78,7 +78,7 @@ f = make_func(a, "O", "O") assert f(1) == 1 b = MyPPCAssembler() - from pypy.jit.codegen.ppc.ppcgen import util + from pypy.jit.backend.ppc.ppcgen import util # eurgh!: b.load_word(r0, util.access_at(id(f.code), 8) + f.FAST_ENTRY_LABEL) b.mtctr(r0) diff -r a5b94c79e115 pypy/jit/backend/ppc/ppcgen/test/test_rassemblermaker.py --- a/pypy/jit/backend/ppc/ppcgen/test/test_rassemblermaker.py Mon Aug 15 17:00:00 2011 +0200 +++ b/pypy/jit/backend/ppc/ppcgen/test/test_rassemblermaker.py Thu Aug 18 11:19:27 2011 -0400 @@ -1,5 +1,5 @@ -from pypy.jit.codegen.ppc.ppcgen.rassemblermaker import make_rassembler -from pypy.jit.codegen.ppc.ppcgen.ppc_assembler import PPCAssembler +from pypy.jit.backend.ppc.ppcgen.rassemblermaker import make_rassembler +from pypy.jit.backend.ppc.ppcgen.ppc_assembler import PPCAssembler RPPCAssembler = make_rassembler(PPCAssembler)