[pypy-svn] r56858 - in pypy/branch/oo-jit/pypy/jit/codegen: . x86_64 x86_64/test

[witulski at codespeak.net]

Author: witulski
Date: Wed Jul 30 14:17:54 2008
New Revision: 56858

Added:
   pypy/branch/oo-jit/pypy/jit/codegen/x86_64/
   pypy/branch/oo-jit/pypy/jit/codegen/x86_64/__init__.py
   pypy/branch/oo-jit/pypy/jit/codegen/x86_64/test/
   pypy/branch/oo-jit/pypy/jit/codegen/x86_64/test/__init__.py
Modified:
   pypy/branch/oo-jit/pypy/jit/codegen/detect_cpu.py
Log:
(cfbolz,witulski)
added new empty x86_64 folder.
fixed autodetect


Modified: pypy/branch/oo-jit/pypy/jit/codegen/detect_cpu.py
==============================================================================
--- pypy/branch/oo-jit/pypy/jit/codegen/detect_cpu.py	(original)
+++ pypy/branch/oo-jit/pypy/jit/codegen/detect_cpu.py	Wed Jul 30 14:17:54 2008
@@ -22,8 +22,11 @@
         mach = os.popen('uname -m', 'r').read().strip()
         if not mach:
             raise ProcessorAutodetectError, "cannot run 'uname -m'"
-    if mach == 'x86_64' and sys.maxint == 2147483647:
-        mach = 'x86'     # it's a 64-bit processor but in 32-bits mode, maybe
+    if mach == 'x86_64':
+        if sys.maxint == 2147483647:
+            mach = 'x86'     # it's a 64-bit processor but in 32-bits mode, maybe
+        else:
+            assert sys.maxint == 2 ** 63 - 1
     try:
         return {'i386': 'i386',
                 'i486': 'i386',
@@ -31,7 +34,8 @@
                 'i686': 'i386',
                 'i86pc': 'i386',    # Solaris/Intel
                 'x86':   'i386',    # Apple
-                'Power Macintosh': 'ppc', 
+                'Power Macintosh': 'ppc',
+                'x86_64': 'x86_64', 
                 }[mach]
     except KeyError:
         raise ProcessorAutodetectError, "unsupported processor '%s'" % mach

Added: pypy/branch/oo-jit/pypy/jit/codegen/x86_64/__init__.py
==============================================================================

Added: pypy/branch/oo-jit/pypy/jit/codegen/x86_64/test/__init__.py
==============================================================================