[pypy-commit] pypy bounds-int-add-or: merge default

[squeaky]

Author: Squeaky <squeaky_pl at gmx.com>
Branch: bounds-int-add-or
Changeset: r69200:ae0283f76a9c
Date: 2014-02-17 21:38 +0100
http://bitbucket.org/pypy/pypy/changeset/ae0283f76a9c/

Log:	merge default

diff --git a/pypy/doc/man/pypy.1.rst b/pypy/doc/man/pypy.1.rst
--- a/pypy/doc/man/pypy.1.rst
+++ b/pypy/doc/man/pypy.1.rst
@@ -19,10 +19,10 @@
     Skip assert statements.
 
 -OO
-    Remove docstrings when importing modules in addition to -O.
+    Remove docstrings when importing modules in addition to ``-O``.
 
--c *cmd*
-    Program passed in as CMD (terminates option list).
+-c CMD
+    Program passed in as ``CMD`` (terminates option list).
 
 -S
     Do not ``import site`` on initialization.
@@ -36,10 +36,10 @@
 -h, --help
     Show a help message and exit.
 
--m *mod*
+-m MOD
     Library module to be run as a script (terminates option list).
 
--W *arg*
+-W ARG
     Warning control (*arg* is *action*:*message*:*category*:*module*:*lineno*).
 
 -E
@@ -54,44 +54,9 @@
 --info
     Print translation information about this PyPy executable.
 
---jit *arg*
-    Low level JIT parameters. Format is
-    *arg*\ ``=``\ *value*\ [``,``\ *arg*\ ``=``\ *value*\ ...]
-
-    ``off``
-        Disable the JIT.
-
-    ``threshold=``\ *value*
-        Number of times a loop has to run for it to become hot.
-
-    ``function_threshold=``\ *value*
-        Number of times a function must run for it to become traced from
-        start.
-
-    ``inlining=``\ *value*
-        Inline python functions or not (``1``/``0``).
-
-    ``loop_longevity=``\ *value*
-        A parameter controlling how long loops will be kept before being
-        freed, an estimate.
-
-    ``max_retrace_guards=``\ *value*
-        Number of extra guards a retrace can cause.
-
-    ``retrace_limit=``\ *value*
-        How many times we can try retracing before giving up.
-
-    ``trace_eagerness=``\ *value*
-        Number of times a guard has to fail before we start compiling a
-        bridge.
-
-    ``trace_limit=``\ *value*
-        Number of recorded operations before we abort tracing with
-        ``ABORT_TRACE_TOO_LONG``.
-
-    ``enable_opts=``\ *value*
-        Optimizations to enabled or ``all``.
-        Warning, this option is dangerous, and should be avoided.
+--jit ARG
+    Low level JIT parameters.  Mostly internal.  Run ``--jit help``
+    for more information.
 
 ENVIRONMENT
 ===========
@@ -144,7 +109,7 @@
         Multiple prefixes can be specified, comma-separated.
         Only sections whose name match the prefix will be logged.
 
-    ``PYPYLOG``\ =\ ``jit-log-opt,jit-backend:``\ *logfile* will
+    ``PYPYLOG=jit-log-opt,jit-backend:logfile`` will
     generate a log suitable for *jitviewer*, a tool for debugging
     performance issues under PyPy.
 
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -75,7 +75,7 @@
 Kill some guards and operations in JIT traces by adding integer bounds
 propagation for getfield_(raw|gc) and getarrayitem_(raw|gc).
 
-.. branch: optimize-int-and:
+.. branch: optimize-int-and
 Optimize away INT_AND with constant mask of 1s that fully cover the bitrange
 of other operand.