Author: Armin Rigo <[email protected]> Branch: Changeset: r63133:8ca71dff5420 Date: 2013-04-08 11:07 +0000 http://bitbucket.org/pypy/pypy/changeset/8ca71dff5420/
Log: merge heads diff --git a/pypy/doc/release-2.0.0-beta2.rst b/pypy/doc/release-2.0.0-beta2.rst --- a/pypy/doc/release-2.0.0-beta2.rst +++ b/pypy/doc/release-2.0.0-beta2.rst @@ -82,3 +82,13 @@ * we now have special strategies for ``dict``/``set``/``list`` which contain unicode strings, which means that now such collections will be both faster and more compact. + +.. _`eventlet`: http://eventlet.net/ +.. _`gevent`: http://www.gevent.org/ +.. _`cffi`: http://cffi.readthedocs.org/en/release-0.6/ +.. _`JIT hooks`: http://doc.pypy.org/en/latest/jit-hooks.html +.. _`pypycore`: https://github.com/gevent-on-pypy/pypycore +.. _`pypy-hacks`: https://github.com/schmir/gevent/tree/pypy-hacks +.. _`_curses.py`: https://bitbucket.org/pypy/pypy/src/aefddd47f224e3c12e2ea74f5c796d76f4355bdb/lib_pypy/_curses.py?at=default +.. _`_sqlite3.py`: https://bitbucket.org/pypy/pypy/src/aefddd47f224e3c12e2ea74f5c796d76f4355bdb/lib_pypy/_sqlite3.py?at=default + diff --git a/rpython/config/translationoption.py b/rpython/config/translationoption.py --- a/rpython/config/translationoption.py +++ b/rpython/config/translationoption.py @@ -115,7 +115,7 @@ ("translation.gcrootfinder", DEFL_ROOTFINDER_WITHJIT), ("translation.list_comprehension_operations", True)]), ChoiceOption("jit_backend", "choose the backend for the JIT", - ["auto", "x86", "x86-without-sse2", 'armv7'], + ["auto", "x86", "x86-without-sse2", 'armv7', 'armv7hf', 'armv6hf'], default="auto", cmdline="--jit-backend"), ChoiceOption("jit_profiler", "integrate profiler support into the JIT", ["off", "oprofile"], diff --git a/rpython/translator/c/gcc/test/elf64/track_basic_argument_registers.s b/rpython/translator/c/gcc/test/elf64/track_basic_argument_registers.s --- a/rpython/translator/c/gcc/test/elf64/track_basic_argument_registers.s +++ b/rpython/translator/c/gcc/test/elf64/track_basic_argument_registers.s @@ -25,7 +25,8 @@ /* GCROOT -48(%rbp) */ movq -24(%rbp), %rax leave - ret + ; try out a "rep ret" instead of just a "ret", for bad reasons + rep ret .cfi_endproc .LFE0: .size foobar, .-foobar diff --git a/rpython/translator/c/gcc/trackgcroot.py b/rpython/translator/c/gcc/trackgcroot.py --- a/rpython/translator/c/gcc/trackgcroot.py +++ b/rpython/translator/c/gcc/trackgcroot.py @@ -664,6 +664,12 @@ def visit_ret(self, line): return InsnRet(self.CALLEE_SAVE_REGISTERS) + def visit_rep(self, line): + # 'rep ret': bad reasons for this bogus 'rep' here + if line.split()[:2] == ['rep', 'ret']: + return self.visit_ret(line) + return [] + def visit_jmp(self, line): tablelabels = [] match = self.r_jmp_switch.match(line) _______________________________________________ pypy-commit mailing list [email protected] http://mail.python.org/mailman/listinfo/pypy-commit
