[pypy-svn] r39759 - in pypy/dist/pypy: jit/codegen/ppc jit/codegen/ppc/ppcgen jit/codegen/ppc/ppcgen/test translator/asm
mwh at codespeak.net
mwh at codespeak.net
Sat Mar 3 09:49:02 CET 2007
Author: mwh
Date: Sat Mar 3 09:48:59 2007
New Revision: 39759
Added:
pypy/dist/pypy/jit/codegen/ppc/ppcgen/
- copied from r39758, pypy/dist/pypy/translator/asm/ppcgen/
Removed:
pypy/dist/pypy/translator/asm/
Modified:
pypy/dist/pypy/jit/codegen/ppc/ppcgen/assembler.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/func_builder.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/ppc_assembler.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/ppc_field.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/ppc_form.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/rassemblermaker.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_field.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_form.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_func_builder.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_ppc.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_rassemblermaker.py
pypy/dist/pypy/jit/codegen/ppc/ppcgen/util.py
pypy/dist/pypy/jit/codegen/ppc/rgenop.py
Log:
finally, move the ppc generation code into the jit/codegen/ppc directory and
kill translator/asm.
paris really was a long time ago.
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/assembler.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/assembler.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/assembler.py Sat Mar 3 09:48:59 2007
@@ -1,5 +1,5 @@
import os
-from pypy.translator.asm.ppcgen import form
+from pypy.jit.codegen.ppc.ppcgen import form
# don't be fooled by the fact that there's some separation between a
# generic assembler class and a PPC assembler class... there's
@@ -47,7 +47,7 @@
def assemble(self, dump=os.environ.has_key('PPY_DEBUG')):
insns = self.assemble0(dump)
- from pypy.translator.asm.ppcgen import asmfunc
+ from pypy.jit.codegen.ppc.ppcgen import asmfunc
c = asmfunc.AsmCode(len(insns)*4)
for i in insns:
c.emit(i)
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/func_builder.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/func_builder.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/func_builder.py Sat Mar 3 09:48:59 2007
@@ -1,6 +1,6 @@
-from pypy.translator.asm.ppcgen.ppc_assembler import MyPPCAssembler
-from pypy.translator.asm.ppcgen.symbol_lookup import lookup
-from pypy.translator.asm.ppcgen.regname import *
+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 *
def load_arg(code, argi, typecode):
rD = r3+argi
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/ppc_assembler.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/ppc_assembler.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/ppc_assembler.py Sat Mar 3 09:48:59 2007
@@ -1,7 +1,7 @@
-from pypy.translator.asm.ppcgen.ppc_form import PPCForm as Form
-from pypy.translator.asm.ppcgen.ppc_field import ppc_fields
-from pypy.translator.asm.ppcgen.assembler import Assembler
-from pypy.translator.asm.ppcgen.symbol_lookup import lookup
+from pypy.jit.codegen.ppc.ppcgen.ppc_form import PPCForm as Form
+from pypy.jit.codegen.ppc.ppcgen.ppc_field import ppc_fields
+from pypy.jit.codegen.ppc.ppcgen.assembler import Assembler
+from pypy.jit.codegen.ppc.ppcgen.symbol_lookup import lookup
A = Form("frD", "frA", "frB", "XO3", "Rc")
A1 = Form("frD", "frB", "XO3", "Rc")
@@ -808,7 +808,7 @@
r.reverse()
return ''.join(map(str, r))
-from pypy.translator.asm.ppcgen.regname import *
+from pypy.jit.codegen.ppc.ppcgen.regname import *
def main():
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/ppc_field.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/ppc_field.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/ppc_field.py Sat Mar 3 09:48:59 2007
@@ -1,5 +1,5 @@
-from pypy.translator.asm.ppcgen.field import Field
-from pypy.translator.asm.ppcgen import regname
+from pypy.jit.codegen.ppc.ppcgen.field import Field
+from pypy.jit.codegen.ppc.ppcgen import regname
fields = { # bit margins are *inclusive*! (and bit 0 is
# most-significant, 31 least significant)
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/ppc_form.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/ppc_form.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/ppc_form.py Sat Mar 3 09:48:59 2007
@@ -1,5 +1,5 @@
-from pypy.translator.asm.ppcgen.form import Form
-from pypy.translator.asm.ppcgen.ppc_field import ppc_fields
+from pypy.jit.codegen.ppc.ppcgen.form import Form
+from pypy.jit.codegen.ppc.ppcgen.ppc_field import ppc_fields
class PPCForm(Form):
fieldmap = ppc_fields
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/rassemblermaker.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/rassemblermaker.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/rassemblermaker.py Sat Mar 3 09:48:59 2007
@@ -1,6 +1,6 @@
from pypy.tool.sourcetools import compile2
from pypy.rlib.rarithmetic import r_uint
-from pypy.translator.asm.ppcgen.form import IDesc, IDupDesc
+from pypy.jit.codegen.ppc.ppcgen.form import IDesc, IDupDesc
## "opcode": ( 0, 5),
## "rA": (11, 15, 'unsigned', regname._R),
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_field.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/test/test_field.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_field.py Sat Mar 3 09:48:59 2007
@@ -1,6 +1,6 @@
import autopath
-from pypy.translator.asm.ppcgen.field import Field
+from pypy.jit.codegen.ppc.ppcgen.field import Field
from py.test import raises
import random
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_form.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/test/test_form.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_form.py Sat Mar 3 09:48:59 2007
@@ -1,11 +1,11 @@
import autopath
-from pypy.translator.asm.ppcgen.ppc_assembler import b
+from pypy.jit.codegen.ppc.ppcgen.ppc_assembler import b
import random
import sys
-from pypy.translator.asm.ppcgen.form import Form, FormException
-from pypy.translator.asm.ppcgen.field import Field
-from pypy.translator.asm.ppcgen.assembler import Assembler
+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
# 0 31
# +-------------------------------+
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_func_builder.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/test/test_func_builder.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_func_builder.py Sat Mar 3 09:48:59 2007
@@ -1,11 +1,11 @@
import py
import random, sys, os
-from pypy.translator.asm.ppcgen.ppc_assembler import MyPPCAssembler
-from pypy.translator.asm.ppcgen.symbol_lookup import lookup
-from pypy.translator.asm.ppcgen.func_builder import make_func
-from pypy.translator.asm.ppcgen import form, func_builder
-from pypy.translator.asm.ppcgen.regname import *
+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 *
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.translator.asm.ppcgen import util
+ from pypy.jit.codegen.ppc.ppcgen import util
# eurgh!:
b.load_word(r0, util.access_at(id(f.code), 8) + f.FAST_ENTRY_LABEL)
b.mtctr(r0)
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_ppc.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/test/test_ppc.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_ppc.py Sat Mar 3 09:48:59 2007
@@ -1,10 +1,10 @@
import py
import random, sys, os
-from pypy.translator.asm.ppcgen.ppc_assembler import BasicPPCAssembler, MyPPCAssembler
-from pypy.translator.asm.ppcgen.symbol_lookup import lookup
-from pypy.translator.asm.ppcgen.regname import *
-from pypy.translator.asm.ppcgen import form, pystructs
+from pypy.jit.codegen.ppc.ppcgen.ppc_assembler import BasicPPCAssembler, MyPPCAssembler
+from pypy.jit.codegen.ppc.ppcgen.symbol_lookup import lookup
+from pypy.jit.codegen.ppc.ppcgen.regname import *
+from pypy.jit.codegen.ppc.ppcgen import form, pystructs
class TestDisassemble(object):
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_rassemblermaker.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/test/test_rassemblermaker.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/test/test_rassemblermaker.py Sat Mar 3 09:48:59 2007
@@ -1,5 +1,5 @@
-from pypy.translator.asm.ppcgen.rassemblermaker import make_rassembler
-from pypy.translator.asm.ppcgen.ppc_assembler import PPCAssembler
+from pypy.jit.codegen.ppc.ppcgen.rassemblermaker import make_rassembler
+from pypy.jit.codegen.ppc.ppcgen.ppc_assembler import PPCAssembler
RPPCAssembler = make_rassembler(PPCAssembler)
Modified: pypy/dist/pypy/jit/codegen/ppc/ppcgen/util.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/util.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/ppcgen/util.py Sat Mar 3 09:48:59 2007
@@ -1,5 +1,5 @@
-from pypy.translator.asm.ppcgen.ppc_assembler import MyPPCAssembler
-from pypy.translator.asm.ppcgen.func_builder import make_func
+from pypy.jit.codegen.ppc.ppcgen.ppc_assembler import MyPPCAssembler
+from pypy.jit.codegen.ppc.ppcgen.func_builder import make_func
from regname import *
Modified: pypy/dist/pypy/jit/codegen/ppc/rgenop.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/ppc/rgenop.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/rgenop.py Sat Mar 3 09:48:59 2007
@@ -14,8 +14,8 @@
from pypy.jit.codegen.ppc.regalloc import RegisterAllocation
from pypy.jit.codegen.ppc.emit_moves import emit_moves, emit_moves_safe
-from pypy.translator.asm.ppcgen.rassemblermaker import make_rassembler
-from pypy.translator.asm.ppcgen.ppc_assembler import MyPPCAssembler
+from pypy.jit.codegen.ppc.ppcgen.rassemblermaker import make_rassembler
+from pypy.jit.codegen.ppc.ppcgen.ppc_assembler import MyPPCAssembler
from pypy.jit.codegen.i386.rgenop import gc_malloc_fnaddr
@@ -1246,7 +1246,7 @@
return self.MachineCodeBlock(65536) # XXX supposed infinite for now
def close_mc(self, mc):
-## from pypy.translator.asm.ppcgen.asmfunc import get_ppcgen
+## from pypy.jit.codegen.ppc.ppcgen.asmfunc import get_ppcgen
## print '!!!!', cast(mc._data, c_void_p).value
## print '!!!!', mc._data.contents[0]
## get_ppcgen().flush2(cast(mc._data, c_void_p).value,
More information about the Pypy-commit
mailing list