[pypy-svn] r33979 - in pypy/dist/pypy: annotation interpreter module/_stackless rlib rpython rpython/memory/gctransform rpython/module translator translator/c/test translator/llvm/test translator/oosupport/test_template translator/stackless/test
cfbolz at codespeak.net
cfbolz at codespeak.net
Tue Oct 31 18:58:57 CET 2006
Author: cfbolz
Date: Tue Oct 31 18:58:31 2006
New Revision: 33979
Added:
pypy/dist/pypy/rlib/rstack.py
- copied unchanged from r33974, pypy/dist/pypy/rpython/rstack.py
Removed:
pypy/dist/pypy/rpython/rstack.py
Modified:
pypy/dist/pypy/annotation/builtin.py
pypy/dist/pypy/interpreter/eval.py
pypy/dist/pypy/interpreter/pyframe.py
pypy/dist/pypy/interpreter/pyopcode.py
pypy/dist/pypy/module/_stackless/clonable.py
pypy/dist/pypy/module/_stackless/coroutine.py
pypy/dist/pypy/module/_stackless/interp_coroutine.py
pypy/dist/pypy/rpython/extfunctable.py
pypy/dist/pypy/rpython/memory/gctransform/stacklessframework.py
pypy/dist/pypy/rpython/module/ll_stack.py
pypy/dist/pypy/rpython/module/ll_stackless.py
pypy/dist/pypy/rpython/rbuiltin.py
pypy/dist/pypy/translator/c/test/test_stackless.py
pypy/dist/pypy/translator/c/test/test_tasklets.py
pypy/dist/pypy/translator/llvm/test/test_stackless.py
pypy/dist/pypy/translator/oosupport/test_template/operations.py
pypy/dist/pypy/translator/stackless/test/test_clone.py
pypy/dist/pypy/translator/stackless/test/test_coroutine_reconstruction.py
pypy/dist/pypy/translator/stackless/test/test_depth.py
pypy/dist/pypy/translator/stackless/test/test_resume_point.py
pypy/dist/pypy/translator/stackless/test/test_transform.py
pypy/dist/pypy/translator/stackless/test/test_yield_current_frame_to_caller.py
pypy/dist/pypy/translator/transform.py
Log:
moving rstack
Modified: pypy/dist/pypy/annotation/builtin.py
==============================================================================
--- pypy/dist/pypy/annotation/builtin.py (original)
+++ pypy/dist/pypy/annotation/builtin.py Tue Oct 31 18:58:31 2006
@@ -17,7 +17,7 @@
from pypy.objspace.flow.model import Constant
import pypy.rlib.rarithmetic
import pypy.rpython.objectmodel
-import pypy.rpython.rstack
+import pypy.rlib.rstack
# convenience only!
def immutablevalue(x):
@@ -322,7 +322,7 @@
return SomeAddress()
def rstack_yield_current_frame_to_caller():
- return SomeExternalObject(pypy.rpython.rstack.frame_stack_top)
+ return SomeExternalObject(pypy.rlib.rstack.frame_stack_top)
##def rarith_ovfcheck(s_obj):
@@ -369,7 +369,7 @@
BUILTIN_ANALYZERS[pypy.rpython.lltypesystem.llmemory.cast_int_to_adr] = llmemory_cast_int_to_adr
BUILTIN_ANALYZERS[pypy.rpython.lltypesystem.llmemory.cast_ptr_to_weakadr] = llmemory_cast_ptr_to_weakadr
BUILTIN_ANALYZERS[pypy.rpython.lltypesystem.llmemory.cast_weakadr_to_ptr] = llmemory_cast_weakadr_to_ptr
-BUILTIN_ANALYZERS[pypy.rpython.rstack.yield_current_frame_to_caller] = (
+BUILTIN_ANALYZERS[pypy.rlib.rstack.yield_current_frame_to_caller] = (
rstack_yield_current_frame_to_caller)
BUILTIN_ANALYZERS[getattr(OSError.__init__, 'im_func', OSError.__init__)] = (
Modified: pypy/dist/pypy/interpreter/eval.py
==============================================================================
--- pypy/dist/pypy/interpreter/eval.py (original)
+++ pypy/dist/pypy/interpreter/eval.py Tue Oct 31 18:58:31 2006
@@ -4,7 +4,7 @@
"""
from pypy.interpreter.error import OperationError
from pypy.interpreter.baseobjspace import Wrappable
-from pypy.rpython import rstack # for resume points
+from pypy.rlib import rstack # for resume points
class Code(Wrappable):
Modified: pypy/dist/pypy/interpreter/pyframe.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyframe.py (original)
+++ pypy/dist/pypy/interpreter/pyframe.py Tue Oct 31 18:58:31 2006
@@ -8,7 +8,7 @@
from pypy.rlib.rarithmetic import r_uint, intmask
import opcode
from pypy.rpython.objectmodel import we_are_translated, instantiate
-from pypy.rpython import rstack # for resume points
+from pypy.rlib import rstack # for resume points
# Define some opcodes used
Modified: pypy/dist/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyopcode.py (original)
+++ pypy/dist/pypy/interpreter/pyopcode.py Tue Oct 31 18:58:31 2006
@@ -16,7 +16,7 @@
from pypy.rpython.objectmodel import we_are_translated
from pypy.rlib.rarithmetic import intmask
from pypy.tool import stdlib_opcode as pythonopcode
-from pypy.rpython import rstack # for resume points
+from pypy.rlib import rstack # for resume points
def unaryoperation(operationname):
"""NOT_RPYTHON"""
Modified: pypy/dist/pypy/module/_stackless/clonable.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/clonable.py (original)
+++ pypy/dist/pypy/module/_stackless/clonable.py Tue Oct 31 18:58:31 2006
@@ -10,7 +10,7 @@
from pypy.interpreter.gateway import interp2app, ObjSpace, W_Root
from pypy.interpreter.error import OperationError
-from pypy.rpython import rstack # for resume points
+from pypy.rlib import rstack # for resume points
from pypy.tool import stdlib_opcode as pythonopcode
class ClonableCoroutine(InterpClonableCoroutine):
@@ -132,7 +132,7 @@
def reconstruct_framechain(self):
from pypy.interpreter.pyframe import PyFrame
- from pypy.rpython.rstack import resume_state_create
+ from pypy.rlib.rstack import resume_state_create
if self.framestack.empty():
self.frame = None
return
Modified: pypy/dist/pypy/module/_stackless/coroutine.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/coroutine.py (original)
+++ pypy/dist/pypy/module/_stackless/coroutine.py Tue Oct 31 18:58:31 2006
@@ -26,7 +26,7 @@
from pypy.module._stackless.stackless_flags import StacklessFlags
from pypy.module._stackless.interp_coroutine import Coroutine, BaseCoState, AbstractThunk
-from pypy.rpython import rstack # for resume points
+from pypy.rlib import rstack # for resume points
from pypy.tool import stdlib_opcode as pythonopcode
class _AppThunk(AbstractThunk):
@@ -169,7 +169,7 @@
def reconstruct_framechain(self):
from pypy.interpreter.pyframe import PyFrame
- from pypy.rpython.rstack import resume_state_create
+ from pypy.rlib.rstack import resume_state_create
if self.framestack.empty():
self.frame = None
return
Modified: pypy/dist/pypy/module/_stackless/interp_coroutine.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/interp_coroutine.py (original)
+++ pypy/dist/pypy/module/_stackless/interp_coroutine.py Tue Oct 31 18:58:31 2006
@@ -30,7 +30,7 @@
"""
from pypy.interpreter.baseobjspace import Wrappable
-from pypy.rpython.rstack import yield_current_frame_to_caller, resume_point
+from pypy.rlib.rstack import yield_current_frame_to_caller, resume_point
from pypy.rpython.objectmodel import we_are_translated
try:
Modified: pypy/dist/pypy/rpython/extfunctable.py
==============================================================================
--- pypy/dist/pypy/rpython/extfunctable.py (original)
+++ pypy/dist/pypy/rpython/extfunctable.py Tue Oct 31 18:58:31 2006
@@ -289,7 +289,7 @@
# ___________________________________________________________
# stackless
-from pypy.rpython import rstack
+from pypy.rlib import rstack
declare(rstack.stack_frames_depth, int, 'll_stackless/stack_frames_depth')
declare(rstack.stack_too_big, bool, 'll_stack/too_big')
declare(rstack.stack_check, noneannotation, 'll_stack/check')
Modified: pypy/dist/pypy/rpython/memory/gctransform/stacklessframework.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform/stacklessframework.py (original)
+++ pypy/dist/pypy/rpython/memory/gctransform/stacklessframework.py Tue Oct 31 18:58:31 2006
@@ -50,7 +50,7 @@
## self.inline_helpers(graph)
def build_stack_root_iterator(self):
- from pypy.rpython.rstack import stack_capture
+ from pypy.rlib.rstack import stack_capture
sizeofaddr = llmemory.sizeof(llmemory.Address)
gcdata = self.gcdata
Modified: pypy/dist/pypy/rpython/module/ll_stack.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_stack.py (original)
+++ pypy/dist/pypy/rpython/module/ll_stack.py Tue Oct 31 18:58:31 2006
@@ -1,4 +1,4 @@
-from pypy.rpython import rstack
+from pypy.rlib import rstack
def ll_stack_too_big():
return rstack.stack_too_big()
Modified: pypy/dist/pypy/rpython/module/ll_stackless.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_stackless.py (original)
+++ pypy/dist/pypy/rpython/module/ll_stackless.py Tue Oct 31 18:58:31 2006
@@ -1,5 +1,6 @@
from pypy.rpython.lltypesystem import lltype
-from pypy.rpython import rstack, extfunctable
+from pypy.rlib import rstack
+from pypy.rpython import extfunctable
from pypy.rpython.module.support import from_opaque_object, to_opaque_object
FRAMETOPTYPE = extfunctable.frametop_type_info.get_lltype()
Modified: pypy/dist/pypy/rpython/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/rbuiltin.py (original)
+++ pypy/dist/pypy/rpython/rbuiltin.py Tue Oct 31 18:58:31 2006
@@ -2,8 +2,8 @@
from pypy.annotation import model as annmodel
from pypy.objspace.flow.model import Constant
from pypy.rpython.lltypesystem import lltype, rclass, llmemory
-from pypy.rpython import objectmodel, rstack, rint, raddress
-from pypy.rlib import rarithmetic
+from pypy.rpython import objectmodel, rint, raddress
+from pypy.rlib import rarithmetic, rstack
from pypy.rpython.error import TyperError
from pypy.rpython.rmodel import Repr, IntegerRepr, inputconst
from pypy.rpython.rrange import rtype_builtin_range, rtype_builtin_xrange
Modified: pypy/dist/pypy/translator/c/test/test_stackless.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_stackless.py (original)
+++ pypy/dist/pypy/translator/c/test/test_stackless.py Tue Oct 31 18:58:31 2006
@@ -3,8 +3,8 @@
from pypy.translator.c.genc import CStandaloneBuilder
from pypy.translator.c import gc
from pypy.annotation.listdef import s_list_of_strings
-from pypy.rpython.rstack import stack_unwind, stack_frames_depth, stack_too_big
-from pypy.rpython.rstack import yield_current_frame_to_caller
+from pypy.rlib.rstack import stack_unwind, stack_frames_depth, stack_too_big
+from pypy.rlib.rstack import yield_current_frame_to_caller
from pypy.config.config import Config
from pypy.config.pypyoption import pypy_optiondescription
import os
Modified: pypy/dist/pypy/translator/c/test/test_tasklets.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_tasklets.py (original)
+++ pypy/dist/pypy/translator/c/test/test_tasklets.py Tue Oct 31 18:58:31 2006
@@ -2,7 +2,7 @@
import os
from pypy.rpython.memory.lladdress import NULL
-from pypy.rpython.rstack import yield_current_frame_to_caller
+from pypy.rlib.rstack import yield_current_frame_to_caller
# ____________________________________________________________
# For testing
Modified: pypy/dist/pypy/translator/llvm/test/test_stackless.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_stackless.py (original)
+++ pypy/dist/pypy/translator/llvm/test/test_stackless.py Tue Oct 31 18:58:31 2006
@@ -1,8 +1,8 @@
import os
from pypy.annotation.listdef import s_list_of_strings
-from pypy.rpython.rstack import stack_unwind, stack_frames_depth, stack_too_big
-from pypy.rpython.rstack import yield_current_frame_to_caller
+from pypy.rlib.rstack import stack_unwind, stack_frames_depth, stack_too_big
+from pypy.rlib.rstack import yield_current_frame_to_caller
from pypy.translator.llvm.genllvm import genllvm_compile
import py
Modified: pypy/dist/pypy/translator/oosupport/test_template/operations.py
==============================================================================
--- pypy/dist/pypy/translator/oosupport/test_template/operations.py (original)
+++ pypy/dist/pypy/translator/oosupport/test_template/operations.py Tue Oct 31 18:58:31 2006
@@ -1,5 +1,5 @@
from pypy.rlib.rarithmetic import r_uint, r_ulonglong, r_longlong, ovfcheck
-from pypy.rpython import rstack
+from pypy.rlib import rstack
from pypy.annotation import model as annmodel
import sys
Modified: pypy/dist/pypy/translator/stackless/test/test_clone.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/test/test_clone.py (original)
+++ pypy/dist/pypy/translator/stackless/test/test_clone.py Tue Oct 31 18:58:31 2006
@@ -1,6 +1,6 @@
from pypy.translator.stackless.test.test_transform import \
llinterp_stackless_function, run_stackless_function
-from pypy.rpython import rstack
+from pypy.rlib import rstack
def test_simple():
Modified: pypy/dist/pypy/translator/stackless/test/test_coroutine_reconstruction.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/test/test_coroutine_reconstruction.py (original)
+++ pypy/dist/pypy/translator/stackless/test/test_coroutine_reconstruction.py Tue Oct 31 18:58:31 2006
@@ -1,6 +1,6 @@
from pypy.module._stackless import interp_coroutine
-from pypy.rpython import rstack
-from pypy.rpython.rstack import resume_state_create
+from pypy.rlib import rstack
+from pypy.rlib.rstack import resume_state_create
from pypy.translator.stackless.test.test_transform import llinterp_stackless_function
from pypy.rpython.lltypesystem.lloperation import llop
from pypy.rpython.lltypesystem import lltype
Modified: pypy/dist/pypy/translator/stackless/test/test_depth.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/test/test_depth.py (original)
+++ pypy/dist/pypy/translator/stackless/test/test_depth.py Tue Oct 31 18:58:31 2006
@@ -1,6 +1,6 @@
from pypy.translator.stackless.test.test_transform import \
llinterp_stackless_function, run_stackless_function
-from pypy.rpython import rstack
+from pypy.rlib import rstack
import py
import os
Modified: pypy/dist/pypy/translator/stackless/test/test_resume_point.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/test/test_resume_point.py (original)
+++ pypy/dist/pypy/translator/stackless/test/test_resume_point.py Tue Oct 31 18:58:31 2006
@@ -2,7 +2,7 @@
from pypy.translator.stackless.test.test_transform import llinterp_stackless_function, rtype_stackless_function, one, run_stackless_function
from pypy import conftest
import py
-from pypy.rpython import rstack
+from pypy.rlib import rstack
def do_inline(t):
from pypy.translator.backendopt import inline, removenoops
Modified: pypy/dist/pypy/translator/stackless/test/test_transform.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/test/test_transform.py (original)
+++ pypy/dist/pypy/translator/stackless/test/test_transform.py Tue Oct 31 18:58:31 2006
@@ -5,7 +5,8 @@
from pypy.translator.c import gc
from pypy.translator.unsimplify import varoftype
from pypy.rpython.lltypesystem import lltype, llmemory
-from pypy.rpython import llinterp, rstack
+from pypy.rpython import llinterp
+from pypy.rlib import rstack
from pypy.translator.translator import TranslationContext, graphof
from pypy.objspace.flow.model import checkgraph
from pypy.annotation import model as annmodel
Modified: pypy/dist/pypy/translator/stackless/test/test_yield_current_frame_to_caller.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/test/test_yield_current_frame_to_caller.py (original)
+++ pypy/dist/pypy/translator/stackless/test/test_yield_current_frame_to_caller.py Tue Oct 31 18:58:31 2006
@@ -1,6 +1,6 @@
from pypy.translator.stackless.test.test_transform import \
llinterp_stackless_function, run_stackless_function
-from pypy.rpython import rstack
+from pypy.rlib import rstack
import py
import os
Modified: pypy/dist/pypy/translator/transform.py
==============================================================================
--- pypy/dist/pypy/translator/transform.py (original)
+++ pypy/dist/pypy/translator/transform.py Tue Oct 31 18:58:31 2006
@@ -12,7 +12,7 @@
from pypy.objspace.flow.model import Variable, Constant, Link
from pypy.objspace.flow.model import c_last_exception, checkgraph
from pypy.annotation import model as annmodel
-from pypy.rpython.rstack import stack_check
+from pypy.rlib.rstack import stack_check
from pypy.rpython.lltypesystem import lltype
def checkgraphs(self, blocks):
More information about the Pypy-commit
mailing list