Author: David Schneider <[email protected]>
Branch: disable_merge_different_int_types
Changeset: r49908:dbfc77bcb912
Date: 2011-11-26 17:19 +0100
http://bitbucket.org/pypy/pypy/changeset/dbfc77bcb912/
Log: more fixes
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -837,7 +837,8 @@
raise Yield
def jump_absolute(self, jumpto, next_instr, ec):
- return jumpto
+ check_nonneg(jumpto)
+ return r_uint(jumpto)
def JUMP_FORWARD(self, jumpby, next_instr):
next_instr += jumpby
diff --git a/pypy/rlib/rstruct/standardfmttable.py
b/pypy/rlib/rstruct/standardfmttable.py
--- a/pypy/rlib/rstruct/standardfmttable.py
+++ b/pypy/rlib/rstruct/standardfmttable.py
@@ -206,7 +206,7 @@
if signed and i == 0 and x >= 128:
x -= 256
intvalue <<= 8
- intvalue |= x
+ intvalue |= inttype(x)
idx += 1
else:
for i in unroll_range_size:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
