Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r70211:db9c0c61d0c6
Date: 2014-03-23 16:41 +0100
http://bitbucket.org/pypy/pypy/changeset/db9c0c61d0c6/
Log: fixes
diff --git a/rpython/jit/backend/x86/regloc.py
b/rpython/jit/backend/x86/regloc.py
--- a/rpython/jit/backend/x86/regloc.py
+++ b/rpython/jit/backend/x86/regloc.py
@@ -243,7 +243,7 @@
scale, static_offset)
def __repr__(self):
- dict = {'j': 'value', 'a': 'loc_a', 'm': 'loc_m', 'a':'loc_a'}
+ dict = {'j': 'loc_j', 'a': 'loc_a', 'm': 'loc_m', 'a':'loc_a'}
attr = dict.get(self._location_code, '?')
info = getattr(self, attr, '?')
return '<AddressLoc %r: %s>' % (self._location_code, info)
@@ -402,7 +402,7 @@
val2 = loc2.value_i()
code1 = loc1.location_code()
if code1 == 'j':
- checkvalue = loc1.value_j()
+ checkvalue = loc1.value_j()[1]
elif code1 == 'm':
checkvalue = loc1.value_m()[2]
elif code1 == 'a':
@@ -457,7 +457,7 @@
if loc2 is X86_64_SCRATCH_REG:
if code1 == 'j':
assert (name.startswith("MOV") and
- rx86.fits_in_32bits(loc1.value_j()))
+ rx86.fits_in_32bits(loc1.value_j()[1]))
if loc1 is X86_64_SCRATCH_REG and not name.startswith("MOV"):
assert code2 not in ('j', 'i')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
