Author: hager <[email protected]>
Branch: ppc-jit-backend
Changeset: r48430:c00c0dca8cfc
Date: 2011-10-25 15:36 +0200
http://bitbucket.org/pypy/pypy/changeset/c00c0dca8cfc/

Log:    (bivab, hager): fix interface access after merge

diff --git a/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py 
b/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
--- a/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
+++ b/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
@@ -81,6 +81,7 @@
         self.datablockwrapper = None
         self.memcpy_addr = 0
         self.fail_boxes_count = 0
+        self.current_clt = None
 
     def load_imm(self, rD, word):
         if word <= 32767 and word >= -32768:
@@ -378,10 +379,10 @@
                 self.regalloc_mov(r.r0, loc)
 
     def setup(self, looptoken, operations):
+        assert self.memcpy_addr != 0
+        self.current_clt = looptoken.compiled_loop_token 
         operations = self.cpu.gc_ll_descr.rewrite_assembler(self.cpu, 
-                                                            operations)
-        assert self.memcpy_addr != 0
-        self.current_clt = looptoken.compiled_loop_token
+                operations, self.current_clt.allgcrefs)
         self.mc = PPCBuilder()
         self.pending_guards = []
         assert self.datablockwrapper is None
@@ -399,6 +400,7 @@
     def assemble_loop(self, inputargs, operations, looptoken, log):
 
         clt = CompiledLoopToken(self.cpu, looptoken.number)
+        clt.allgcrefs = []
         looptoken.compiled_loop_token = clt
 
         self.setup(looptoken, operations)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to