[pypy-commit] pypy stmgc-c7: fixes on 32-bit

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r70412:907b74dcb682
Date: 2014-04-02 22:48 +0200
http://bitbucket.org/pypy/pypy/changeset/907b74dcb682/

Log:	fixes on 32-bit

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
@@ -84,7 +84,7 @@
         return self.type == FLOAT
 
     def add_offset(self, ofs):
-        return RawEbpLoc(self.value + ofs)
+        return RawEbpLoc(self.segment, self.value + ofs)
 
     def is_stack(self):
         return True
@@ -283,7 +283,7 @@
         result = instantiate(AddressLoc)
         result._location_code = self._location_code
         if self._location_code == 'm':
-            result.loc_m = self.loc_m[:2] + (self.loc_m[2] + ofs)
+            result.loc_m = self.loc_m[:2] + (self.loc_m[2] + ofs,)
         elif self._location_code == 'a':
             result.loc_a = self.loc_a[:4] + (self.loc_a[4] + ofs,)
         elif self._location_code == 'j':