[pypy-commit] pypy ppc-jit-backend-rpythonization: fix merge bug

hager noreply at buildbot.pypy.org
Wed Feb 8 15:04:04 CET 2012


Author: hager <sven.hager at uni-duesseldorf.de>
Branch: ppc-jit-backend-rpythonization
Changeset: r52232:ca06b153e756
Date: 2012-02-08 06:03 -0800
http://bitbucket.org/pypy/pypy/changeset/ca06b153e756/

Log:	fix merge bug

diff --git a/pypy/jit/backend/ppc/locations.py b/pypy/jit/backend/ppc/locations.py
--- a/pypy/jit/backend/ppc/locations.py
+++ b/pypy/jit/backend/ppc/locations.py
@@ -110,4 +110,7 @@
     return ImmLocation(val)
 
 def get_spp_offset(pos):
-    return -(pos + 1) * WORD
+    if pos < 0:
+        return -pos * WORD
+    else:
+        return -(pos + 1) * WORD


More information about the pypy-commit mailing list