[pypy-commit] pypy ppc-jit-backend: _ppc_direct_bootstrap_code must be function descriptor on PPC64

edelsohn noreply at buildbot.pypy.org
Wed Nov 23 21:35:38 CET 2011


Author: edelsohn
Branch: ppc-jit-backend
Changeset: r49708:cccd047156c3
Date: 2011-11-23 15:34 -0500
http://bitbucket.org/pypy/pypy/changeset/cccd047156c3/

Log:	_ppc_direct_bootstrap_code must be function descriptor on PPC64

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
@@ -602,7 +602,13 @@
         self.write_pending_failure_recoveries()
         loop_start = self.materialize_loop(looptoken, False)
         looptoken._ppc_bootstrap_code = loop_start
-        looptoken._ppc_direct_bootstrap_code = loop_start + direct_bootstrap_code
+
+        real_start = loop_start + direct_bootstrap_code
+        if IS_PPC_32:
+            looptoken._ppc_direct_bootstrap_code = real_start
+        else:
+            looptoken._ppc_direct_bootstrap_code = self.gen_64_bit_func_descr(real_start)
+
         real_start = loop_start + start_pos
         if IS_PPC_32:
             looptoken.ppc_code = real_start


More information about the pypy-commit mailing list