[pypy-commit] pypy jit-leaner-frontend: try harder to fix stuff into SHORT

[fijal]

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82955:f44ec35b6c0b
Date: 2016-03-11 11:34 +0200
http://bitbucket.org/pypy/pypy/changeset/f44ec35b6c0b/

Log:    try harder to fix stuff into SHORT

diff --git a/rpython/jit/metainterp/opencoder.py 
b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -19,6 +19,8 @@
 TAGSHIFT = 2
 SMALL_INT_STOP  = 2 ** (15 - TAGSHIFT)
 SMALL_INT_START = -SMALL_INT_STOP
+MIN_SHORT = -2**15 + 1
+MAX_SHORT = 2**15 - 1
 
 class BaseTrace(object):
     pass
@@ -121,11 +123,11 @@
 
     def skip_resume_data(self):
         pos = self.pos
-        self.pos = self._next()
+        self.pos += self._next()
         return pos
 
     def get_snapshot_iter(self, pos):
-        end = rffi.cast(lltype.Signed, self.trace._ops[pos])
+        end = rffi.cast(lltype.Signed, self.trace._ops[pos]) + pos
         return SnapshotIterator(self, pos + 1, end)
 
     def next(self):
@@ -182,6 +184,7 @@
         if self._pos >= len(self._ops):
             # grow by 2X
             self._ops = self._ops + [rffi.cast(rffi.SHORT, -15)] * 
len(self._ops)
+        assert MIN_SHORT < v < MAX_SHORT
         self._ops[self._pos] = rffi.cast(rffi.SHORT, v)
         self._pos += 1
 
@@ -293,7 +296,7 @@
     def patch_position_to_current(self, p):
         prev = self._ops[p]
         assert rffi.cast(lltype.Signed, prev) == -1
-        self._ops[p] = rffi.cast(rffi.SHORT, self._pos)
+        self._ops[p] = rffi.cast(rffi.SHORT, self._pos - p)
 
     def check_snapshot_jitcode_pc(self, jitcode, pc, resumedata_pos):
         # XXX expensive?
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit