[pypy-commit] pypy ppc-jit-backend: changes due to merge
hager
noreply at buildbot.pypy.org
Tue Jan 3 15:03:57 CET 2012
Author: hager <sven.hager at uni-duesseldorf.de>
Branch: ppc-jit-backend
Changeset: r50998:d3d90edc432a
Date: 2012-01-03 15:03 +0100
http://bitbucket.org/pypy/pypy/changeset/d3d90edc432a/
Log: changes due to merge
diff --git a/pypy/jit/backend/ppc/ppcgen/codebuilder.py b/pypy/jit/backend/ppc/ppcgen/codebuilder.py
--- a/pypy/jit/backend/ppc/ppcgen/codebuilder.py
+++ b/pypy/jit/backend/ppc/ppcgen/codebuilder.py
@@ -11,8 +11,8 @@
from pypy.jit.backend.ppc.ppcgen.helper.assembler import gen_emit_cmp_op
import pypy.jit.backend.ppc.ppcgen.register as r
import pypy.jit.backend.ppc.ppcgen.condition as c
-from pypy.jit.metainterp.history import (Const, ConstPtr, LoopToken,
- AbstractFailDescr)
+from pypy.jit.metainterp.history import (Const, ConstPtr, JitCellToken,
+ TargetToken, AbstractFailDescr)
from pypy.jit.backend.llsupport.asmmemmgr import (BlockBuilderMixin, AsmMemoryManager, MachineDataBlockWrapper)
from pypy.jit.backend.llsupport.regalloc import (RegisterManager,
compute_vars_longevity)
diff --git a/pypy/jit/backend/ppc/ppcgen/opassembler.py b/pypy/jit/backend/ppc/ppcgen/opassembler.py
--- a/pypy/jit/backend/ppc/ppcgen/opassembler.py
+++ b/pypy/jit/backend/ppc/ppcgen/opassembler.py
@@ -6,8 +6,8 @@
GPR_SAVE_AREA, BACKCHAIN_SIZE,
MAX_REG_PARAMS)
-from pypy.jit.metainterp.history import (LoopToken, AbstractFailDescr, FLOAT,
- INT)
+from pypy.jit.metainterp.history import (JitCellToken, TargetToken,
+ AbstractFailDescr, FLOAT, INT)
from pypy.rlib.objectmodel import we_are_translated
from pypy.jit.backend.ppc.ppcgen.helper.assembler import (count_reg_args,
Saved_Volatiles)
diff --git a/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py b/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
--- a/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
+++ b/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
@@ -21,8 +21,8 @@
Saved_Volatiles)
import pypy.jit.backend.ppc.ppcgen.register as r
import pypy.jit.backend.ppc.ppcgen.condition as c
-from pypy.jit.metainterp.history import (Const, ConstPtr, LoopToken,
- AbstractFailDescr)
+from pypy.jit.metainterp.history import (Const, ConstPtr, JitCellToken,
+ TargetToken, AbstractFailDescr)
from pypy.jit.backend.llsupport.asmmemmgr import (BlockBuilderMixin,
AsmMemoryManager,
MachineDataBlockWrapper)
@@ -93,10 +93,6 @@
self.fail_boxes_int = values_array(lltype.Signed, failargs_limit)
self.fail_boxes_ptr = values_array(llmemory.GCREF, failargs_limit)
self.mc = None
- self.malloc_func_addr = 0
- self.malloc_array_func_addr = 0
- self.malloc_str_func_addr = 0
- self.malloc_unicode_func_addr = 0
self.datablockwrapper = None
self.memcpy_addr = 0
self.fail_boxes_count = 0
@@ -466,21 +462,7 @@
def setup_once(self):
gc_ll_descr = self.cpu.gc_ll_descr
gc_ll_descr.initialize()
- ll_new = gc_ll_descr.get_funcptr_for_new()
- self.malloc_func_addr = rffi.cast(lltype.Signed, ll_new)
self._build_propagate_exception_path()
- if gc_ll_descr.get_funcptr_for_newarray is not None:
- ll_new_array = gc_ll_descr.get_funcptr_for_newarray()
- self.malloc_array_func_addr = rffi.cast(lltype.Signed,
- ll_new_array)
- if gc_ll_descr.get_funcptr_for_newstr is not None:
- ll_new_str = gc_ll_descr.get_funcptr_for_newstr()
- self.malloc_str_func_addr = rffi.cast(lltype.Signed,
- ll_new_str)
- if gc_ll_descr.get_funcptr_for_newunicode is not None:
- ll_new_unicode = gc_ll_descr.get_funcptr_for_newunicode()
- self.malloc_unicode_func_addr = rffi.cast(lltype.Signed,
- ll_new_unicode)
self.memcpy_addr = self.cpu.cast_ptr_to_int(memcpy_fn)
self.setup_failure_recovery()
self.exit_code_adr = self._gen_exit_path()
diff --git a/pypy/jit/backend/ppc/ppcgen/regalloc.py b/pypy/jit/backend/ppc/ppcgen/regalloc.py
--- a/pypy/jit/backend/ppc/ppcgen/regalloc.py
+++ b/pypy/jit/backend/ppc/ppcgen/regalloc.py
@@ -1,6 +1,5 @@
from pypy.jit.backend.llsupport.regalloc import (RegisterManager, FrameManager,
- TempBox, compute_vars_longevity,
- compute_loop_consts)
+ TempBox, compute_vars_longevity)
from pypy.jit.backend.ppc.ppcgen.arch import (WORD, MY_COPY_OF_REGS)
from pypy.jit.backend.ppc.ppcgen.jump import remap_frame_layout_mixed
from pypy.jit.backend.ppc.ppcgen.locations import imm
@@ -11,9 +10,8 @@
prepare_binary_int_op_with_imm,
prepare_unary_cmp)
from pypy.jit.metainterp.history import (INT, REF, FLOAT, Const, ConstInt,
- ConstPtr, LoopToken, Box)
-from pypy.jit.backend.llsupport.descr import BaseFieldDescr, BaseArrayDescr, \
- BaseCallDescr, BaseSizeDescr
+ ConstPtr, Box)
+from pypy.jit.metainterp.history import JitCellToken, TargetToken
from pypy.jit.metainterp.resoperation import rop
from pypy.jit.backend.ppc.ppcgen import locations
from pypy.rpython.lltypesystem import rffi, lltype, rstr
diff --git a/pypy/jit/backend/test/runner_test.py b/pypy/jit/backend/test/runner_test.py
--- a/pypy/jit/backend/test/runner_test.py
+++ b/pypy/jit/backend/test/runner_test.py
@@ -150,8 +150,6 @@
i0 = BoxInt()
i1 = BoxInt()
i2 = BoxInt()
- looptoken = LoopToken()
- operations = [
looptoken = JitCellToken()
targettoken = TargetToken()
operations = [
More information about the pypy-commit
mailing list