[pypy-commit] pypy ppc-updated-backend: Fix PPCGuardToken constructor

ISF noreply at buildbot.pypy.org
Wed Aug 27 19:31:15 CEST 2014


Author: Ivan Sichmann Freitas <ivansichfreitas at gmail.com>
Branch: ppc-updated-backend
Changeset: r73086:a2ae19d7f7bd
Date: 2014-08-27 17:01 -0300
http://bitbucket.org/pypy/pypy/changeset/a2ae19d7f7bd/

Log:	Fix PPCGuardToken constructor

diff --git a/rpython/jit/backend/ppc/codebuilder.py b/rpython/jit/backend/ppc/codebuilder.py
--- a/rpython/jit/backend/ppc/codebuilder.py
+++ b/rpython/jit/backend/ppc/codebuilder.py
@@ -6,6 +6,7 @@
 from rpython.jit.backend.ppc.arch import (IS_PPC_32, WORD, IS_PPC_64, 
                                        LR_BC_OFFSET)
 import rpython.jit.backend.ppc.register as r
+import rpython.jit.backend.ppc.condition as c
 from rpython.jit.backend.llsupport.asmmemmgr import BlockBuilderMixin
 from rpython.jit.backend.llsupport.assembler import GuardToken
 from rpython.rtyper.lltypesystem import lltype, rffi
@@ -923,15 +924,15 @@
     def flush_icache(x, y): pass
 
 class PPCGuardToken(GuardToken):
-    # Passing fcond may be needed here
+    # We may have to find a suitable default value for fcond
     def __init__(self, cpu, gcmap, descr, failargs, faillocs, offset,
                  exc, frame_depth, is_guard_not_invalidated=False,
-                 is_guard_not_forced=False):
+                 is_guard_not_forced=False, fcond=c.EQ):
         GuardToken.__init__(self, cpu, gcmap, descr, failargs, faillocs, exc,
                             frame_depth, is_guard_not_invalidated,
                             is_guard_not_forced)
+        self.fcond = fcond
         self.offset = offset
-        #self.is_invalidate = is_invalidate
 
 class OverwritingBuilder(PPCAssembler):
     def __init__(self, cb, start, num_insts):


More information about the pypy-commit mailing list