Author: Anton Gulenko <[email protected]> Branch: rstrategies Changeset: r1063:8f01f05e7dc3 Date: 2014-11-13 15:22 +0100 http://bitbucket.org/pypy/lang-smalltalk/changeset/8f01f05e7dc3/
Log: Merged default. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ ### Required packages You need the following packages on your OS. Install with your favorite package manager: * pypy - * For faster translation of the SPY VM. Alternatively use default Python. + * For faster translation of the RSqueak VM. Alternatively use default Python. * libsdl-dev * libffi-dev @@ -59,19 +59,31 @@ ``` ### Starting an image -The build process will produce an executable e.g. called targetimageloadingsmalltalk-c. Start it with the following: +The build process will produce an executable called rsqueak. +The ```image/``` directory contains two images you can open with the following. +Use ```--help``` to see command line switches. ``` -./targetimageloadingsmalltalk-c images/Squeak4.5-*.image +./rsqueak images/mini.image +./rsqueak images/Squeak4.5-noBitBlt.image ``` -Setup for stm-enabled SPY + + + +STM-enabled Rsqueak +=== +This is a branch of RSqueak which incorporates the RPython STM transformation. Most of the initial code base comes from the results of a project seminar (https://bitbucket.org/amintos/lang-smalltalk). The stmgc-c7 branch is based on this version and the 64bit branch. + +Setup for stm-enabled RSqueak --- +You can see the current state of the integration of the RPython STM in our stmgc-c7 branch. +Beware that you can only build this branch if you have a 64-bit linux. To build this branch you have to setup several things: -There are two branches integrating the RPython STM into SPY: stm-c4, storage-stm-c4. You have to change two things of the setup to build those branches. +1. Change your local pypy repository to the stm-gc7 branch, commit dd3c06b +2. Get a clang which has the patches from ([Clang patches](https://bitbucket.org/pypy/stmgc/src/d164a5bcad5e7615b4362b6a1a49d51e2e06de0c/c7/llvmfix/?at=default)). If you have a Debian-based OS you can use the following package: [llvm-pypystm](https://launchpad.net/~malte.swart/+archive/ubuntu/llvm-pypystm). -1. Change your local pypy repository to the stm-c4 branch. -2. Add the ```--gc=stmgc``` when building: +To build, use the following command: ``` [path to pypy repository]/rpython/bin/rpython --gc=stmgc targetimageloadingsmalltalk.py ``` _______________________________________________ pypy-commit mailing list [email protected] https://mail.python.org/mailman/listinfo/pypy-commit
