Author: Tim Felgentreff <[email protected]>
Branch: rbitblt
Changeset: r550:eec84d67649b
Date: 2014-01-03 16:45 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/eec84d67649b/
Log: fix translation, intially force images to 32bit
diff --git a/spyvm/model.py b/spyvm/model.py
--- a/spyvm/model.py
+++ b/spyvm/model.py
@@ -1042,7 +1042,8 @@
word = r_uint(word)
pos = self.compute_pos(n)
# pos, line_end = self.compute_pos_and_line_end(n, self._depth)
- maskR = r_uint(2 ** self._depth - 1)
+ assert self._depth <= 4
+ maskR = r_uint(0b1111)
mask = maskR << (32 - self._depth)
rshift = 32 - self._depth
for i in xrange(8 / self._depth):
diff --git a/spyvm/primitives.py b/spyvm/primitives.py
--- a/spyvm/primitives.py
+++ b/spyvm/primitives.py
@@ -856,7 +856,7 @@
raise PrimitiveFailedError
signature = (w_modulename.as_string(), w_functionname.as_string())
- if signature == 'BitBltPlugin':
+ if signature[0] == 'BitBltPlugin':
from spyvm.plugins.bitblt import BitBltPlugin
return BitBltPlugin.call(signature[1], interp, s_frame, argcount,
s_method)
elif signature[0] == "SocketPlugin":
diff --git a/spyvm/squeakimage.py b/spyvm/squeakimage.py
--- a/spyvm/squeakimage.py
+++ b/spyvm/squeakimage.py
@@ -376,7 +376,7 @@
self.lastWindowSize = reader.lastWindowSize
self.version = reader.version
self.is_modern = reader.version.magic > 6502
- # self.run_spy_hacks(space)
+ self.run_spy_hacks(space)
def run_spy_hacks(self, space):
w_display = space.objtable["w_display"]
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
