Author: Maciej Fijalkowski <[email protected]>
Branch: optresult
Changeset: r77882:d2d6134391d3
Date: 2015-06-05 09:54 +0200
http://bitbucket.org/pypy/pypy/changeset/d2d6134391d3/
Log: fix all the llsupport tests
diff --git a/rpython/jit/backend/llsupport/assembler.py
b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -2,7 +2,7 @@
from rpython.jit.backend.llsupport.memcpy import memcpy_fn, memset_fn
from rpython.jit.backend.llsupport.symbolic import WORD
from rpython.jit.metainterp.history import (INT, REF, FLOAT, JitCellToken,
- ConstInt, BoxInt, AbstractFailDescr)
+ ConstInt, AbstractFailDescr)
from rpython.jit.metainterp.resoperation import ResOperation, rop
from rpython.rlib import rgc
from rpython.rlib.debug import (debug_start, debug_stop, have_debug_prints,
diff --git a/rpython/jit/backend/llsupport/gc.py
b/rpython/jit/backend/llsupport/gc.py
--- a/rpython/jit/backend/llsupport/gc.py
+++ b/rpython/jit/backend/llsupport/gc.py
@@ -9,7 +9,7 @@
from rpython.rtyper.annlowlevel import llhelper, cast_instance_to_gcref
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.jit.codewriter import heaptracker
-from rpython.jit.metainterp.history import ConstPtr, AbstractDescr, BoxPtr,
ConstInt
+from rpython.jit.metainterp.history import ConstPtr, AbstractDescr, ConstInt
from rpython.jit.metainterp.resoperation import rop, ResOperation
from rpython.jit.backend.llsupport import symbolic, jitframe
from rpython.jit.backend.llsupport.symbolic import WORD
@@ -157,7 +157,7 @@
# assert to make sure we got what we expected
assert isinstance(v, ConstPtr)
array_index = moving_obj_tracker.get_array_index(v)
- load_op = ResOperation(rop.GETARRAYITEM_GC,
+ load_op = ResOperation(rop.GETARRAYITEM_GC_R,
[moving_obj_tracker.const_ptr_gcref_array,
ConstInt(array_index)],
descr=moving_obj_tracker.ptr_array_descr)
diff --git a/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
b/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
--- a/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
+++ b/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
@@ -137,15 +137,15 @@
def test_simple_getfield_twice(self):
self.check_rewrite("""
[]
- i0 = getfield_gc(ConstPtr(pinned_obj_gcref),
descr=pinned_obj_my_int_descr)
- i1 = getfield_gc(ConstPtr(notpinned_obj_gcref),
descr=notpinned_obj_my_int_descr)
- i2 = getfield_gc(ConstPtr(pinned_obj_gcref),
descr=pinned_obj_my_int_descr)
+ i0 = getfield_gc_i(ConstPtr(pinned_obj_gcref),
descr=pinned_obj_my_int_descr)
+ i1 = getfield_gc_i(ConstPtr(notpinned_obj_gcref),
descr=notpinned_obj_my_int_descr)
+ i2 = getfield_gc_i(ConstPtr(pinned_obj_gcref),
descr=pinned_obj_my_int_descr)
""", """
[]
- p1 = getarrayitem_gc(ConstPtr(ptr_array_gcref), 0,
descr=ptr_array_descr)
- i0 = getfield_gc(p1, descr=pinned_obj_my_int_descr)
- i1 = getfield_gc(ConstPtr(notpinned_obj_gcref),
descr=notpinned_obj_my_int_descr)
- p2 = getarrayitem_gc(ConstPtr(ptr_array_gcref), 1,
descr=ptr_array_descr)
- i2 = getfield_gc(p2, descr=pinned_obj_my_int_descr)
+ p1 = getarrayitem_gc_r(ConstPtr(ptr_array_gcref), 0,
descr=ptr_array_descr)
+ i0 = getfield_gc_i(p1, descr=pinned_obj_my_int_descr)
+ i1 = getfield_gc_i(ConstPtr(notpinned_obj_gcref),
descr=notpinned_obj_my_int_descr)
+ p2 = getarrayitem_gc_r(ConstPtr(ptr_array_gcref), 1,
descr=ptr_array_descr)
+ i2 = getfield_gc_i(p2, descr=pinned_obj_my_int_descr)
""")
assert len(self.gc_ll_descr.last_moving_obj_tracker._indexes) == 2
diff --git a/rpython/jit/backend/llsupport/test/test_regalloc_integration.py
b/rpython/jit/backend/llsupport/test/test_regalloc_integration.py
--- a/rpython/jit/backend/llsupport/test/test_regalloc_integration.py
+++ b/rpython/jit/backend/llsupport/test/test_regalloc_integration.py
@@ -3,14 +3,13 @@
"""
import py
-from rpython.jit.metainterp.history import BoxInt, ConstInt,\
- BoxPtr, ConstPtr, BasicFailDescr, JitCellToken, TargetToken
-from rpython.jit.metainterp.resoperation import rop, ResOperation
-from rpython.jit.backend.llsupport.descr import GcCache
+from rpython.jit.metainterp.history import BasicFailDescr, JitCellToken,\
+ TargetToken
+from rpython.jit.metainterp.resoperation import rop
from rpython.jit.backend.detect_cpu import getcpuclass
from rpython.jit.backend.llsupport.regalloc import is_comparison_or_ovf_op
from rpython.jit.tool.oparser import parse
-from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
+from rpython.rtyper.lltypesystem import lltype, llmemory
from rpython.rtyper.annlowlevel import llhelper
from rpython.rtyper.lltypesystem import rstr
from rpython.rtyper import rclass
diff --git a/rpython/jit/backend/llsupport/test/test_rewrite.py
b/rpython/jit/backend/llsupport/test/test_rewrite.py
--- a/rpython/jit/backend/llsupport/test/test_rewrite.py
+++ b/rpython/jit/backend/llsupport/test/test_rewrite.py
@@ -30,13 +30,13 @@
def check_rewrite(self, frm_operations, to_operations, **namespace):
S = lltype.GcStruct('S', ('x', lltype.Signed),
('y', lltype.Signed))
- sdescr = get_size_descr(self.cpu, self.gc_ll_descr, S, False)
+ sdescr = get_size_descr(self.gc_ll_descr, S, False)
sdescr.tid = 1234
#
T = lltype.GcStruct('T', ('y', lltype.Signed),
('z', lltype.Ptr(S)),
('t', lltype.Signed))
- tdescr = get_size_descr(self.cpu, self.gc_ll_descr, T, False)
+ tdescr = get_size_descr(self.gc_ll_descr, T, False)
tdescr.tid = 5678
tzdescr = get_field_descr(self.gc_ll_descr, T, 'z')
#
@@ -56,7 +56,7 @@
clendescr = cdescr.lendescr
#
E = lltype.GcStruct('Empty')
- edescr = get_size_descr(self.cpu, self.gc_ll_descr, E, False)
+ edescr = get_size_descr(self.gc_ll_descr, E, False)
edescr.tid = 9000
#
vtable_descr = self.gc_ll_descr.fielddescr_vtable
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -6,7 +6,7 @@
DEBUG_COUNTER, debug_bridge)
from rpython.jit.backend.llsupport.asmmemmgr import MachineDataBlockWrapper
from rpython.jit.backend.llsupport.gcmap import allocate_gcmap
-from rpython.jit.metainterp.history import Const, Box, VOID
+from rpython.jit.metainterp.history import Const, VOID
from rpython.jit.metainterp.history import AbstractFailDescr, INT, REF, FLOAT
from rpython.rtyper.lltypesystem import lltype, rffi, rstr, llmemory
from rpython.rtyper.lltypesystem.lloperation import llop
@@ -829,13 +829,8 @@
def dump(self, text):
if not self.verbose:
return
- _prev = Box._extended_display
- try:
- Box._extended_display = False
- pos = self.mc.get_relative_pos()
- print >> sys.stderr, ' 0x%x %s' % (pos, text)
- finally:
- Box._extended_display = _prev
+ pos = self.mc.get_relative_pos()
+ print >> sys.stderr, ' 0x%x %s' % (pos, text)
# ------------------------------------------------------------
diff --git a/rpython/jit/metainterp/virtualizable.py
b/rpython/jit/metainterp/virtualizable.py
--- a/rpython/jit/metainterp/virtualizable.py
+++ b/rpython/jit/metainterp/virtualizable.py
@@ -15,7 +15,6 @@
self.warmrunnerdesc = warmrunnerdesc
cpu = warmrunnerdesc.cpu
self.cpu = cpu
- self.BoxArray = cpu.ts.BoxRef
#
VTYPEPTR1 = VTYPEPTR
while 'virtualizable_accessor' not in deref(VTYPEPTR)._hints:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
