[pypy-svn] r68427 - pypy/trunk/pypy/jit/backend/llsupport/test
pedronis at codespeak.net
pedronis at codespeak.net
Wed Oct 14 12:03:46 CEST 2009
Author: pedronis
Date: Wed Oct 14 12:03:46 2009
New Revision: 68427
Modified:
pypy/trunk/pypy/jit/backend/llsupport/test/test_symbolic.py
Log:
(cfbolz, pedronis) test the translate_support_code cases too somehow
Modified: pypy/trunk/pypy/jit/backend/llsupport/test/test_symbolic.py
==============================================================================
--- pypy/trunk/pypy/jit/backend/llsupport/test/test_symbolic.py (original)
+++ pypy/trunk/pypy/jit/backend/llsupport/test/test_symbolic.py Wed Oct 14 12:03:46 2009
@@ -1,6 +1,7 @@
import py
from pypy.jit.backend.llsupport.symbolic import *
from pypy.rpython.lltypesystem import lltype, rffi
+from pypy.rpython.memory.lltypelayout import convert_offset_to_int
WORD = rffi.sizeof(lltype.Signed)
@@ -10,65 +11,88 @@
('y', lltype.Signed),
('z', lltype.Signed))
+def convert1(symb):
+ if isinstance(symb, int):
+ return symb
+ return convert_offset_to_int(symb)
+
+def convert(symbs):
+ if isinstance(symbs, tuple):
+ return map(convert1, symbs)
+ else:
+ return convert1(symbs)
+
def test_field_token():
- ofs_x, size_x = get_field_token(S, 'x', False)
- ofs_y, size_y = get_field_token(S, 'y', False)
- ofs_z, size_z = get_field_token(S, 'z', False)
- # ofs_x might be 0 or not, depending on how we count the headers
- assert size_x == size_y == size_z == WORD
- assert ofs_x >= 0
- assert ofs_y == ofs_x + WORD
- assert ofs_z == ofs_y + WORD
+ for translate_support_code in (True, False):
+ ofs_x, size_x = convert(get_field_token(S, 'x', translate_support_code))
+ ofs_y, size_y = convert(get_field_token(S, 'y', translate_support_code))
+ ofs_z, size_z = convert(get_field_token(S, 'z', translate_support_code))
+ # ofs_x might be 0 or not, depending on how we count the headers
+ assert size_x == size_y == size_z == WORD
+ assert ofs_x >= 0
+ assert ofs_y == ofs_x + WORD
+ assert ofs_z == ofs_y + WORD
def test_struct_size():
- ofs_z, size_z = get_field_token(S, 'z', False)
- totalsize = get_size(S, False)
- assert totalsize == ofs_z + WORD
+ for translate_support_code in (True, False):
+ ofs_z, size_z = convert(get_field_token(S, 'z', translate_support_code))
+ totalsize = convert(get_size(S, translate_support_code))
+ assert totalsize == ofs_z + WORD
def test_primitive_size():
- assert get_size(lltype.Signed, False) == WORD
- assert get_size(lltype.Char, False) == 1
- assert get_size(lltype.Ptr(S), False) == PTRWORD
+ for translate_support_code in (True, False):
+ assert convert(get_size(lltype.Signed, translate_support_code)) == WORD
+ assert convert(get_size(lltype.Char, translate_support_code)) == 1
+ sz = get_size(lltype.Ptr(S), translate_support_code)
+ assert convert(sz) == PTRWORD
def test_array_token():
- A = lltype.GcArray(lltype.Char)
- basesize, itemsize, ofs_length = get_array_token(A, False)
- assert basesize >= WORD # at least the 'length', maybe some gc headers
- assert itemsize == 1
- assert ofs_length == basesize - WORD
- A = lltype.GcArray(lltype.Signed)
- basesize, itemsize, ofs_length = get_array_token(A, False)
- assert basesize >= WORD # at least the 'length', maybe some gc headers
- assert itemsize == WORD
- assert ofs_length == basesize - WORD
+ for translate_support_code in (True, False):
+ A = lltype.GcArray(lltype.Char)
+ arraytok = get_array_token(A, translate_support_code)
+ basesize, itemsize, ofs_length = convert(arraytok)
+ assert basesize >= WORD # at least the 'length', maybe some gc headers
+ assert itemsize == 1
+ assert ofs_length == basesize - WORD
+ A = lltype.GcArray(lltype.Signed)
+ arraytok = get_array_token(A, translate_support_code)
+ basesize, itemsize, ofs_length = convert(arraytok)
+ assert basesize >= WORD # at least the 'length', maybe some gc headers
+ assert itemsize == WORD
+ assert ofs_length == basesize - WORD
-def test_varsized_struct_size():
+def test_varsized_struct_size():
S1 = lltype.GcStruct('S1', ('parent', S),
('extra', lltype.Signed),
('chars', lltype.Array(lltype.Char)))
- size_parent = get_size(S, False)
- ofs_extra, size_extra = get_field_token(S1, 'extra', False)
- basesize, itemsize, ofs_length = get_array_token(S1, False)
- assert size_parent == ofs_extra
- assert size_extra == WORD
- assert ofs_length == ofs_extra + WORD
- assert basesize == ofs_length + WORD
- assert itemsize == 1
+ for translate_support_code in (True, False):
+ size_parent = convert(get_size(S, translate_support_code))
+ fldtok = get_field_token(S1, 'extra', translate_support_code)
+ ofs_extra, size_extra = convert(fldtok)
+ arraytok = get_array_token(S1, translate_support_code)
+ basesize, itemsize, ofs_length = convert(arraytok)
+ assert size_parent == ofs_extra
+ assert size_extra == WORD
+ assert ofs_length == ofs_extra + WORD
+ assert basesize == ofs_length + WORD
+ assert itemsize == 1
def test_string():
STR = lltype.GcStruct('String', ('hash', lltype.Signed),
('chars', lltype.Array(lltype.Char)))
- basesize, itemsize, ofs_length = get_array_token(STR, False)
- assert itemsize == 1
- s1 = lltype.malloc(STR, 4)
- s1.chars[0] = 's'
- s1.chars[1] = 'p'
- s1.chars[2] = 'a'
- s1.chars[3] = 'm'
- x = ll2ctypes.lltype2ctypes(s1)
- rawbytes = ctypes.cast(x, ctypes.POINTER(ctypes.c_char))
- assert rawbytes[basesize+0] == 's'
- assert rawbytes[basesize+1] == 'p'
- assert rawbytes[basesize+2] == 'a'
- assert rawbytes[basesize+3] == 'm'
+ for translate_support_code in (True, False):
+ rstrtok = get_array_token(STR, translate_support_code)
+ basesize, itemsize, ofs_length = convert(rstrtok)
+ assert itemsize == 1
+ s1 = lltype.malloc(STR, 4)
+ s1.chars[0] = 's'
+ s1.chars[1] = 'p'
+ s1.chars[2] = 'a'
+ s1.chars[3] = 'm'
+ x = ll2ctypes.lltype2ctypes(s1)
+ rawbytes = ctypes.cast(x, ctypes.POINTER(ctypes.c_char))
+ assert rawbytes[basesize+0] == 's'
+ assert rawbytes[basesize+1] == 'p'
+ assert rawbytes[basesize+2] == 'a'
+ assert rawbytes[basesize+3] == 'm'
More information about the Pypy-commit
mailing list