[pypy-commit] pypy ppc-jit-backend: Updated import paths and check for underlying architecture to

[hager]

Author: hager <sven.hager at uni-duesseldorf.de>
Branch: ppc-jit-backend
Changeset: r46630:86bb52045d66
Date: 2011-08-19 11:20 +0200
http://bitbucket.org/pypy/pypy/changeset/86bb52045d66/

Log:	Updated import paths and check for underlying architecture to make
	most of the old backend tests run.

	However, test_func_builder.py still does not run and has to be
	fixed.

diff --git a/pypy/jit/backend/ppc/ppcgen/func_builder.py b/pypy/jit/backend/ppc/ppcgen/func_builder.py
--- a/pypy/jit/backend/ppc/ppcgen/func_builder.py
+++ b/pypy/jit/backend/ppc/ppcgen/func_builder.py
@@ -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 --git a/pypy/jit/backend/ppc/ppcgen/rassemblermaker.py b/pypy/jit/backend/ppc/ppcgen/rassemblermaker.py
--- a/pypy/jit/backend/ppc/ppcgen/rassemblermaker.py
+++ b/pypy/jit/backend/ppc/ppcgen/rassemblermaker.py
@@ -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 --git a/pypy/jit/backend/ppc/ppcgen/test/test_field.py b/pypy/jit/backend/ppc/ppcgen/test/test_field.py
--- a/pypy/jit/backend/ppc/ppcgen/test/test_field.py
+++ b/pypy/jit/backend/ppc/ppcgen/test/test_field.py
@@ -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 --git a/pypy/jit/backend/ppc/ppcgen/test/test_form.py b/pypy/jit/backend/ppc/ppcgen/test/test_form.py
--- a/pypy/jit/backend/ppc/ppcgen/test/test_form.py
+++ b/pypy/jit/backend/ppc/ppcgen/test/test_form.py
@@ -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 --git a/pypy/jit/backend/ppc/ppcgen/test/test_func_builder.py b/pypy/jit/backend/ppc/ppcgen/test/test_func_builder.py
--- a/pypy/jit/backend/ppc/ppcgen/test/test_func_builder.py
+++ b/pypy/jit/backend/ppc/ppcgen/test/test_func_builder.py
@@ -1,16 +1,16 @@
 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 MyPPCAssembler
+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 *
+from pypy.jit.backend.detect_cpu import autodetect_main_model
 
 class TestFuncBuilderTest(object):
     def setup_class(cls):
-        if (not hasattr(os, 'uname') or
-            os.uname()[-1] != 'Power Macintosh'):
+        if autodetect_main_model() not in ["ppc", "ppc64"]: 
             py.test.skip("can't test all of ppcgen on non-PPC!")
 
     def test_simple(self):
@@ -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 --git a/pypy/jit/backend/ppc/ppcgen/test/test_rassemblermaker.py b/pypy/jit/backend/ppc/ppcgen/test/test_rassemblermaker.py
--- a/pypy/jit/backend/ppc/ppcgen/test/test_rassemblermaker.py
+++ b/pypy/jit/backend/ppc/ppcgen/test/test_rassemblermaker.py
@@ -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)