[pypy-svn] r17800 - in pypy/dist/pypy/translator/llvm: . module

[ericvrp at codespeak.net]

Author: ericvrp
Date: Fri Sep 23 23:32:52 2005
New Revision: 17800

Modified:
   pypy/dist/pypy/translator/llvm/exception.py
   pypy/dist/pypy/translator/llvm/module/support.py
Log:
current best settings


Modified: pypy/dist/pypy/translator/llvm/exception.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/exception.py	(original)
+++ pypy/dist/pypy/translator/llvm/exception.py	Fri Sep 23 23:32:52 2005
@@ -28,7 +28,7 @@
         return noresult
 
     def new(exceptionpolicy=None):  #factory
-        exceptionpolicy = exceptionpolicy or 'fast'
+        exceptionpolicy = exceptionpolicy or 'cpython'
         if exceptionpolicy == 'cpython':
             from pypy.translator.llvm.exception import CPythonExceptionPolicy
             exceptionpolicy = CPythonExceptionPolicy()

Modified: pypy/dist/pypy/translator/llvm/module/support.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/module/support.py	(original)
+++ pypy/dist/pypy/translator/llvm/module/support.py	Fri Sep 23 23:32:52 2005
@@ -97,7 +97,8 @@
     %%exception_type  = load %%RPYTHON_EXCEPTION_VTABLE** %%tmp
     store %%RPYTHON_EXCEPTION_VTABLE* %%exception_type, %%RPYTHON_EXCEPTION_VTABLE** %%last_exception_type
     store %%RPYTHON_EXCEPTION* %%exception_value, %%RPYTHON_EXCEPTION** %%last_exception_value
-    ret void    ; XXX unwind ; (1)
+    unwind ; XXX (1) if exceptionpolicy == 'boehm'
+    ret void
 }
 """ % locals())
 
@@ -109,7 +110,8 @@
     br bool %%cond, label %%is_0, label %%is_not_0
 is_0:
     call fastcc void %%prepare_ZeroDivisionError()
-    ret %s 0 ; XXX unwind ; (2)
+    unwind ; XXX (2) if exceptionpolicy == 'boehm'
+    ret %s 0
 
 is_not_0:
 """
@@ -132,7 +134,8 @@
 ;    br bool %cond3, label %return_block, label %ovf3
 ;ovf3:
     call fastcc void %prepare_OverflowError()
-    ret int 0   ; XXX unwind ; (3)
+    unwind ; XXX (3) if exceptionpolicy == 'boehm'
+    ret int 0
 """