[pypy-svn] r77411 - in pypy/branch/minimark-jit/pypy/rpython/memory/gc: . test

[arigo at codespeak.net]

Author: arigo
Date: Mon Sep 27 15:16:35 2010
New Revision: 77411

Modified:
   pypy/branch/minimark-jit/pypy/rpython/memory/gc/minimarkpage.py
   pypy/branch/minimark-jit/pypy/rpython/memory/gc/test/test_minimarkpage.py
Log:
Don't use 4 as a shift in these tests; use WORD.
At least things are still word-aligned.


Modified: pypy/branch/minimark-jit/pypy/rpython/memory/gc/minimarkpage.py
==============================================================================
--- pypy/branch/minimark-jit/pypy/rpython/memory/gc/minimarkpage.py	(original)
+++ pypy/branch/minimark-jit/pypy/rpython/memory/gc/minimarkpage.py	Mon Sep 27 15:16:35 2010
@@ -336,7 +336,7 @@
 
 def _start_of_page_untranslated(addr, page_size):
     assert isinstance(addr, llarena.fakearenaaddress)
-    shift = 4     # for testing, we assume that the whole arena is not
+    shift = WORD  # for testing, we assume that the whole arena is not
                   # on a page boundary
     ofs = ((addr.offset - shift) // page_size) * page_size + shift
     return llarena.fakearenaaddress(addr.arena, ofs)

Modified: pypy/branch/minimark-jit/pypy/rpython/memory/gc/test/test_minimarkpage.py
==============================================================================
--- pypy/branch/minimark-jit/pypy/rpython/memory/gc/test/test_minimarkpage.py	(original)
+++ pypy/branch/minimark-jit/pypy/rpython/memory/gc/test/test_minimarkpage.py	Mon Sep 27 15:16:35 2010
@@ -7,22 +7,22 @@
 from pypy.rpython.lltypesystem.llmemory import cast_ptr_to_adr
 
 NULL = llmemory.NULL
-SHIFT = 4
+SHIFT = WORD
 hdrsize = llmemory.raw_malloc_usage(llmemory.sizeof(PAGE_HEADER))
 
 
 def test_allocate_arena():
-    ac = ArenaCollection(SHIFT + 8*20, 8, 1)
+    ac = ArenaCollection(SHIFT + 16*20, 16, 1)
     ac.allocate_new_arena()
     assert ac.num_uninitialized_pages == 20
-    ac.uninitialized_pages + 8*20   # does not raise
-    py.test.raises(llarena.ArenaError, "ac.uninitialized_pages + 8*20 + 1")
+    ac.uninitialized_pages + 16*20   # does not raise
+    py.test.raises(llarena.ArenaError, "ac.uninitialized_pages + 16*20 + 1")
     #
-    ac = ArenaCollection(SHIFT + 8*20 + 7, 8, 1)
+    ac = ArenaCollection(SHIFT + 16*20 + 7, 16, 1)
     ac.allocate_new_arena()
     assert ac.num_uninitialized_pages == 20
-    ac.uninitialized_pages + 8*20 + 7   # does not raise
-    py.test.raises(llarena.ArenaError, "ac.uninitialized_pages + 8*20 + 8")
+    ac.uninitialized_pages + 16*20 + 7   # does not raise
+    py.test.raises(llarena.ArenaError, "ac.uninitialized_pages + 16*20 + 16")
 
 
 def test_allocate_new_page():