[pypy-svn] r70545 - in pypy/branch/c-traceback/pypy: rpython/lltypesystem translator translator/c/test translator/cli translator/jvm

[arigo at codespeak.net]

Author: arigo
Date: Tue Jan 12 19:10:16 2010
New Revision: 70545

Modified:
   pypy/branch/c-traceback/pypy/rpython/lltypesystem/lloperation.py
   pypy/branch/c-traceback/pypy/translator/c/test/test_standalone.py
   pypy/branch/c-traceback/pypy/translator/cli/opcodes.py
   pypy/branch/c-traceback/pypy/translator/exceptiontransform.py
   pypy/branch/c-traceback/pypy/translator/jvm/opcodes.py
Log:
Tweaks.


Modified: pypy/branch/c-traceback/pypy/rpython/lltypesystem/lloperation.py
==============================================================================
--- pypy/branch/c-traceback/pypy/rpython/lltypesystem/lloperation.py	(original)
+++ pypy/branch/c-traceback/pypy/rpython/lltypesystem/lloperation.py	Tue Jan 12 19:10:16 2010
@@ -537,6 +537,7 @@
     'debug_llinterpcall':   LLOp(), # Python func call 'res=arg[0](*arg[1:])'
                                     # in backends, abort() or whatever is fine
     'debug_start_traceback':LLOp(),
+    'debug_record_traceback':LLOp(),
     'debug_catch_exception':LLOp(),
 
     # __________ instrumentation _________

Modified: pypy/branch/c-traceback/pypy/translator/c/test/test_standalone.py
==============================================================================
--- pypy/branch/c-traceback/pypy/translator/c/test/test_standalone.py	(original)
+++ pypy/branch/c-traceback/pypy/translator/c/test/test_standalone.py	Tue Jan 12 19:10:16 2010
@@ -435,6 +435,7 @@
         # captures the AssertionError, which makes the program abort.
 
     def test_ll_assert_error(self):
+        py.test.skip("implement later, maybe: tracebacks even with ll_assert")
         def g(x):
             ll_assert(x != 1, "foobar")
         def f(argv):

Modified: pypy/branch/c-traceback/pypy/translator/cli/opcodes.py
==============================================================================
--- pypy/branch/c-traceback/pypy/translator/cli/opcodes.py	(original)
+++ pypy/branch/c-traceback/pypy/translator/cli/opcodes.py	Tue Jan 12 19:10:16 2010
@@ -77,6 +77,9 @@
     'gc_set_max_heap_size':     Ignore,
     'resume_point':             Ignore,
     'debug_assert':             Ignore,
+    'debug_start_traceback':    Ignore,
+    'debug_record_traceback':   Ignore,
+    'debug_catch_exception':    Ignore,
     'debug_print':              [DebugPrint],
     'debug_start':              [PushAllArgs, 'call void [pypylib]pypy.runtime.DebugPrint::DEBUG_START(string)'],
     'debug_stop':               [PushAllArgs, 'call void [pypylib]pypy.runtime.DebugPrint::DEBUG_STOP(string)'],

Modified: pypy/branch/c-traceback/pypy/translator/exceptiontransform.py
==============================================================================
--- pypy/branch/c-traceback/pypy/translator/exceptiontransform.py	(original)
+++ pypy/branch/c-traceback/pypy/translator/exceptiontransform.py	Tue Jan 12 19:10:16 2010
@@ -153,7 +153,7 @@
         self.lltype_to_classdef = translator.rtyper.lltype_to_classdef_mapping()
 
     def noinline(self, fn):
-        fn = func_with_new_name(fn, fn.__name__ + '_noinline')
+        fn = func_with_new_name(fn, fn.__name__)
         fn._dont_inline_ = True
         return fn
 

Modified: pypy/branch/c-traceback/pypy/translator/jvm/opcodes.py
==============================================================================
--- pypy/branch/c-traceback/pypy/translator/jvm/opcodes.py	(original)
+++ pypy/branch/c-traceback/pypy/translator/jvm/opcodes.py	Tue Jan 12 19:10:16 2010
@@ -101,6 +101,9 @@
     'jit_force_virtual':        DoNothing,
 
     'debug_assert':              [], # TODO: implement?
+    'debug_start_traceback':    Ignore,
+    'debug_record_traceback':   Ignore,
+    'debug_catch_exception':    Ignore,
 
     # __________ numeric operations __________