[pypy-commit] pypy win64-stage1: hacked a bit on ll2ctypes/do_allocation_in_far_regions

ctismer noreply at buildbot.pypy.org
Sat Nov 26 19:24:30 CET 2011


Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r49828:57e0cb25305f
Date: 2011-11-26 19:23 +0100
http://bitbucket.org/pypy/pypy/changeset/57e0cb25305f/

Log:	hacked a bit on ll2ctypes/do_allocation_in_far_regions stopped this,
	fijal claims it makes no longer sense

diff --git a/pypy/jit/backend/x86/test/conftest.py b/pypy/jit/backend/x86/test/conftest.py
--- a/pypy/jit/backend/x86/test/conftest.py
+++ b/pypy/jit/backend/x86/test/conftest.py
@@ -1,4 +1,4 @@
-import py
+import py, os
 from pypy.jit.backend import detect_cpu
 
 cpu = detect_cpu.autodetect()
@@ -6,5 +6,7 @@
     if cpu not in ('x86', 'x86_64'):
         py.test.skip("x86/x86_64 tests skipped: cpu is %r" % (cpu,))
     if cpu == 'x86_64':
+        if os.name == "nt":
+            py.test.skip("Windows cannot allocate non-reserved memory")
         from pypy.rpython.lltypesystem import ll2ctypes
         ll2ctypes.do_allocation_in_far_regions()
diff --git a/pypy/rlib/rmmap.py b/pypy/rlib/rmmap.py
--- a/pypy/rlib/rmmap.py
+++ b/pypy/rlib/rmmap.py
@@ -706,7 +706,9 @@
     free = c_munmap_safe
     
 elif _MS_WINDOWS:
-    def mmap(fileno, length, tagname="", access=_ACCESS_DEFAULT, offset=0):
+    def mmap(fileno, length, flags=0, tagname="", access=_ACCESS_DEFAULT, offset=0):
+        # XXX flags is unused by now.
+        
         # check size boundaries
         _check_map_size(length)
         map_size = length


More information about the pypy-commit mailing list