Merge branch 'master' of github.com:HPI-SWA-Lab/RSqueak into fniephau…

…s/python-plugin

# Conflicts:
#	.travis.yml
#	.travis/test.sh

.build/build.py

@@ -35,6 +35,10 @@ def isatty(self):
 
 if __name__ == "__main__":
     target = os.path.join(os.path.dirname(__file__), "..", "targetrsqueak.py")
+    if '--quick' in sys.argv:
+        assert len(sys.argv) == 2
+        sys.argv.pop()
+        sys.argv.extend(['--no-translation-jit', '--', '--without_plugins'])
     if '--' in sys.argv:
       sys.argv[sys.argv.index('--')] = target
     else:

.travis.yml

@@ -39,12 +39,15 @@ matrix:
   include:
     # - os: osx
     #   osx_image: xcode7.3
+    #   language: cpp
     #   env: BUILD_ARCH=64bit TEST_TYPE=default
     # - os: osx
     #   osx_image: xcode7.3
+    #   language: cpp
     #   env: BUILD_ARCH=64bit
     # - os: osx
     #   osx_image: xcode7.3
+    #   language: cpp
     #   env: BUILD_ARCH=64bit PLUGINS=RubyPlugin
     - os: osx
       osx_image: xcode7.3

.travis/test.sh

@@ -23,4 +23,4 @@ case "${BUILD_ARCH}" in
   *) ;;
 esac
 
-pypy ".build/${testscript}" ${testflag}
+pypy ".build/${testscript}" -s ${testflag}

AUTHORS

@@ -10,6 +10,7 @@ RSqueak/VM includes contributions from:
   Jakob Reschke
   Jan Graichen
   Johannes Henning
+  Jonas Chromik
   Lars Wassermann
   Matthias Springer
   Patrick Rein

rsqueakvm/constants.py

@@ -66,6 +66,7 @@
 COMPILED_METHOD_SMALL_FRAME_SIZE = 16
 LITERAL_START = 1  # index of the first literal after the method header
 BYTES_PER_WORD = 4
+BITS_PER_WORD = BYTES_PER_WORD * 8
 WORDS_IN_FLOAT = 2  # Fixed number of word-slots in a Squeak Float object
 INTERP_PROXY_MAJOR = 1
 INTERP_PROXY_MINOR = 13
@@ -168,6 +169,7 @@
     "display": SO_DISPLAY_OBJECT,
     "interrupt_semaphore": SO_USER_INTERRUPT_SEMAPHORE,
     "timerSemaphore": SO_TIMER_SEMAPHORE,
+    "low_space_semaphore": SO_LOW_SPACE_SEMAPHORE,
     "jit_hook_selector": SO_JIT_HOOK,
     "jit_hook_receiver": SO_JIT_HOOK_RCVR
 }