Author: amintos
Branch:
Changeset: r757:e496904283be
Date: 2014-01-16 22:06 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/e496904283be/
Log: merged stuff
diff --git a/spyvm/interpreter.py b/spyvm/interpreter.py
--- a/spyvm/interpreter.py
+++ b/spyvm/interpreter.py
@@ -191,10 +191,7 @@
def interpret_with_w_frame(self, w_frame, may_context_switch=True):
print "Interpreter starting"
try:
- self.loop(w_frame, may_context_switch)
- except ProcessSwitch, e:
- # W00t: Can I haz explainaiatain?
-
self.interpret_with_w_frame(e.s_new_context.w_self(),may_context_switch)
+ self.loop(w_frame)
except ReturnFromTopLevel, e:
return e.object
diff --git a/targetimageloadingsmalltalk.py b/targetimageloadingsmalltalk.py
--- a/targetimageloadingsmalltalk.py
+++ b/targetimageloadingsmalltalk.py
@@ -228,8 +228,11 @@
driver.config.translation.thread = True
driver.config.translation.gc = "stmgc"
driver.config.translation.gcrootfinder = 'stm'
+ driver.config.translation.rweakref = True
+ driver.config.translation.shared = False
+
# driver.config.translation.jit = True
-
+ print driver.config.translation
return entry_point, None
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
