[pypy-svn] r66073 - pypy/branch/pyjitpl5/pypy/rpython/lltypesystem
arigo at codespeak.net
arigo at codespeak.net
Tue Jun 30 16:39:56 CEST 2009
Author: arigo
Date: Tue Jun 30 16:39:55 2009
New Revision: 66073
Added:
pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py.merge.tmp
- copied, changed from r66039, pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/rpython/lltypesystem/lloperation.py
revisions 62865 to 66039:
------------------------------------------------------------------------
r64098 | arigo | 2009-04-15 16:15:16 +0200 (Wed, 15 Apr 2009) | 3 lines
(niko, arigo)
Add rstack.{set,get}_stack_depth_limit() functions.
------------------------------------------------------------------------
Copied: pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py (original)
+++ pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/lloperation.py.merge.tmp Tue Jun 30 16:39:55 2009
@@ -436,16 +436,21 @@
# __________ stackless operation(s) __________
- 'yield_current_frame_to_caller': LLOp(canraise=(StackException,)),
+ 'yield_current_frame_to_caller': LLOp(canraise=(StackException,
+ RuntimeError)),
# can always unwind, not just if stackless gc
'resume_point': LLOp(canraise=(Exception,)),
'resume_state_create': LLOp(canraise=(MemoryError,), canunwindgc=True),
- 'resume_state_invoke': LLOp(canraise=(Exception, StackException)),
- 'stack_frames_depth': LLOp(sideeffects=False, canraise=(StackException, )),
- 'stack_switch': LLOp(canraise=(StackException, )),
- 'stack_unwind': LLOp(canraise=(StackException, )),
- 'stack_capture': LLOp(canraise=(StackException, )),
+ 'resume_state_invoke': LLOp(canraise=(Exception, StackException,
+ RuntimeError)),
+ 'stack_frames_depth': LLOp(sideeffects=False, canraise=(StackException,
+ RuntimeError)),
+ 'stack_switch': LLOp(canraise=(StackException, RuntimeError)),
+ 'stack_unwind': LLOp(canraise=(StackException, RuntimeError)),
+ 'stack_capture': LLOp(canraise=(StackException, RuntimeError)),
+ 'get_stack_depth_limit':LLOp(sideeffects=False),
+ 'set_stack_depth_limit':LLOp(),
# __________ misc operations __________
More information about the Pypy-commit
mailing list