at LOAD_DEREF')") \ + == (r"block in
at LOAD_DEREF", r"block in
at LOAD_DEREF") + assert find(r"debug_merge_point(0, 0, '
at SEND')") \ + == (r"
at SEND", r"
at SEND") diff --git a/rpython/jit/tool/traceviewer.py b/rpython/jit/tool/traceviewer.py --- a/rpython/jit/tool/traceviewer.py +++ b/rpython/jit/tool/traceviewer.py @@ -219,19 +219,78 @@ counter += loop.count("\n") + 2 return real_loops, allloops + +def find_name_key(l): + m = re.search("debug_merge_point\((?:\d+,\ )*'(.*)'(?:, \d+)*\)", l.content) + if m is None: + # default fallback + return '?', '?' + info = m.group(1) + + # PyPy (pypy/module/pypyjit/interp_jit.py, pypy/interpreter/generator.py) + # '
 #63 GET_ITER'
+    # ' '
+    m = re.search("^( (.*?))$", info)
+    if m:
+        return m.group(2) + " " + m.group(3), m.group(1)
+
+    # PyPy cffi (pypy/module/_cffi_backend/ccallback.py)
+    # 'cffi_callback ', 'cffi_callback '
+    # 'cffi_call_python somestr'
+    m = re.search("^((cffi_callback) )$", info)
+    if m:
+        return "%s (%s)" %(m.group(3), m.group(2)), m.group(1)
+    m = re.search("^((cffi_callback) <\?>)$", info)
+    if m:
+        return "? (%s)" %(m.group(2)), m.group(1)
+    m = re.search("^((cffi_call_python) (.*))$", info)
+    if m:
+        return "%s (%s)" %(m.group(3), m.group(2)), m.group(1)
+
+    # RSqueak/lang-smalltalk (spyvm/interpreter.py)
+    # '(SequenceableCollection >> #replaceFrom:to:with:startingAt:) [8]: <0x14>pushTemporaryVariableBytecode(4)'
+    m = re.search("^(\(((.+?) >> )?(#.*)\) \[(\d+)\].+?>(.*?)(?:\(\d+\))?)$", info)
+    if m:
+        if m.group(3):
+            return "%s>>%s @ %s <%s>" % (m.group(3), m.group(4), m.group(5), m.group(6)), m.group(1)
+        else:
+            return "%s @ %s <%s>" % (m.group(4), m.group(5), m.group(6)), m.group(1)
+
+    # lang-js (js/jscode.py)
+    # '54: LOAD LIST 4'
+    # '44: LOAD_MEMBER_DOT function: barfoo'
+    # '87: end of opcodes'
+    m = re.search("^((\d+): (.+?)(:? function: (.+?))?)$", info)
+    if m:
+        if m.group(5):
+            return "%s @ %s <%s>" % (m.group(5), m.group(2), m.group(3)), m.group(1)
+        else:
+            return "? @ %s <%s>" % (m.group(2), m.group(3)), m.group(1)
+
+    # pycket (pycket/interpreter.py) [sorted down because the s-exp is very generic]
+    # 'Green_Ast is None'
+    # 'Label(safe_return_multi_vals:pycket.interpreter:565)'
+    # '(*node2 item AppRand1_289 AppRand2_116)'
+    if info[0] == '(' and info[-1] == ')':
+        if len(info) > 64: #s-exp can be quite long
+            return info[:64] +'...', info
+
+    # info fallback (eg, rsre_jit, qoppy, but also
+    #  pyhaskell (pyhaskell/interpreter/haskell.py)
+    #  pyrolog (prolog/interpreter/continuation.py)
+    #  RPySOM/RTruffleSom (src/som/interpreter/interpreter.py)
+    #  Topaz (topaz/interpreter.py)
+    #  hippyvm (hippy/interpreter.py)
+    return info, info
+
 def postprocess_loop(loop, loops, memo, counts):
+
     if loop in memo:
         return
     memo.add(loop)
     if loop is None:
         return
-    m = re.search("debug_merge_point\((?:\d+,\ )*'( (.*?))'", loop.content)
-    if m is None:
-        name = '?'
-        loop.key = '?'
-    else:
-        name = m.group(2) + " " + m.group(3)
-        loop.key = m.group(1)
+    name, loop.key = find_name_key(loop)
     opsno = loop.content.count("\n")
     lastline = loop.content[loop.content.rfind("\n", 0, len(loop.content) - 2):]
     m = re.search('descr=

Author: Armin Rigo 
Branch: extradoc
Changeset: r715:60b977006d8b
Date: 2016-03-09 02:54 +0100
http://bitbucket.org/pypy/pypy.org/changeset/60b977006d8b/

Log:	update the values

diff --git a/don1.html b/don1.html
--- a/don1.html
+++ b/don1.html
@@ -15,7 +15,7 @@
 
 
    
-   $63060 of $105000 (60.1%)
+   $63079 of $105000 (60.1%)
    
    
 
@@ -23,7 +23,7 @@
   
   This donation goes towards supporting Python 3 in PyPy.
   Current status:
-    we have $8205 left
+    we have $8222 left
   in the account.
 Read proposal
   
   

From pypy.commits at gmail.com  Wed Mar  9 02:59:21 2016
From: pypy.commits at gmail.com (fijal)
Date: Tue, 08 Mar 2016 23:59:21 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: progress towards a
 non-unrolled features
Message-ID: <56dfd7d9.4c181c0a.d2b1d.4067@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82897:ee3bb1c8b518
Date: 2016-03-09 09:58 +0200
http://bitbucket.org/pypy/pypy/changeset/ee3bb1c8b518/

Log:	progress towards a non-unrolled features

diff --git a/rpython/jit/metainterp/blackhole.py b/rpython/jit/metainterp/blackhole.py
--- a/rpython/jit/metainterp/blackhole.py
+++ b/rpython/jit/metainterp/blackhole.py
@@ -1563,7 +1563,6 @@
     def _done_with_this_frame(self):
         # rare case: we only get there if the blackhole interps all returned
         # normally (in general we get a ContinueRunningNormally exception).
-        sd = self.builder.metainterp_sd
         kind = self._return_type
         if kind == 'v':
             raise jitexc.DoneWithThisFrameVoid()
diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -200,20 +200,15 @@
 # ____________________________________________________________
 
 
-def compile_simple_loop(metainterp, greenkey, start, trace, jumpargs,
-                        enable_opts):
-    xxxx
+def compile_simple_loop(metainterp, greenkey, trace, enable_opts):
     from rpython.jit.metainterp.optimizeopt import optimize_trace
 
     jitdriver_sd = metainterp.jitdriver_sd
     metainterp_sd = metainterp.staticdata
     jitcell_token = make_jitcell_token(jitdriver_sd)
-    label = ResOperation(rop.LABEL, inputargs[:], descr=jitcell_token)
-    jump_op = ResOperation(rop.JUMP, jumpargs[:], descr=jitcell_token)
     call_pure_results = metainterp.call_pure_results
-    data = SimpleCompileData(label, ops + [jump_op],
-                                 call_pure_results=call_pure_results,
-                                 enable_opts=enable_opts)
+    data = SimpleCompileData(trace, call_pure_results=call_pure_results,
+                             enable_opts=enable_opts)
     try:
         loop_info, ops = optimize_trace(metainterp_sd, jitdriver_sd,
                                         data, metainterp.box_names_memo)
@@ -234,7 +229,7 @@
         loop.check_consistency()
     jitcell_token.target_tokens = [target_token]
     send_loop_to_backend(greenkey, jitdriver_sd, metainterp_sd, loop, "loop",
-                         inputargs, metainterp.box_names_memo)
+                         loop_info.inputargs, metainterp.box_names_memo)
     record_loop_or_bridge(metainterp_sd, loop)
     return target_token
 
@@ -262,9 +257,8 @@
     jitcell_token = make_jitcell_token(jitdriver_sd)
     history.record(rop.JUMP, jumpargs, None, descr=jitcell_token)
     if 'unroll' not in enable_opts or not metainterp.cpu.supports_guard_gc_type:
-        return compile_simple_loop(metainterp, greenkey, start, inputargs,
-                                   history.trace,
-                                   jumpargs, enable_opts)
+        return compile_simple_loop(metainterp, greenkey, history.trace,
+                                   enable_opts)
     call_pure_results = metainterp.call_pure_results
     preamble_data = LoopCompileData(history.trace, inputargs,
                                     call_pure_results=call_pure_results,
@@ -332,22 +326,22 @@
     to the first operation.
     """
     from rpython.jit.metainterp.optimizeopt import optimize_trace
-    from rpython.jit.metainterp.optimizeopt.optimizer import BasicLoopInfo
 
-    history = metainterp.history
+    trace = metainterp.history.trace.cut_trace_from(start, inputargs)
     metainterp_sd = metainterp.staticdata
     jitdriver_sd = metainterp.jitdriver_sd
+    history = metainterp.history
 
     loop_jitcell_token = metainterp.get_procedure_token(greenkey)
     assert loop_jitcell_token
 
     end_label = ResOperation(rop.LABEL, inputargs[:],
                              descr=loop_jitcell_token)
-    jump_op = ResOperation(rop.JUMP, jumpargs[:], descr=loop_jitcell_token)
+    cut_pos = history.get_trace_position()
+    history.record(rop.JUMP, jumpargs[:], None, descr=loop_jitcell_token)
     enable_opts = jitdriver_sd.warmstate.enable_opts
-    ops = history.operations[start:]
     call_pure_results = metainterp.call_pure_results
-    loop_data = UnrolledLoopData(end_label, jump_op, ops, start_state,
+    loop_data = UnrolledLoopData(trace, loop_jitcell_token, start_state,
                                  call_pure_results=call_pure_results,
                                  enable_opts=enable_opts)
     try:
@@ -356,6 +350,7 @@
                                              metainterp.box_names_memo)
     except InvalidLoop:
         # Fall back on jumping directly to preamble
+        xxxx
         jump_op = ResOperation(rop.JUMP, inputargs[:], descr=loop_jitcell_token)
         loop_data = UnrolledLoopData(end_label, jump_op, [jump_op], start_state,
                                      call_pure_results=call_pure_results,
diff --git a/rpython/jit/metainterp/history.py b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -657,8 +657,8 @@
     def length(self):
         return self.trace._count
 
-    def get_cut_position(self):
-        return len(self.trace._ops)
+    def get_trace_position(self):
+        return self.trace.cut_point()
 
     def cut(self, cut_at):
         self.trace.cut_at(cut_at)
@@ -686,11 +686,13 @@
             op.setref_base(value)
         return op
 
+    def record_nospec(self, opnum, argboxes, descr=None):
+        return self.trace.record_op(opnum, argboxes, descr)
+
     def record_default_val(self, opnum, argboxes, descr=None):
-        op = ResOperation(opnum, argboxes, descr)
-        assert op.is_same_as()
+        assert rop.is_same_as(opnum)
+        op = self.trace.record_op(opnum, argboxes, descr)
         op.copy_value_from(argboxes[0])
-        self.operations.append(op)
         return op
 
 
diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -57,15 +57,22 @@
         return size, self._next(), self._next()
 
 class TraceIterator(object):
-    def __init__(self, trace, end):
+    def __init__(self, trace, start, end, force_inputargs=None):
         self.trace = trace
-        self.inputargs = [rop.inputarg_from_tp(arg.type) for
-                          arg in self.trace.inputargs]
-        self.start = 0
-        self.pos = 0
+        self._cache = [None] * trace._count
+        if force_inputargs is not None:
+            self.inputargs = [rop.inputarg_from_tp(arg.type) for
+                              arg in force_inputargs]
+            for i, arg in enumerate(force_inputargs):
+                if arg.position >= 0:
+                    self._cache[arg.position] = self.inputargs[i]
+        else:
+            self.inputargs = [rop.inputarg_from_tp(arg.type) for
+                              arg in self.trace.inputargs]
+        self.start = start
+        self.pos = start
         self._count = 0
         self.end = end
-        self._cache = [None] * trace._count
 
     def _get(self, i):
         if i < 0:
@@ -126,7 +133,23 @@
         self._count += 1
         return res
 
-class Trace(object):
+class BaseTrace(object):
+    pass
+
+class CutTrace(BaseTrace):
+    def __init__(self, trace, start, count, inputargs):
+        self.trace = trace
+        self.start = start
+        self.inputargs = inputargs
+        self.count = count
+
+    def get_iter(self):
+        iter = TraceIterator(self.trace, self.start, len(self.trace._ops),
+                             self.inputargs)
+        iter._count = self.count
+        return iter
+
+class Trace(BaseTrace):
     def __init__(self, inputargs):
         self._ops = []
         self._descrs = [None]
@@ -139,8 +162,15 @@
     def length(self):
         return len(self._ops)
 
+    def cut_point(self):
+        return len(self._ops), self._count
+
     def cut_at(self, end):
-        self._ops = self._ops[:end]
+        self._ops = self._ops[:end[0]]
+        self._count = end[1]
+
+    def cut_trace_from(self, (start, count), inputargs):
+        return CutTrace(self, start, count, inputargs)
 
     def _encode(self, box):
         if isinstance(box, Const):
@@ -237,7 +267,7 @@
         assert self._ops[resumedata_pos + 2] == pc
 
     def get_iter(self):
-        return TraceIterator(self, len(self._ops))
+        return TraceIterator(self, 0, len(self._ops))
 
     def _get_operations(self):
         """ NOT_RPYTHON
diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -226,8 +226,9 @@
 
     def optimize_bridge(self, trace, runtime_boxes, call_pure_results,
                         inline_short_preamble, box_names_memo):
+        trace = trace.get_iter()
         self._check_no_forwarding([trace.inputargs])
-        info, ops = self.optimizer.propagate_all_forward(trace.get_iter(),
+        info, ops = self.optimizer.propagate_all_forward(trace,
             call_pure_results, False)
         jump_op = info.jump_op
         cell_token = jump_op.getdescr()
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -1523,10 +1523,11 @@
     @specialize.arg(1)
     def execute_varargs(self, opnum, argboxes, descr, exc, pure):
         self.metainterp.clear_exception()
+        patch_pos = self.metainterp.history.get_trace_position()
         op = self.metainterp.execute_and_record_varargs(opnum, argboxes,
                                                             descr=descr)
         if pure and not self.metainterp.last_exc_value and op:
-            op = self.metainterp.record_result_of_call_pure(op)
+            op = self.metainterp.record_result_of_call_pure(op, patch_pos)
             exc = exc and not isinstance(op, Const)
         if exc:
             if op is not None:
@@ -1918,7 +1919,7 @@
 
     def retrace_needed(self, trace, exported_state):
         self.partial_trace = trace
-        self.retracing_from = self.history.length()
+        self.retracing_from = self.potential_retrace_position
         self.exported_state = exported_state
         self.heapcache.reset()
 
@@ -2435,7 +2436,7 @@
                     break
             else:
                 if self.partial_trace:
-                    if  start != self.retracing_from:
+                    if start != self.retracing_from:
                         raise SwitchToBlackhole(Counters.ABORT_BAD_LOOP) # For now
                 # Found!  Compile it as a loop.
                 # raises in case it works -- which is the common case
@@ -2454,7 +2455,7 @@
                 self.staticdata.log('cancelled, tracing more...')
 
         # Otherwise, no loop found so far, so continue tracing.
-        start = self.history.get_cut_position()
+        start = self.history.get_trace_position()
         self.current_merge_points.append((live_arg_boxes, start))
 
     def _unpack_boxes(self, boxes, start, stop):
@@ -2606,7 +2607,8 @@
         if not target_jitcell_token:
             return
 
-        cut_at = self.history.get_cut_position()
+        cut_at = self.history.get_trace_position()
+        self.potential_retrace_position = cut_at
         self.history.record(rop.JUMP, live_arg_boxes[num_green_args:], None,
                             descr=target_jitcell_token)
         self.history.ends_with_jump = True
@@ -2981,7 +2983,7 @@
         debug_stop("jit-abort-longest-function")
         return max_jdsd, max_key
 
-    def record_result_of_call_pure(self, op):
+    def record_result_of_call_pure(self, op, patch_pos):
         """ Patch a CALL into a CALL_PURE.
         """
         opnum = op.getopnum()
@@ -2993,15 +2995,16 @@
         else:
             # all-constants: remove the CALL operation now and propagate a
             # constant result
-            self.history.operations.pop()
+            self.history.cut(patch_pos)
             return resbox_as_const
         # not all constants (so far): turn CALL into CALL_PURE, which might
         # be either removed later by optimizeopt or turned back into CALL.
         arg_consts = [executor.constant_from_op(a) for a in op.getarglist()]
         self.call_pure_results[arg_consts] = resbox_as_const
         opnum = OpHelpers.call_pure_for_descr(op.getdescr())
-        newop = op.copy_and_change(opnum, args=op.getarglist())
-        self.history.operations[-1] = newop
+        self.history.cut(patch_pos)
+        newop = self.history.record_nospec(opnum, op.getarglist(), op.getdescr())
+        newop.copy_value_from(op)
         return newop
 
     def direct_assembler_call(self, targetjitdriver_sd):
diff --git a/rpython/jit/metainterp/resoperation.py b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -1470,8 +1470,9 @@
     def can_malloc(self):
         return self.is_call() or self.is_malloc()
 
-    def is_same_as(self):
-        return self.opnum in (rop.SAME_AS_I, rop.SAME_AS_F, rop.SAME_AS_R)
+    @staticmethod
+    def is_same_as(opnum):
+        return opnum in (rop.SAME_AS_I, rop.SAME_AS_F, rop.SAME_AS_R)
 
     def is_getfield(self):
         return self.opnum in (rop.GETFIELD_GC_I, rop.GETFIELD_GC_F,
diff --git a/rpython/jit/metainterp/test/test_opencoder.py b/rpython/jit/metainterp/test/test_opencoder.py
--- a/rpython/jit/metainterp/test/test_opencoder.py
+++ b/rpython/jit/metainterp/test/test_opencoder.py
@@ -130,4 +130,18 @@
         loop2.inputargs = inpargs
         loop2.operations = l
         BaseTest.assert_equal(loop1, loop2)
-        print "success"
\ No newline at end of file
+
+    def test_cut_trace_from(self):
+        i0, i1, i2 = InputArgInt(), InputArgInt(), InputArgInt()
+        t = Trace([i0, i1, i2])
+        add1 = t.record_op(rop.INT_ADD, [i0, i1])
+        cut_point = t.cut_point()
+        add2 = t.record_op(rop.INT_ADD, [add1, i1])
+        t.record_op(rop.GUARD_TRUE, [add2])
+        resume.capture_resumedata([FakeFrame(3, JitCode(4), [add2, add1, i1])],
+            None, [], t)
+        t.record_op(rop.INT_SUB, [add2, add1])
+        t2 = t.cut_trace_from(cut_point, [add1, i1])
+        (i0, i1), l, iter = self.unpack(t2)
+        assert len(l) == 3
+        assert l[0].getarglist() == [i0, i1]
\ No newline at end of file

From pypy.commits at gmail.com  Wed Mar  9 03:04:35 2016
From: pypy.commits at gmail.com (fijal)
Date: Wed, 09 Mar 2016 00:04:35 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: fix the cutting and
 starting point, enough to pass test_loop (without unrolling)
Message-ID: <56dfd913.e5ecc20a.94f48.2a14@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82898:670c52c38925
Date: 2016-03-09 10:03 +0200
http://bitbucket.org/pypy/pypy/changeset/670c52c38925/

Log:	fix the cutting and starting point, enough to pass test_loop
	(without unrolling)

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -243,6 +243,7 @@
     metainterp_sd = metainterp.staticdata
     jitdriver_sd = metainterp.jitdriver_sd
     history = metainterp.history
+    trace = history.trace
     warmstate = jitdriver_sd.warmstate
 
     enable_opts = jitdriver_sd.warmstate.enable_opts
@@ -252,15 +253,15 @@
         enable_opts = enable_opts.copy()
         del enable_opts['unroll']
 
-    assert start == 0
-    #ops = history.operations[start:]
     jitcell_token = make_jitcell_token(jitdriver_sd)
     history.record(rop.JUMP, jumpargs, None, descr=jitcell_token)
+    if start != (0, 0):
+        trace = trace.cut_trace_from(start, inputargs)
     if 'unroll' not in enable_opts or not metainterp.cpu.supports_guard_gc_type:
-        return compile_simple_loop(metainterp, greenkey, history.trace,
+        return compile_simple_loop(metainterp, greenkey, trace,
                                    enable_opts)
     call_pure_results = metainterp.call_pure_results
-    preamble_data = LoopCompileData(history.trace, inputargs,
+    preamble_data = LoopCompileData(trace, inputargs,
                                     call_pure_results=call_pure_results,
                                     enable_opts=enable_opts)
     try:
@@ -275,7 +276,7 @@
     start_descr = TargetToken(jitcell_token,
                               original_jitcell_token=jitcell_token)
     jitcell_token.target_tokens = [start_descr]
-    loop_data = UnrolledLoopData(history.trace, jitcell_token, start_state,
+    loop_data = UnrolledLoopData(trace, jitcell_token, start_state,
                                  call_pure_results=call_pure_results,
                                  enable_opts=enable_opts)
     try:
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2317,7 +2317,7 @@
 
     def _compile_and_run_once(self, original_boxes):
         self.initialize_state_from_start(original_boxes)
-        self.current_merge_points = [(original_boxes, 0)]
+        self.current_merge_points = [(original_boxes, (0, 0))]
         num_green_args = self.jitdriver_sd.num_green_args
         original_greenkey = original_boxes[:num_green_args]
         self.resumekey = compile.ResumeFromInterpDescr(original_greenkey)

From pypy.commits at gmail.com  Wed Mar  9 03:53:50 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Wed, 09 Mar 2016 00:53:50 -0800 (PST)
Subject: [pypy-commit] pypy s390x-backend: merged the speed improvements
 from s390x-enhance-speed
Message-ID: <56dfe49e.d3921c0a.eb707.53ce@mx.google.com>

Author: Richard Plangger 
Branch: s390x-backend
Changeset: r82899:c63346ce0b33
Date: 2016-03-09 09:46 +0100
http://bitbucket.org/pypy/pypy/changeset/c63346ce0b33/

Log:	merged the speed improvements from s390x-enhance-speed

diff --git a/rpython/jit/backend/zarch/assembler.py b/rpython/jit/backend/zarch/assembler.py
--- a/rpython/jit/backend/zarch/assembler.py
+++ b/rpython/jit/backend/zarch/assembler.py
@@ -50,7 +50,7 @@
         self.gcrootmap_retaddr_forced = 0
         self.failure_recovery_code = [0, 0, 0, 0]
         self.wb_slowpath = [0,0,0,0,0]
-        # self.pool = None
+        self.pool = None
 
     def setup(self, looptoken):
         BaseAssembler.setup(self, looptoken)
@@ -58,7 +58,7 @@
         if we_are_translated():
             self.debug = False
         self.current_clt = looptoken.compiled_loop_token
-        # POOL self.pool = LiteralPool()
+        self.pool = LiteralPool()
         self.mc = InstrBuilder(None)
         self.pending_guard_tokens = []
         self.pending_guard_tokens_recovered = 0
@@ -76,7 +76,7 @@
         self.current_clt = None
         self._regalloc = None
         self.mc = None
-        # self.pool = None
+        self.pool = None
 
 
     def target_arglocs(self, looptoken):
@@ -350,8 +350,8 @@
 
         gcrootmap = self.cpu.gc_ll_descr.gcrootmap
         if gcrootmap and gcrootmap.is_shadow_stack:
-            diff = mc.load_imm_plus(r.r5, gcrootmap.get_root_stack_top_addr())
-            mc.load(r.r5, r.r5, diff)
+            diff = mc.load_imm(r.r5, gcrootmap.get_root_stack_top_addr())
+            mc.load(r.r5, r.r5, 0)
             mc.store(r.r2, r.r5, -WORD)
 
         self._pop_core_regs_from_jitframe(mc, r.MANAGED_REGS)
@@ -636,7 +636,7 @@
         #
         operations = regalloc.prepare_loop(inputargs, operations,
                                            looptoken, clt.allgcrefs)
-        # POOL self.pool.pre_assemble(self, operations)
+        self.pool.pre_assemble(self, operations)
         entrypos = self.mc.get_relative_pos()
         self._call_header_with_stack_check()
         looppos = self.mc.get_relative_pos()
@@ -645,7 +645,7 @@
         self.update_frame_depth(frame_depth_no_fixed_size + JITFRAME_FIXED_SIZE)
         #
         size_excluding_failure_stuff = self.mc.get_relative_pos()
-        # POOL self.pool.post_assemble(self)
+        #self.pool.post_assemble(self)
         self.write_pending_failure_recoveries()
         full_size = self.mc.get_relative_pos()
         #
@@ -704,13 +704,13 @@
                                              operations,
                                              self.current_clt.allgcrefs,
                                              self.current_clt.frame_info)
-        # POOL self.pool.pre_assemble(self, operations, bridge=True)
+        self.pool.pre_assemble(self, operations, bridge=True)
         startpos = self.mc.get_relative_pos()
-        # POOL self.mc.LARL(r.POOL, l.halfword(self.pool.pool_start - startpos))
+        self.mc.LARL(r.POOL, l.halfword(self.pool.pool_start - startpos))
         self._check_frame_depth(self.mc, regalloc.get_gcmap())
         frame_depth_no_fixed_size = self._assemble(regalloc, inputargs, operations)
         codeendpos = self.mc.get_relative_pos()
-        # POOL self.pool.post_assemble(self)
+        #self.pool.post_assemble(self)
         self.write_pending_failure_recoveries()
         fullsize = self.mc.get_relative_pos()
         #
@@ -735,7 +735,6 @@
         # 'faildescr.adr_jump_offset' is the address of an instruction that is a
         # conditional jump.  We must patch this conditional jump to go
         # to 'adr_new_target'.
-        # Updates the pool address
         mc = InstrBuilder()
         mc.b_abs(adr_new_target)
         mc.copy_to_raw_memory(faildescr.adr_jump_offset)
@@ -922,14 +921,17 @@
                 return
             assert 0, "not supported location"
         elif prev_loc.is_in_pool():
+            if loc.is_core_reg():
+                self.mc.LG(loc, prev_loc)
+                return
             # move immediate value to fp register
             if loc.is_fp_reg():
-                self.mc.LD(loc, prev_loc)
+                self.mc.LDY(loc, prev_loc)
                 return
             # move immediate value to memory
             elif loc.is_stack():
                 offset = loc.value
-                self.mc.LD(r.FP_SCRATCH, prev_loc)
+                self.mc.LDY(r.FP_SCRATCH, prev_loc)
                 self.mc.STDY(r.FP_SCRATCH, l.addr(offset, r.SPP))
                 return
             assert 0, "not supported location"
@@ -976,9 +978,8 @@
         if gcrootmap:
             if gcrootmap.is_shadow_stack:
                 if shadowstack_reg is None:
-                    diff = mc.load_imm_plus(r.SPP,
-                                            gcrootmap.get_root_stack_top_addr())
-                    mc.load(r.SPP, r.SPP, diff)
+                    diff = mc.load_imm(r.SPP, gcrootmap.get_root_stack_top_addr())
+                    mc.load(r.SPP, r.SPP, 0)
                     shadowstack_reg = r.SPP
                 mc.load(r.SPP, shadowstack_reg, -WORD)
         wbdescr = self.cpu.gc_ll_descr.write_barrier_descr
@@ -1019,7 +1020,7 @@
         # Build a new stackframe of size STD_FRAME_SIZE_IN_BYTES
         fpoff = JIT_ENTER_EXTRA_STACK_SPACE
         self.mc.STMG(r.r6, r.r15, l.addr(-fpoff+6*WORD, r.SP))
-        # POOL self.mc.LARL(r.POOL, l.halfword(self.pool.pool_start - self.mc.get_relative_pos()))
+        self.mc.LARL(r.POOL, l.halfword(self.pool.pool_start - self.mc.get_relative_pos()))
         # f8 through f15 are saved registers (= non volatile)
         # TODO it would be good to detect if any float is used in the loop
         # and to skip this push/pop whenever no float operation occurs
@@ -1046,38 +1047,39 @@
     def _call_header_shadowstack(self, gcrootmap):
         # we need to put one word into the shadowstack: the jitframe (SPP)
         # we saved all registers to the stack
-        RCS1 = r.r2
-        RCS2 = r.r3
-        RCS3 = r.r4
+        RCS1 = r.r3
+        RCS2 = r.r4
+        RCS3 = r.r5
         mc = self.mc
-        diff = mc.load_imm_plus(RCS1, gcrootmap.get_root_stack_top_addr())
-        mc.load(RCS2, RCS1, diff)  # ld RCS2, [rootstacktop]
+        mc.load_imm(RCS1, gcrootmap.get_root_stack_top_addr())
+        mc.load(RCS2, RCS1, 0)  # ld RCS2, [rootstacktop]
         #
         mc.LGR(RCS3, RCS2)
         mc.AGHI(RCS3, l.imm(WORD)) # add RCS3, RCS2, WORD
         mc.store(r.SPP, RCS2, 0)   # std SPP, RCS2
         #
-        mc.store(RCS3, RCS1, diff) # std RCS3, [rootstacktop]
+        mc.store(RCS3, RCS1, 0) # std RCS3, [rootstacktop]
 
     def _call_footer_shadowstack(self, gcrootmap):
         # r6 -> r15 can be used freely, they will be restored by 
         # _call_footer after this call
-        RCS1 = r.r9
-        RCS2 = r.r10
+        RCS1 = r.r8
+        RCS2 = r.r7
         mc = self.mc
-        diff = mc.load_imm_plus(RCS1, gcrootmap.get_root_stack_top_addr())
-        mc.load(RCS2, RCS1, diff)    # ld RCS2, [rootstacktop]
+        mc.load_imm(RCS1, gcrootmap.get_root_stack_top_addr())
+        mc.load(RCS2, RCS1, 0)    # ld RCS2, [rootstacktop]
         mc.AGHI(RCS2, l.imm(-WORD))  # sub RCS2, RCS2, WORD
-        mc.store(RCS2, RCS1, diff)   # std RCS2, [rootstacktop]
+        mc.store(RCS2, RCS1, 0)   # std RCS2, [rootstacktop]
 
     def _call_footer(self):
-        # the return value is the jitframe
-        self.mc.LGR(r.r2, r.SPP)
 
         gcrootmap = self.cpu.gc_ll_descr.gcrootmap
         if gcrootmap and gcrootmap.is_shadow_stack:
             self._call_footer_shadowstack(gcrootmap)
 
+        # the return value is the jitframe
+        self.mc.LGR(r.r2, r.SPP)
+
         size = STD_FRAME_SIZE_IN_BYTES
         # f8 through f15 are saved registers (= non volatile)
         # TODO it would be good to detect if any float is used in the loop
@@ -1180,11 +1182,9 @@
     # ASSEMBLER EMISSION
 
     def emit_label(self, op, arglocs, regalloc):
-        pass
-        # POOL
-        #offset = self.pool.pool_start - self.mc.get_relative_pos()
+        offset = self.pool.pool_start - self.mc.get_relative_pos()
         # load the pool address at each label
-        #self.mc.LARL(r.POOL, l.halfword(offset))
+        self.mc.LARL(r.POOL, l.halfword(offset))
 
     def emit_jump(self, op, arglocs, regalloc):
         # The backend's logic assumes that the target code is in a piece of
@@ -1201,7 +1201,7 @@
         if descr in self.target_tokens_currently_compiling:
             # a label has a LARL instruction that does not need
             # to be executed, thus remove the first opcode
-            self.mc.b_offset(descr._ll_loop_code) # POOL + self.mc.LARL_byte_count)
+            self.mc.b_offset(descr._ll_loop_code + self.mc.LARL_byte_count)
         else:
             # POOL
             #offset = self.pool.get_descr_offset(descr) + \
@@ -1249,11 +1249,11 @@
             gcmap = self._finish_gcmap
         else:
             gcmap = lltype.nullptr(jitframe.GCMAP)
-        self.load_gcmap(self.mc, r.r2, gcmap)
+        self.load_gcmap(self.mc, r.r9, gcmap)
 
-        self.mc.load_imm(r.r3, fail_descr_loc.getint())
-        self.mc.STG(r.r3, l.addr(ofs, r.SPP))
-        self.mc.STG(r.r2, l.addr(ofs2, r.SPP))
+        self.mc.load_imm(r.r10, fail_descr_loc.getint())
+        self.mc.STG(r.r9, l.addr(ofs2, r.SPP))
+        self.mc.STG(r.r10, l.addr(ofs, r.SPP))
 
         # exit function
         self._call_footer()
diff --git a/rpython/jit/backend/zarch/codebuilder.py b/rpython/jit/backend/zarch/codebuilder.py
--- a/rpython/jit/backend/zarch/codebuilder.py
+++ b/rpython/jit/backend/zarch/codebuilder.py
@@ -35,7 +35,6 @@
         GuardToken.__init__(self, cpu, gcmap, descr, failargs, faillocs,
                             guard_opnum, frame_depth)
         self.fcond = fcond
-        # POOL self._pool_offset = -1
 
 class AbstractZARCHBuilder(object):
 
diff --git a/rpython/jit/backend/zarch/helper/assembler.py b/rpython/jit/backend/zarch/helper/assembler.py
--- a/rpython/jit/backend/zarch/helper/assembler.py
+++ b/rpython/jit/backend/zarch/helper/assembler.py
@@ -12,8 +12,7 @@
     l1 = arglocs[1]
     assert not l0.is_imm()
     # do the comparison
-    # POOL self.mc.cmp_op(l0, l1, pool=l1.is_in_pool(), imm=l1.is_imm(), signed=signed, fp=fp)
-    self.mc.cmp_op(l0, l1, imm=l1.is_imm(), signed=signed, fp=fp)
+    self.mc.cmp_op(l0, l1, pool=l1.is_in_pool(), imm=l1.is_imm(), signed=signed, fp=fp)
     self.flush_cc(condition, arglocs[2])
 
 
@@ -30,31 +29,21 @@
     f.name = 'emit_shift_' + func
     return f
 
-def gen_emit_rr(rr_func):
+def gen_emit_rr_rp(rr_func, rp_func):
     def f(self, op, arglocs, regalloc):
         l0, l1 = arglocs
-        getattr(self.mc, rr_func)(l0, l1)
+        if l1.is_in_pool():
+            getattr(self.mc, rp_func)(l0, l1)
+        else:
+            getattr(self.mc, rr_func)(l0, l1)
     return f
 
-# POOL
-#def gen_emit_rr_or_rpool(rr_func, rp_func):
-#    """ the parameters can either be both in registers or
-#        the first is in the register, second in literal pool.
-#    """
-#    def f(self, op, arglocs, regalloc):
-#        l0, l1 = arglocs
-#        if l1.is_imm() and not l1.is_in_pool():
-#            assert 0, "logical imm must reside in pool!"
-#        if l1.is_in_pool():
-#            getattr(self.mc, rp_func)(l0, l1)
-#        else:
-#            getattr(self.mc, rr_func)(l0, l1)
-#    return f
-
-def gen_emit_rr_rh_ri(rr_func, rh_func, ri_func):
+def gen_emit_rr_rh_ri_rp(rr_func, rh_func, ri_func, rp_func):
     def emit(self, op, arglocs, regalloc):
         l0, l1 = arglocs
-        if l1.is_imm():
+        if l1.is_in_pool():
+            getattr(self.mc, rp_func)(l0, l1)
+        elif l1.is_imm():
             if check_imm_value(l1.value):
                 getattr(self.mc, rh_func)(l0, l1)
             else:
@@ -63,27 +52,18 @@
             getattr(self.mc, rr_func)(l0, l1)
     return emit
 
-# POOL
-#def gen_emit_imm_pool_rr(imm_func, pool_func, rr_func):
-#    def emit(self, op, arglocs, regalloc):
-#        l0, l1 = arglocs
-#        if l1.is_in_pool():
-#            getattr(self.mc, pool_func)(l0, l1)
-#        elif l1.is_imm():
-#            getattr(self.mc, imm_func)(l0, l1)
-#        else:
-#            getattr(self.mc, rr_func)(l0, l1)
-#    return emit
-
-def gen_emit_div_mod(rr_func):
+def gen_emit_div_mod(rr_func, rp_func):
     def emit(self, op, arglocs, regalloc):
         lr, lq, l1 = arglocs # lr == remainer, lq == quotient
         # when entering the function lr contains the dividend
         # after this operation either lr or lq is used further
         assert not l1.is_imm(), "imm divider not supported"
-        # remainer is always a even register r0, r2, ... , r14
+        # remainer is always an even register r0, r2, ... , r14
         assert lr.is_even()
         assert lq.is_odd()
         self.mc.XGR(lr, lr)
-        getattr(self.mc,rr_func)(lr, l1)
+        if l1.is_in_pool():
+            getattr(self.mc,rp_func)(lr, l1)
+        else:
+            getattr(self.mc,rr_func)(lr, l1)
     return emit
diff --git a/rpython/jit/backend/zarch/helper/regalloc.py b/rpython/jit/backend/zarch/helper/regalloc.py
--- a/rpython/jit/backend/zarch/helper/regalloc.py
+++ b/rpython/jit/backend/zarch/helper/regalloc.py
@@ -26,8 +26,7 @@
     if check_imm32(a1):
         l1 = imm(a1.getint())
     else:
-        # POOL l1 = self.ensure_reg_or_pool(a1)
-        l1 = self.ensure_reg(a1)
+        l1 = self.ensure_reg_or_pool(a1)
     l0 = self.force_result_in_reg(op, a0)
     return [l0, l1]
 
@@ -39,7 +38,7 @@
     if check_imm32(a1):
         l1 = imm(a1.getint())
     else:
-        l1 = self.ensure_reg(a1)
+        l1 = self.ensure_reg_or_pool(a1)
     l0 = self.force_result_in_reg(op, a0)
     return [l0, l1]
 
@@ -51,7 +50,7 @@
     if check_imm32(a1):
         l1 = imm(a1.getint())
     else:
-        l1 = self.ensure_reg(a1)
+        l1 = self.ensure_reg_or_pool(a1)
     lr,lq = self.rm.ensure_even_odd_pair(a0, op, bind_first=False)
     return [lr, lq, l1]
 
@@ -61,7 +60,7 @@
         a1 = op.getarg(1)
         l1 = self.ensure_reg(a1)
         if isinstance(a0, Const):
-            loc = self.ensure_reg(a0)
+            loc = self.ensure_reg_or_pool(a0)
             lr,lq = self.rm.ensure_even_odd_pair(a0, op,
                                 bind_first=modulus, must_exist=False,
                                 move_regs=False)
@@ -78,7 +77,6 @@
     a0 = op.getarg(0)
     a1 = op.getarg(1)
     # sub is not commotative, thus cannot swap operands
-    # POOL l1 = self.ensure_reg_or_pool(a1)
     l0 = self.ensure_reg(a0)
     l1 = self.ensure_reg(a1)
     res = self.force_allocate_reg(op)
diff --git a/rpython/jit/backend/zarch/opassembler.py b/rpython/jit/backend/zarch/opassembler.py
--- a/rpython/jit/backend/zarch/opassembler.py
+++ b/rpython/jit/backend/zarch/opassembler.py
@@ -3,7 +3,7 @@
         STD_FRAME_SIZE_IN_BYTES)
 from rpython.jit.backend.zarch.arch import THREADLOCAL_ADDR_OFFSET
 from rpython.jit.backend.zarch.helper.assembler import (gen_emit_cmp_op,
-        gen_emit_rr, gen_emit_shift, gen_emit_rr_rh_ri, gen_emit_div_mod)
+        gen_emit_rr_rp, gen_emit_shift, gen_emit_rr_rh_ri_rp, gen_emit_div_mod)
 from rpython.jit.backend.zarch.helper.regalloc import (check_imm,
         check_imm_value)
 from rpython.jit.metainterp.history import (ConstInt)
@@ -28,7 +28,7 @@
 class IntOpAssembler(object):
     _mixin_ = True
 
-    emit_int_add = gen_emit_rr_rh_ri('AGR', 'AGHI', 'AGFI')
+    emit_int_add = gen_emit_rr_rh_ri_rp('AGR', 'AGHI', 'AGFI', 'AG')
     emit_int_add_ovf = emit_int_add
 
     emit_nursery_ptr_increment = emit_int_add
@@ -36,25 +36,16 @@
     def emit_int_sub(self, op, arglocs, regalloc):
         res, l0, l1 = arglocs
         self.mc.SGRK(res, l0, l1)
-        # POOL
-        #if l1.is_imm() and not l1.is_in_pool():
-        #    assert 0, "logical imm must reside in pool!"
-        #if l1.is_in_pool():
-        #    self.mc.SG(l0, l1)
-        #else:
-        #    self.mc.SGR(l0, l1)
 
     emit_int_sub_ovf = emit_int_sub
 
-    emit_int_mul = gen_emit_rr_rh_ri('MSGR', 'MGHI', 'MSGFI')
+    emit_int_mul = gen_emit_rr_rh_ri_rp('MSGR', 'MGHI', 'MSGFI', 'MSG')
     def emit_int_mul_ovf(self, op, arglocs, regalloc):
         lr, lq, l1 = arglocs
-        # POOL
-        # if l1.is_in_pool():
-        #     self.mc.LG(r.SCRATCH, l1)
-        #     l1 = r.SCRATCH
-        # elif
-        if l1.is_imm():
+        if l1.is_in_pool():
+            self.mc.LG(r.SCRATCH, l1)
+            l1 = r.SCRATCH
+        elif l1.is_imm():
             self.mc.LGFI(r.SCRATCH, l1)
             l1 = r.SCRATCH
         else:
@@ -169,11 +160,11 @@
         omc.BRC(c.ANY, l.imm(label_end - jmp_neither_lqlr_overflow))
         omc.overwrite()
 
-    emit_int_floordiv = gen_emit_div_mod('DSGR')
-    emit_uint_floordiv = gen_emit_div_mod('DLGR')
+    emit_int_floordiv = gen_emit_div_mod('DSGR', 'DSG')
+    emit_uint_floordiv = gen_emit_div_mod('DLGR', 'DLG')
     # NOTE division sets one register with the modulo value, thus
     # the regalloc ensures the right register survives.
-    emit_int_mod = gen_emit_div_mod('DSGR')
+    emit_int_mod = gen_emit_div_mod('DSGR', 'DSG')
 
     def emit_int_invert(self, op, arglocs, regalloc):
         l0, = arglocs
@@ -213,9 +204,9 @@
         self.mc.CGHI(l0, l.imm(0))
         self.flush_cc(c.NE, res)
 
-    emit_int_and = gen_emit_rr("NGR")
-    emit_int_or  = gen_emit_rr("OGR")
-    emit_int_xor = gen_emit_rr("XGR")
+    emit_int_and = gen_emit_rr_rp("NGR", "NG")
+    emit_int_or  = gen_emit_rr_rp("OGR", "OG")
+    emit_int_xor = gen_emit_rr_rp("XGR", "XG")
 
     emit_int_rshift  = gen_emit_shift("SRAG")
     emit_int_lshift  = gen_emit_shift("SLLG")
@@ -242,10 +233,10 @@
 class FloatOpAssembler(object):
     _mixin_ = True
 
-    emit_float_add = gen_emit_rr('ADBR')
-    emit_float_sub = gen_emit_rr('SDBR')
-    emit_float_mul = gen_emit_rr('MDBR')
-    emit_float_truediv = gen_emit_rr('DDBR')
+    emit_float_add = gen_emit_rr_rp('ADBR', 'ADB')
+    emit_float_sub = gen_emit_rr_rp('SDBR', 'SDB')
+    emit_float_mul = gen_emit_rr_rp('MDBR', 'MDB')
+    emit_float_truediv = gen_emit_rr_rp('DDBR', 'DDB')
 
     # Support for NaNs: S390X sets condition code to 0x3 (unordered)
     # whenever any operand is nan.
@@ -1072,7 +1063,7 @@
         self._store_force_index(self._find_nearby_operation(regalloc, +1))
         # 'result_loc' is either r2, f0 or None
         self.call_assembler(op, argloc, vloc, result_loc, r.r2)
-        # POOL self.mc.LARL(r.POOL, l.halfword(self.pool.pool_start - self.mc.get_relative_pos()))
+        self.mc.LARL(r.POOL, l.halfword(self.pool.pool_start - self.mc.get_relative_pos()))
 
     emit_call_assembler_i = _genop_call_assembler
     emit_call_assembler_r = _genop_call_assembler
diff --git a/rpython/jit/backend/zarch/pool.py b/rpython/jit/backend/zarch/pool.py
--- a/rpython/jit/backend/zarch/pool.py
+++ b/rpython/jit/backend/zarch/pool.py
@@ -1,5 +1,6 @@
 from rpython.jit.backend.zarch import registers as r
 from rpython.jit.backend.zarch import locations as l
+from rpython.rlib import rgil
 from rpython.jit.metainterp.history import (INT, REF, FLOAT,
         TargetToken)
 from rpython.rlib.objectmodel import we_are_translated
@@ -19,81 +20,25 @@
         self.size = 0
         # the offset to index the pool
         self.pool_start = 0
-        self.label_offset = 0
-        self.label_count = 0
         # for constant offsets
         self.offset_map = {}
         # for descriptors
         self.offset_descr = {}
-        self.constant_64_zeros = -1
-        self.constant_64_ones = -1
-        self.constant_64_sign_bit = -1
-        self.constant_max_64_positive = -1
+
+    def reset(self):
+        self.pool_start = 0
+        self.size = 0
+        self.offset_map = {}
+        self.offset_descr = {}
 
     def ensure_can_hold_constants(self, asm, op):
-        opnum = op.getopnum()
-        if op.is_guard():
-            # 1x gcmap pointer
-            # 1x target address
-            self.offset_descr[op.getdescr()] = self.size
-            self.allocate_slot(2*8)
-        elif op.getopnum() == rop.JUMP:
-            descr = op.getdescr()
-            if descr not in asm.target_tokens_currently_compiling:
-                # this is a 'long' jump instead of a relative jump
-                self.offset_descr[descr] = self.size
-                self.allocate_slot(8)
-        elif op.getopnum() == rop.LABEL:
-            descr = op.getdescr()
-            if descr not in asm.target_tokens_currently_compiling:
-                # this is a 'long' jump instead of a relative jump
-                self.offset_descr[descr] = self.size
-                self.allocate_slot(8)
-        elif op.getopnum() == rop.INT_INVERT:
-            self.constant_64_ones = 1 # we need constant ones!!!
-        elif op.getopnum() == rop.INT_MUL_OVF:
-            self.constant_64_sign_bit = 1
-            self.constant_max_64_positive = 1
-        elif opnum == rop.INT_RSHIFT or opnum == rop.INT_LSHIFT or \
-             opnum == rop.UINT_RSHIFT:
-            a0 = op.getarg(0)
-            if a0.is_constant():
-                self.reserve_literal(8, a0)
+        # allocates 8 bytes in memory for pointers, long integers or floats
+        if op.is_jit_debug():
             return
-        elif opnum == rop.GC_STORE or opnum == rop.GC_STORE_INDEXED:
-            arg = op.getarg(0)
-            if arg.is_constant():
-                self.reserve_literal(8, arg)
-            arg = op.getarg(1)
-            if arg.is_constant():
-                self.reserve_literal(8, arg)
-            arg = op.getarg(2)
-            if arg.is_constant():
-                self.reserve_literal(8, arg)
-            return
-        elif opnum in (rop.GC_LOAD_F,
-                       rop.GC_LOAD_I,
-                       rop.GC_LOAD_R,) \
-             or opnum in (rop.GC_LOAD_INDEXED_F,
-                          rop.GC_LOAD_INDEXED_R,
-                          rop.GC_LOAD_INDEXED_I,):
-            arg = op.getarg(0)
-            if arg.is_constant():
-                self.reserve_literal(8, arg)
-            arg = op.getarg(1)
-            if arg.is_constant():
-                self.reserve_literal(8, arg)
-            return
-        elif op.is_call_release_gil():
-            for arg in op.getarglist()[1:]:
-                if arg.is_constant():
-                    self.reserve_literal(8, arg)
-            return
-        elif opnum == rop.COND_CALL_GC_WB_ARRAY:
-            self.constant_64_ones = 1 # we need constant ones!!!
+
         for arg in op.getarglist():
             if arg.is_constant():
-                self.reserve_literal(8, arg)
+                self.reserve_literal(8, arg, asm)
 
     def contains_constant(self, unique_val):
         return unique_val in self.offset_map
@@ -101,6 +46,10 @@
     def get_descr_offset(self, descr):
         return self.offset_descr[descr]
 
+    def contains_box(self, box):
+        uvalue = self.unique_value(box)
+        return self.contains_constant(uvalue)
+
     def get_offset(self, box):
         assert box.is_constant()
         uvalue = self.unique_value(box)
@@ -108,11 +57,6 @@
             assert self.offset_map[uvalue] >= 0
         return self.offset_map[uvalue]
 
-    def get_direct_offset(self, unique_val):
-        """ Get the offset directly using a unique value,
-            use get_offset if you have a Const box """
-        return self.offset_map[unique_val]
-
     def unique_value(self, val):
         if val.type == FLOAT:
             if val.getfloat() == 0.0:
@@ -124,21 +68,14 @@
             assert val.type == REF
             return rffi.cast(lltype.Signed, val.getref_base())
 
-    def reserve_literal(self, size, box):
+    def reserve_literal(self, size, box, asm):
         uvalue = self.unique_value(box)
-        if uvalue not in self.offset_map:
-            self.offset_map[uvalue] = self.size
-            self.allocate_slot(size)
-
-    def reset(self):
-        self.pool_start = 0
-        self.label_offset = 0
-        self.size = 0
-        self.offset_map = {}
-        self.constant_64_zeros = -1
-        self.constant_64_ones = -1
-        self.constant_64_sign_bit = -1
-        self.constant_max_64_positive = -1
+        if box.type == INT and -2**31 <= uvalue <= 2**31-1:
+            # we do not allocate non 64 bit values, these
+            # can be loaded as imm by LGHI/LGFI
+            return
+        #
+        self._ensure_value(uvalue, asm)
 
     def check_size(self, size=-1):
         if size == -1:
@@ -149,18 +86,19 @@
                 llop.debug_print(lltype.Void, msg)
             raise PoolOverflow(msg)
 
+    def _ensure_value(self, uvalue, asm):
+        if uvalue not in self.offset_map:
+            self.offset_map[uvalue] = self.size
+            self.allocate_slot(8)
+            asm.mc.write_i64(uvalue)
+        return self.offset_map[uvalue]
+
     def allocate_slot(self, size):
         val = self.size + size
         self.check_size(val)
         self.size = val
         assert val >= 0
 
-    def ensure_value(self, val):
-        if val not in self.offset_map:
-            self.offset_map[val] = self.size
-            self.allocate_slot(8)
-        return self.offset_map[val]
-
     def pre_assemble(self, asm, operations, bridge=False):
         # O(len(operations)). I do not think there is a way
         # around this.
@@ -179,27 +117,34 @@
         self.pool_start = asm.mc.get_relative_pos()
         for op in operations:
             self.ensure_can_hold_constants(asm, op)
-        self.ensure_value(asm.cpu.pos_exc_value())
+        self._ensure_value(asm.cpu.pos_exc_value(), asm)
+        # the top of shadow stack
+        gcrootmap = asm.cpu.gc_ll_descr.gcrootmap
+        if gcrootmap and gcrootmap.is_shadow_stack:
+            self._ensure_value(gcrootmap.get_root_stack_top_addr(), asm)
+        # endaddr of insert stack check
+        endaddr, lengthaddr, _ = asm.cpu.insert_stack_check()
+        self._ensure_value(endaddr, asm)
+        # fast gil
+        fastgil = rffi.cast(lltype.Signed, rgil.gil_fetch_fastgil())
+        self._ensure_value(fastgil, asm)
         # TODO add more values that are loaded with load_imm
-        if self.size == 0:
-            # no pool needed!
-            return
-        assert self.size % 2 == 0, "not aligned properly"
-        if self.constant_64_ones != -1:
-            self.constant_64_ones = self.ensure_value(-1)
-        if self.constant_64_zeros != -1:
-            self.constant_64_zeros = self.ensure_value(0x0)
-        if self.constant_64_sign_bit != -1:
-            self.constant_64_sign_bit = self.ensure_value(-2**63) # == 0x8000000000000000
-        if self.constant_max_64_positive != -1:
-            self.constant_max_64_positive = self.ensure_value(0x7fffFFFFffffFFFF)
-        asm.mc.write('\x00' * self.size)
-        wrote = 0
-        for val, offset in self.offset_map.items():
-            self.overwrite_64(asm.mc, offset, val)
-            wrote += 8
 
-    def overwrite_64(self, mc, index, value):
+    # XXX def post_assemble(self, asm):
+    # XXX     mc = asm.mc
+    # XXX     pending_guard_tokens = asm.pending_guard_tokens
+    # XXX     if self.size == 0:
+    # XXX         return
+    # XXX     for guard_token in pending_guard_tokens:
+    # XXX         descr = guard_token.faildescr
+    # XXX         offset = self.offset_descr[descr]
+    # XXX         assert isinstance(offset, int)
+    # XXX         assert offset >= 0
+    # XXX         assert guard_token._pool_offset != -1
+    # XXX         ptr = rffi.cast(lltype.Signed, guard_token.gcmap)
+    # XXX         self._overwrite_64(mc, offset + RECOVERY_GCMAP_POOL_OFFSET, ptr)
+
+    def _overwrite_64(self, mc, index, value):
         index += self.pool_start
 
         mc.overwrite(index,   chr(value >> 56 & 0xff))
@@ -210,17 +155,3 @@
         mc.overwrite(index+5, chr(value >> 16 & 0xff))
         mc.overwrite(index+6, chr(value >> 8 & 0xff))
         mc.overwrite(index+7, chr(value & 0xff))
-
-    def post_assemble(self, asm):
-        mc = asm.mc
-        pending_guard_tokens = asm.pending_guard_tokens
-        if self.size == 0:
-            return
-        for guard_token in pending_guard_tokens:
-            descr = guard_token.faildescr
-            offset = self.offset_descr[descr]
-            assert isinstance(offset, int)
-            assert offset >= 0
-            assert guard_token._pool_offset != -1
-            ptr = rffi.cast(lltype.Signed, guard_token.gcmap)
-            self.overwrite_64(mc, offset + RECOVERY_GCMAP_POOL_OFFSET, ptr)
diff --git a/rpython/jit/backend/zarch/regalloc.py b/rpython/jit/backend/zarch/regalloc.py
--- a/rpython/jit/backend/zarch/regalloc.py
+++ b/rpython/jit/backend/zarch/regalloc.py
@@ -62,44 +62,24 @@
     assert set(save_around_call_regs).issubset(all_regs)
     pool = None
 
-    def convert_to_adr(self, c):
-        assert isinstance(c, ConstFloat)
-        adr = self.assembler.datablockwrapper.malloc_aligned(8, 8)
-        x = c.getfloatstorage()
-        rffi.cast(rffi.CArrayPtr(longlong.FLOATSTORAGE), adr)[0] = x
-        return adr
-
-    def convert_to_imm(self, c):
-        adr = self.convert_to_adr(c)
-        return l.ConstFloatLoc(adr)
-
-    # POOL
-    #def convert_to_imm(self, c):
-    #    off = self.pool.get_offset(c)
-    #    return l.pool(off, float=True)
-
     def __init__(self, longevity, frame_manager=None, assembler=None):
         RegisterManager.__init__(self, longevity, frame_manager, assembler)
 
     def call_result_location(self, v):
         return r.FPR_RETURN
 
-    # POOL
-    # def place_in_pool(self, var):
-    #     offset = self.assembler.pool.get_offset(var)
-    #     return l.pool(offset, float=True)
+    def convert_to_imm(self, c):
+        return l.pool(self.assembler.pool.get_offset(c), float=True)
 
-    # POOL
-    #def ensure_reg_or_pool(self, box):
-    #    if isinstance(box, Const):
-    #        loc = self.get_scratch_reg()
-    #        immvalue = self.convert_to_int(box)
-    #        self.assembler.mc.load_imm(loc, immvalue)
-    #    else:
-    #        assert box in self.temp_boxes
-    #        loc = self.make_sure_var_in_reg(box,
-    #                forbidden_vars=self.temp_boxes)
-    #    return loc
+    def ensure_reg_or_pool(self, box):
+        if isinstance(box, Const):
+            offset = self.assembler.pool.get_offset(box)
+            return l.pool(offset, float=True)
+        else:
+            assert box in self.temp_boxes
+            loc = self.make_sure_var_in_reg(box,
+                    forbidden_vars=self.temp_boxes)
+        return loc
 
     def get_scratch_reg(self):
         box = TempVar()
@@ -109,21 +89,14 @@
 
     def ensure_reg(self, box):
         if isinstance(box, Const):
-            # POOL
-            #poolloc = self.place_in_pool(box)
-            #tmp = TempVar()
-            #reg = self.force_allocate_reg(tmp, self.temp_boxes)
-            #self.temp_boxes.append(tmp)
-            #assert poolloc.displace >= 0
-            #if poolloc.displace <= 2**12-1:
-            #    self.assembler.mc.LD(reg, poolloc)
-            #else:
-            #    self.assembler.mc.LDY(reg, poolloc)
-            loc = self.get_scratch_reg()
-            immadrvalue = self.convert_to_adr(box)
-            mc = self.assembler.mc
-            mc.load_imm(r.SCRATCH, immadrvalue)
-            mc.LD(loc, l.addr(0, r.SCRATCH))
+            offset = self.assembler.pool.get_offset(box)
+            poolloc = l.pool(offset, float=True)
+            reg = self.get_scratch_reg()
+            if poolloc.displace <= 2**11-1:
+                self.assembler.mc.LD(reg, poolloc)
+            else:
+                self.assembler.mc.LDY(reg, poolloc)
+            return reg
         else:
             assert box in self.temp_boxes
             loc = self.make_sure_var_in_reg(box,
@@ -159,32 +132,25 @@
             assert isinstance(c, ConstPtr)
             return rffi.cast(lltype.Signed, c.value)
 
+    def ensure_reg_or_pool(self, box):
+        if isinstance(box, Const):
+            if self.assembler.pool.contains_box(box):
+                offset = self.assembler.pool.get_offset(box)
+                return l.pool(offset)
+            else:
+                return self.ensure_reg(box)
+        else:
+            assert box in self.temp_boxes
+            loc = self.make_sure_var_in_reg(box,
+                    forbidden_vars=self.temp_boxes)
+        return loc
+
     def convert_to_imm(self, c):
-        val = self.convert_to_int(c)
-        return l.imm(val)
+        if self.assembler.pool.contains_box(c):
+            return l.pool(self.assembler.pool.get_offset(c))
+        immvalue = self.convert_to_int(c)
+        return l.imm(immvalue)
 
-    # POOL
-    #def convert_to_imm(self, c):
-    #    off = self.pool.get_offset(c)
-    #    return l.pool(off)
-
-    #def ensure_reg_or_pool(self, box):
-    #    if isinstance(box, Const):
-    #        offset = self.assembler.pool.get_offset(box)
-    #        return l.pool(offset)
-    #    else:
-    #        assert box in self.temp_boxes
-    #        loc = self.make_sure_var_in_reg(box,
-    #                forbidden_vars=self.temp_boxes)
-    #    return loc
-
-    # POOL
-    #offset = self.assembler.pool.get_offset(box)
-    #poolloc = l.pool(offset)
-    #tmp = TempInt()
-    #reg = self.force_allocate_reg(tmp, forbidden_vars=self.temp_boxes)
-    #self.temp_boxes.append(tmp)
-    #self.assembler.mc.LG(reg, poolloc)
     def ensure_reg(self, box):
         if isinstance(box, Const):
             loc = self.get_scratch_reg()
@@ -388,10 +354,10 @@
         self.rm = ZARCHRegisterManager(self.longevity,
                                      frame_manager = self.fm,
                                      assembler = self.assembler)
-        #self.rm.pool = self.assembler.pool
+        self.rm.pool = self.assembler.pool
         self.fprm = FPRegisterManager(self.longevity, frame_manager = self.fm,
                                       assembler = self.assembler)
-        #self.fprm.pool = self.assembler.pool
+        self.fprm.pool = self.assembler.pool
         return operations
 
     def prepare_loop(self, inputargs, operations, looptoken, allgcrefs):
@@ -607,12 +573,11 @@
         else:
             return self.rm.call_result_location(v)
 
-    # POOL
-    #def ensure_reg_or_pool(self, box):
-    #    if box.type == FLOAT:
-    #        return self.fprm.ensure_reg_or_pool(box)
-    #    else:
-    #        return self.rm.ensure_reg_or_pool(box)
+    def ensure_reg_or_pool(self, box):
+        if box.type == FLOAT:
+            return self.fprm.ensure_reg_or_pool(box)
+        else:
+            return self.rm.ensure_reg_or_pool(box)
 
     def ensure_reg(self, box):
         if box.type == FLOAT:
diff --git a/rpython/jit/backend/zarch/registers.py b/rpython/jit/backend/zarch/registers.py
--- a/rpython/jit/backend/zarch/registers.py
+++ b/rpython/jit/backend/zarch/registers.py
@@ -7,7 +7,7 @@
 [r0,r1,r2,r3,r4,r5,r6,r7,r8,
  r9,r10,r11,r12,r13,r14,r15] = registers
 
-MANAGED_REGS = [r2,r3,r4,r5,r6,r7,r8,r9,r10,r11,r13] # keep this list sorted (asc)!
+MANAGED_REGS = [r2,r3,r4,r5,r6,r7,r8,r9,r10,r11] # keep this list sorted (asc)!
 MANAGED_REG_PAIRS = [(r2,r3), (r4,r5), (r6,r7), (r8,r9), (r10,r11)]
 VOLATILES = [r2,r3,r4,r5,r6]
 SP = r15
@@ -39,6 +39,7 @@
 for _r in MANAGED_FP_REGS:
     ALL_REG_INDEXES[_r] = len(ALL_REG_INDEXES)
 # NOT used, but keeps JITFRAME_FIXED_SIZE even
+ALL_REG_INDEXES[f15] = len(ALL_REG_INDEXES)
 JITFRAME_FIXED_SIZE = len(ALL_REG_INDEXES)
 
 def odd_reg(r):
diff --git a/rpython/jit/backend/zarch/test/test_pool.py b/rpython/jit/backend/zarch/test/test_pool.py
--- a/rpython/jit/backend/zarch/test/test_pool.py
+++ b/rpython/jit/backend/zarch/test/test_pool.py
@@ -12,13 +12,18 @@
 from rpython.jit.backend.detect_cpu import getcpuclass
 from rpython.jit.tool.oparser import parse
 
+class FakeAsm(object):
+    def write_i64(self, val):
+        pass
+
 class TestPoolZARCH(object):
     def setup_class(self):
         self.calldescr = None
 
     def setup_method(self, name):
         self.pool = LiteralPool()
-        self.asm = None
+        self.asm = FakeAsm()
+        self.asm.mc = FakeAsm()
         self.cpu = getcpuclass()(None, None)
         self.cpu.setup_once()
 
@@ -34,20 +39,20 @@
             return False
 
     def test_constant_in_call_malloc(self):
-        c = ConstPtr(rffi.cast(llmemory.GCREF, 0xdeadbeef))
+        c = ConstPtr(rffi.cast(llmemory.GCREF, 0xdeadbeef1234))
         self.ensure_can_hold(rop.CALL_MALLOC_GC, [c], descr=self.calldescr)
         assert self.const_in_pool(c)
-        assert self.const_in_pool(ConstPtr(rffi.cast(llmemory.GCREF, 0xdeadbeef)))
+        assert self.const_in_pool(ConstPtr(rffi.cast(llmemory.GCREF, 0xdeadbeef1234)))
 
     @py.test.mark.parametrize('opnum',
             [rop.INT_ADD, rop.INT_SUB, rop.INT_MUL])
     def test_constants_arith(self, opnum):
         for c1 in [ConstInt(1), ConstInt(2**44), InputArgInt(1)]:
-            for c2 in [InputArgInt(1), ConstInt(1), ConstInt(2**55)]:
+            for c2 in [InputArgInt(1), ConstInt(-2**33), ConstInt(2**55)]:
                 self.ensure_can_hold(opnum, [c1,c2])
-                if c1.is_constant():
+                if c1.is_constant() and not -2**31 <= c1.getint() <= 2**31-1:
                     assert self.const_in_pool(c1)
-                if c2.is_constant():
+                if c2.is_constant() and not -2**31 <= c1.getint() <= 2**31-1:
                     assert self.const_in_pool(c2)
 
     def test_pool_overflow(self):
diff --git a/rpython/jit/backend/zarch/test/test_runner.py b/rpython/jit/backend/zarch/test/test_runner.py
--- a/rpython/jit/backend/zarch/test/test_runner.py
+++ b/rpython/jit/backend/zarch/test/test_runner.py
@@ -24,6 +24,6 @@
         cpu.setup_once()
         return cpu
 
-    add_loop_instructions = "lg; lgr; agr; cgfi; jge; j;$"
-    bridge_loop_instructions = "lg; cgfi; jnl; lghi; " \
-                               "iilf;( iihf;)? iilf;( iihf;)? basr; iilf;( iihf;)? br;$"
+    add_loop_instructions = "lg; lgr; larl; agr; cgfi; jge; j;$"
+    bridge_loop_instructions = "larl; lg; cgfi; jnl; lghi; " \
+                               "(lgfi|iilf);( iihf;)? (lgfi|iilf);( iihf;)? basr; (lgfi|iilf);( iihf;)? br;$"

From pypy.commits at gmail.com  Wed Mar  9 03:53:52 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Wed, 09 Mar 2016 00:53:52 -0800 (PST)
Subject: [pypy-commit] pypy s390x-backend: merged default
Message-ID: <56dfe4a0.e853c20a.2f740.34bb@mx.google.com>

Author: Richard Plangger 
Branch: s390x-backend
Changeset: r82900:acc1954c74fa
Date: 2016-03-09 09:52 +0100
http://bitbucket.org/pypy/pypy/changeset/acc1954c74fa/

Log:	merged default

diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -240,6 +240,7 @@
   Kristjan Valur Jonsson
   David Lievens
   Neil Blakey-Milner
+  Sergey Matyunin
   Lutz Paelike
   Lucio Torre
   Lars Wassermann
@@ -271,6 +272,7 @@
   Aaron Tubbs
   Ben Darnell
   Roberto De Ioris
+  Logan Chien
   Juan Francisco Cantero Hurtado
   Ruochen Huang
   Jeong YunWon
diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py
--- a/pypy/doc/conf.py
+++ b/pypy/doc/conf.py
@@ -123,7 +123,7 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # " v documentation".
-#html_title = None
+html_title = 'PyPy documentation'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst
--- a/pypy/doc/contributor.rst
+++ b/pypy/doc/contributor.rst
@@ -210,6 +210,7 @@
   Kristjan Valur Jonsson
   David Lievens
   Neil Blakey-Milner
+  Sergey Matyunin
   Lutz Paelike
   Lucio Torre
   Lars Wassermann
@@ -241,6 +242,7 @@
   Aaron Tubbs
   Ben Darnell
   Roberto De Ioris
+  Logan Chien
   Juan Francisco Cantero Hurtado
   Ruochen Huang
   Jeong YunWon
diff --git a/pypy/doc/cpython_differences.rst b/pypy/doc/cpython_differences.rst
--- a/pypy/doc/cpython_differences.rst
+++ b/pypy/doc/cpython_differences.rst
@@ -265,7 +265,7 @@
         return False
 
     def evil(y):
-        d = {x(): 1}
+        d = {X(): 1}
         X.__eq__ = __evil_eq__
         d[y] # might trigger a call to __eq__?
 
diff --git a/pypy/doc/release-5.0.0.rst b/pypy/doc/release-5.0.0.rst
--- a/pypy/doc/release-5.0.0.rst
+++ b/pypy/doc/release-5.0.0.rst
@@ -2,21 +2,21 @@
 PyPy 5.0
 ========
 
-We have released PyPy 5.0, about three months after PyPy 4.0.1. 
+We have released PyPy 5.0, about three months after PyPy 4.0.1.
 We encourage all users of PyPy to update to this version. Apart from the usual
 bug fixes, there is an ongoing effort to improve the warmup time and memory
 usage of JIT-related metadata. The exact effects depend vastly on the program
 you're running and can range from insignificant to warmup being up to 30%
-faster and memory dropping by about 30%. 
+faster and memory dropping by about 30%.
 
 We also merged a major upgrade to our C-API layer (cpyext), simplifying the
 interaction between c-level objects and PyPy interpreter level objects. As a
-result, lxml  with its cython compiled component `passes all tests`_ on PyPy
+result, lxml  (prerelease) with its cython compiled component
+`passes all tests`_ on PyPy. The new cpyext is also much faster.
 
-Users who have gotten used to vmprof_ on Linux, and those on other platforms
-who have not yet tried its awesomeness, will be happy to hear that vmprof
-now just works on MacOS and Windows too, in both PyPy (built-in support) and
-CPython (as an installed module).
+vmprof_ has been a go-to profiler for PyPy on linux for a few releases
+and we're happy to announce that thanks to the cooperation with jetbrains,
+vmprof now works on Linux, OS X and Windows on both PyPy and CPython.
 
 You can download the PyPy 5.0 release here:
 
@@ -25,20 +25,20 @@
 We would like to thank our donors for the continued support of the PyPy
 project.
 
-We would also like to thank our contributors and 
+We would also like to thank our contributors and
 encourage new people to join the project. PyPy has many
 layers and we need help with all of them: `PyPy`_ and `RPython`_ documentation
-improvements, tweaking popular `modules`_ to run on pypy, or general `help`_ 
-with making RPython's JIT even better. 
+improvements, tweaking popular `modules`_ to run on pypy, or general `help`_
+with making RPython's JIT even better.
 
 CFFI
 ====
 
 While not applicable only to PyPy, `cffi`_ is arguably our most significant
-contribution to the python ecosystem. PyPy 5.0 ships with 
-`cffi-1.5.2`_ which now allows embedding PyPy (or cpython) in a c program.
+contribution to the python ecosystem. PyPy 5.0 ships with
+`cffi-1.5.2`_ which now allows embedding PyPy (or cpython) in a C program.
 
-.. _`PyPy`: http://doc.pypy.org 
+.. _`PyPy`: http://doc.pypy.org
 .. _`RPython`: https://rpython.readthedocs.org
 .. _`cffi`: https://cffi.readthedocs.org
 .. _`cffi-1.5.2`: http://cffi.readthedocs.org/en/latest/whatsnew.html#v1-5-2
@@ -52,18 +52,18 @@
 =============
 
 PyPy is a very compliant Python interpreter, almost a drop-in replacement for
-CPython 2.7. It's fast (`pypy and cpython 2.7.x`_ performance comparison)
+CPython 2.7. It's fast (`PyPy and CPython 2.7.x`_ performance comparison)
 due to its integrated tracing JIT compiler.
 
 We also welcome developers of other
 `dynamic languages`_ to see what RPython can do for them.
 
 This release supports **x86** machines on most common operating systems
-(Linux 32/64, Mac OS X 64, Windows 32, OpenBSD, freebsd),
+(Linux 32/64, Mac OS X 64, Windows 32, OpenBSD, FreeBSD),
 newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux, and the
-big- and little-endian variants of **ppc64** running Linux.
+big- and little-endian variants of **PPC64** running Linux.
 
-.. _`pypy and cpython 2.7.x`: http://speed.pypy.org
+.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
 .. _`dynamic languages`: http://pypyjs.org
 
 Other Highlights (since 4.0.1 released in November 2015)
@@ -103,7 +103,7 @@
 
   * More completely support datetime, optimize timedelta creation
 
-  * Fix for issue 2185 which caused an inconsistent list of operations to be
+  * Fix for issue #2185 which caused an inconsistent list of operations to be
     generated by the unroller, appeared in a complicated DJango app
 
   * Fix an elusive issue with stacklets on shadowstack which showed up when
@@ -128,9 +128,6 @@
   * Fix for corner case (likely shown by Krakatau) for consecutive guards with
     interdependencies
 
-  * Fix applevel bare class method comparisons which should fix pretty printing
-    in IPython
-
   * Issues reported with our previous release were resolved_ after reports from users on
     our issue tracker at https://bitbucket.org/pypy/pypy/issues or on IRC at
     #pypy
@@ -150,49 +147,60 @@
   * Support partition() as an app-level function, together with a cffi wrapper
     in pypy/numpy, this now provides partial support for partition()
 
-* Performance improvements and refactorings:
+* Performance improvements:
 
-  * Refactor and improve exception analysis in the annotator
-
-  * Remove unnecessary special handling of space.wrap().
+  * Optimize global lookups
 
   * Improve the memory signature of numbering instances in the JIT. This should
     massively decrease the amount of memory consumed by the JIT, which is
     significant for most programs. Also compress the numberings using variable-
     size encoding
 
+  * Optimize string concatenation
+
+  * Use INT_LSHIFT instead of INT_MUL when possible
+
+  * Improve struct.unpack by casting directly from the underlying buffer.
+    Unpacking floats and doubles is about 15 times faster, and integer types
+    about 50% faster (on 64 bit integers). This was then subsequently
+    improved further in optimizeopt.py.
+
+  * Optimize two-tuple lookups in mapdict, which improves warmup of instance
+    variable access somewhat
+
+  * Reduce all guards from int_floordiv_ovf if one of the arguments is constant
+
+  * Identify permutations of attributes at instance creation, reducing the
+    number of bridges created
+
+  * Greatly improve re.sub() performance
+
+
+* Internal refactorings:
+
+  * Refactor and improve exception analysis in the annotator
+
+  * Remove unnecessary special handling of space.wrap().
+
   * Support list-resizing setslice operations in RPython
 
   * Tweak the trace-too-long heuristic for multiple jit drivers
 
   * Refactor bookkeeping (such a cool word - three double letters) in the
     annotater
-    
+
   * Refactor wrappers for OS functions from rtyper to rlib and simplify them
 
   * Simplify backend loading instructions to only use four variants
 
-  * Optimize string concatination
-
   * Simplify GIL handling in non-jitted code
 
-  * Use INT_LSHIFT instead of INT_MUL when possible
-
-  * Improve struct.unpack by casting directly from the underlying buffer. 
-    Unpacking floats and doubles is about 15 times faster, and integer types
-    about 50% faster (on 64 bit integers). This was then subsequently
-    improved further in optimizeopt.py.
-
   * Refactor naming in optimizeopt
 
   * Change GraphAnalyzer to use a more precise way to recognize external
     functions and fix null pointer handling, generally clean up external
     function handling
 
-  * Optimize global lookups
-
-  * Optimize two-tuple lookups in mapdict
-
   * Remove pure variants of ``getfield_gc_*`` operations from the JIT by
     determining purity while tracing
 
@@ -203,17 +211,10 @@
   * Refactor rtyper debug code into python.rtyper.debug
 
   * Seperate structmember.h from Python.h Also enhance creating api functions
-    to specify which header file they appear in (previously only pypy_decl.h) 
-
-  * Reduce all guards from int_floordiv_ovf if one of the arguments is constant
+    to specify which header file they appear in (previously only pypy_decl.h)
 
   * Fix tokenizer to enforce universal newlines, needed for Python 3 support
 
-  * Identify permutations of attributes at instance creation, reducing the
-    number of bridges created
-
-  * Greatly improve re.sub() performance
-
 .. _resolved: http://doc.pypy.org/en/latest/whatsnew-5.0.0.html
 .. _`hypothesis`: http://hypothesis.readthedocs.org
 .. _`blog post`: http://morepypy.blogspot.com/2016/02/c-api-support-update.html
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -60,10 +60,10 @@
     Must be smaller than 1.0
     """
     w_modules = space.sys.get('modules')
-    if space.contains_w(w_modules, space.wrap('_continuation')):
-        space.warn(space.wrap("Using _continuation/greenlet/stacklet together "
-                              "with vmprof will crash"),
-                   space.w_RuntimeWarning)
+    #if space.contains_w(w_modules, space.wrap('_continuation')):
+    #    space.warn(space.wrap("Using _continuation/greenlet/stacklet together "
+    #                          "with vmprof will crash"),
+    #               space.w_RuntimeWarning)
     try:
         rvmprof.enable(fileno, period)
     except rvmprof.VMProfError, e:
diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -1,7 +1,7 @@
 # Edit these appropriately before running this script
-maj=4
+maj=5
 min=0
-rev=1
+rev=0
 # This script will download latest builds from the buildmaster, rename the top
 # level directory, and repackage ready to be uploaded to bitbucket. It will also
 # download source, assuming a tag for the release already exists, and repackage them.
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 # hypothesis is used for test generation on untranslated jit tests
 hypothesis
-
+enum>=0.4.6 # is a dependency, but old pip does not pick it up
diff --git a/rpython/doc/conf.py b/rpython/doc/conf.py
--- a/rpython/doc/conf.py
+++ b/rpython/doc/conf.py
@@ -59,7 +59,7 @@
 
 # General information about the project.
 project = u'RPython'
-copyright = u'2015, The PyPy Project'
+copyright = u'2016, The PyPy Project'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -121,7 +121,7 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # " v documentation".
-#html_title = None
+html_title = 'RPython Documentation'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
diff --git a/rpython/jit/tool/traceviewer.py b/rpython/jit/tool/traceviewer.py
--- a/rpython/jit/tool/traceviewer.py
+++ b/rpython/jit/tool/traceviewer.py
@@ -103,9 +103,9 @@
             self.last_guard = -1
         else:
             # guards can be out of order nowadays
-            groups = sorted(groups)
-            self.first_guard = guard_number(groups[0])
-            self.last_guard = guard_number(groups[-1])
+            groups = sorted(map(guard_number, groups))
+            self.first_guard = groups[0]
+            self.last_guard = groups[-1]
 
     content = property(get_content, set_content)
 
diff --git a/rpython/rlib/rvmprof/src/vmprof_getpc.h b/rpython/rlib/rvmprof/src/vmprof_getpc.h
--- a/rpython/rlib/rvmprof/src/vmprof_getpc.h
+++ b/rpython/rlib/rvmprof/src/vmprof_getpc.h
@@ -54,6 +54,7 @@
 // It will cause problems for FreeBSD though!, because it turns off
 // the needed __BSD_VISIBLE.
 #ifdef __APPLE__
+#include 
 #define _XOPEN_SOURCE 500
 #endif
 
@@ -144,7 +145,11 @@
 #else
 intptr_t GetPC(ucontext_t *signal_ucontext) {
 #ifdef __APPLE__
+#if ((ULONG_MAX) == (UINT_MAX))
+  return (signal_ucontext->uc_mcontext->__ss.__eip);
+#else
   return (signal_ucontext->uc_mcontext->__ss.__rip);
+#endif
 #else
   return signal_ucontext->PC_FROM_UCONTEXT;   // defined in config.h
 #endif
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -547,6 +547,11 @@
                         relpypath = localpath.relto(pypkgpath.dirname)
                         assert relpypath, ("%r should be relative to %r" %
                             (localpath, pypkgpath.dirname))
+                        if len(relpypath.split(os.path.sep)) > 2:
+                            # pypy detail to agregate the c files by directory,
+                            # since the enormous number of files was causing
+                            # memory issues linking on win32
+                            return os.path.split(relpypath)[0] + '.c'
                         return relpypath.replace('.py', '.c')
             return None
         if hasattr(node.obj, 'graph'):
diff --git a/rpython/translator/c/src/entrypoint.c b/rpython/translator/c/src/entrypoint.c
--- a/rpython/translator/c/src/entrypoint.c
+++ b/rpython/translator/c/src/entrypoint.c
@@ -37,6 +37,7 @@
 # include 
 #endif
 
+RPY_EXPORTED
 void rpython_startup_code(void)
 {
 #ifdef RPY_WITH_GIL
diff --git a/rpython/translator/c/test/test_genc.py b/rpython/translator/c/test/test_genc.py
--- a/rpython/translator/c/test/test_genc.py
+++ b/rpython/translator/c/test/test_genc.py
@@ -596,7 +596,7 @@
     t.context._graphof(foobar_fn).inhibit_tail_call = True
     t.source_c()
     lines = t.driver.cbuilder.c_source_filename.join('..',
-                              'rpython_translator_c_test_test_genc.c').readlines()
+                              'rpython_translator_c_test.c').readlines()
     for i, line in enumerate(lines):
         if '= pypy_g_foobar_fn' in line:
             break
diff --git a/rpython/translator/c/test/test_standalone.py b/rpython/translator/c/test/test_standalone.py
--- a/rpython/translator/c/test/test_standalone.py
+++ b/rpython/translator/c/test/test_standalone.py
@@ -81,7 +81,7 @@
         #
         # verify that the executable re-export symbols, but not too many
         if sys.platform.startswith('linux') and not kwds.get('shared', False):
-            seen_main = False
+            seen = set()
             g = os.popen("objdump -T '%s'" % builder.executable_name, 'r')
             for line in g:
                 if not line.strip():
@@ -91,8 +91,8 @@
                 name = line.split()[-1]
                 if name.startswith('__'):
                     continue
+                seen.add(name)
                 if name == 'main':
-                    seen_main = True
                     continue
                 if name == 'pypy_debug_file':     # ok to export this one
                     continue
@@ -104,7 +104,9 @@
                         "declaration of this C function or global variable"
                         % (name,))
             g.close()
-            assert seen_main, "did not see 'main' exported"
+            # list of symbols that we *want* to be exported:
+            for name in ['main', 'pypy_debug_file', 'rpython_startup_code']:
+                assert name in seen, "did not see '%r' exported" % name
         #
         return t, builder
 
@@ -123,9 +125,9 @@
 
         # Verify that the generated C files have sane names:
         gen_c_files = [str(f) for f in cbuilder.extrafiles]
-        for expfile in ('rpython_rlib_rposix.c',
-                        'rpython_rtyper_lltypesystem_rstr.c',
-                        'rpython_translator_c_test_test_standalone.c'):
+        for expfile in ('rpython_rlib.c',
+                        'rpython_rtyper_lltypesystem.c',
+                        'rpython_translator_c_test.c'):
             assert cbuilder.targetdir.join(expfile) in gen_c_files
 
     def test_print(self):
diff --git a/rpython/translator/interactive.py b/rpython/translator/interactive.py
--- a/rpython/translator/interactive.py
+++ b/rpython/translator/interactive.py
@@ -32,12 +32,6 @@
         self.context.viewcg()
 
     def ensure_setup(self, argtypes=None, policy=None):
-        standalone = argtypes is None
-        if standalone:
-            assert argtypes is None
-        else:
-            if argtypes is None:
-                argtypes = []
         self.driver.setup(self.entry_point, argtypes, policy,
                           empty_translator=self.context)
         self.ann_argtypes = argtypes

From pypy.commits at gmail.com  Wed Mar  9 04:40:41 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Wed, 09 Mar 2016 01:40:41 -0800 (PST)
Subject: [pypy-commit] pypy s390x-backend: removed skip from signal test
Message-ID: <56dfef99.85b01c0a.7a902.5f27@mx.google.com>

Author: Richard Plangger 
Branch: s390x-backend
Changeset: r82901:2d40f0c2257e
Date: 2016-03-09 10:39 +0100
http://bitbucket.org/pypy/pypy/changeset/2d40f0c2257e/

Log:	removed skip from signal test

diff --git a/pypy/module/__pypy__/test/test_signal.py b/pypy/module/__pypy__/test/test_signal.py
--- a/pypy/module/__pypy__/test/test_signal.py
+++ b/pypy/module/__pypy__/test/test_signal.py
@@ -2,12 +2,6 @@
 
 from pypy.module.thread.test.support import GenericTestThread
 
-import os
-if os.uname()[4] == 's390x':
-    # TMP!!!
-    import py
-    py.test.skip("skip for now s390x")
-
 class AppTestMinimal:
     spaceconfig = dict(usemodules=['__pypy__'])
 

From pypy.commits at gmail.com  Wed Mar  9 04:58:13 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Wed, 09 Mar 2016 01:58:13 -0800 (PST)
Subject: [pypy-commit] buildbot default: replaced python vm for building
 pypy with pypy! builds for s390x now spawn NOT at the same time,
 but shifted by 2-3h
Message-ID: <56dff3b5.2968c20a.fdbf4.5eb9@mx.google.com>

Author: Richard Plangger 
Branch: 
Changeset: r991:2041ec4f50e8
Date: 2016-03-09 10:57 +0100
http://bitbucket.org/pypy/buildbot/changeset/2041ec4f50e8/

Log:	replaced python vm for building pypy with pypy! builds for s390x now
	spawn NOT at the same time, but shifted by 2-3h

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -66,8 +66,7 @@
                                                             platform='linux64')
 pypyTranslatedAppLevelTestFactoryS390X = pypybuilds.Translated(lib_python=True,
                                                                app_tests=True,
-                                                               platform='s390x',
-                                                               interpreter='python')
+                                                               platform='s390x')
 
 # these are like the two above: the only difference is that they only run
 # lib-python tests,not -A tests
@@ -156,9 +155,7 @@
     targetArgs=[],
     lib_python=True,
     pypyjit=True,
-    app_tests=True,
-    interpreter='python', # use cpython for now
-    )
+    app_tests=True)
 
 pypyJITBenchmarkFactory_tannit = pypybuilds.JITBenchmark(host='tannit')
 pypyJITBenchmarkFactory64_tannit = pypybuilds.JITBenchmark(platform='linux64',
@@ -289,12 +286,6 @@
             PYPYBUILDBOT               # on cobra
             ], branch='default', hour=0, minute=0),
 
-        Nightly("nightly-0-01", [
-            LINUX_S390X,               # vm (ibm-research)
-            JITLINUX_S390X,            # vm (ibm-research)
-            APPLVLLINUX_S390X,         # vm (ibm-research)
-            ], branch='s390x-backend', hour=2, minute=0),
-
         Nightly("nightly-1-00", [
             LINUX64,                   # on speed-old, uses all cores
             JITBENCH,                  # on tannit32, uses 1 core (in part exclusively)
@@ -316,6 +307,11 @@
             APPLVLLINUX64,             # on speed-old, uses 1 core
             ], branch="py3.3", hour=3, minute=0),
 
+        # S390X vm (ibm-research)
+        Nightly("nightly-4-00", [LINUX_S390X], branch='s390x-backend', hour=0, minute=0),
+        Nightly("nightly-4-01", [JITLINUX_S390X], branch='s390x-backend', hour=2, minute=0),
+        Nightly("nightly-4-02", [APPLVLLINUX_S390X], branch='s390x-backend', hour=5, minute=0),
+
         # this one has faithfully run every night even though the latest
         # change to that branch was in January 2013.  Re-enable one day.
         #Nightly("nighly-ppc", [
@@ -327,22 +323,18 @@
                         PYPYBUILDBOT,
                         LINUX32,
                         LINUX64,
-                        LINUX_S390X,
 
                         MACOSX32,
                         WIN32,
                         APPLVLLINUX32,
                         APPLVLLINUX64,
-                        APPLVLLINUX_S390X,
                         APPLVLWIN32,
 
                         LIBPYTHON_LINUX32,
                         LIBPYTHON_LINUX64,
-                        LIBPYTHON_LINUX_S390X,
 
                         JITLINUX32,
                         JITLINUX64,
-                        JITLINUX_S390X,
                         JITMACOSX64,
                         JITWIN32,
                         JITFREEBSD964,
@@ -360,6 +352,12 @@
                         #JITFREEBSD764,
                         #JITFREEBSD864,
                         #JITINDIANA32,
+
+                        LINUX_S390X,
+                        APPLVLLINUX_S390X,
+                        LIBPYTHON_LINUX_S390X,
+                        JITLINUX_S390X,
+
             ] + ARM.builderNames, properties=[]),
     ] + ARM.schedulers,
 
@@ -384,13 +382,6 @@
                    "category": 'linux64',
                    #"locks": [TannitCPU.access('counting')],
                   },
-                  {"name": LINUX_S390X,
-                   "slavenames": ["dje"],
-                   "builddir": LINUX_S390X,
-                   "factory": pypyOwnTestFactory,
-                   "category": 's390x',
-                   #"locks": [TannitCPU.access('counting')],
-                  },
                   {"name": APPLVLLINUX32,
                    #"slavenames": ["allegro32"],
                    "slavenames": ["tannit32"],
@@ -406,13 +397,6 @@
                    "category": "linux64",
                    #"locks": [TannitCPU.access('counting')],
                   },
-                  {"name": APPLVLLINUX_S390X,
-                   "slavenames": ["dje"],
-                   "builddir": APPLVLLINUX_S390X,
-                   "factory": pypyTranslatedAppLevelTestFactoryS390X,
-                   "category": "s390x",
-                   #"locks": [TannitCPU.access('counting')],
-                  },
                   {"name": LIBPYTHON_LINUX32,
                    "slavenames": ["tannit32"],
                    #"slavenames": ["allegro32"],
@@ -428,13 +412,6 @@
                    "category": "linux64",
                    #"locks": [TannitCPU.access('counting')],
                   },
-                  {"name": LIBPYTHON_LINUX_S390X,
-                   "slavenames": ["dje"],
-                   "builddir": LIBPYTHON_LINUX_S390X,
-                   "factory": pypyTranslatedLibPythonTestFactory,
-                   "category": "s390x",
-                   #"locks": [TannitCPU.access('counting')],
-                  },
                   {"name" : JITLINUX32,
                    #"slavenames": ["allegro32"],
                    "slavenames": ["tannit32"],
@@ -548,7 +525,26 @@
                    'builddir': PYPYBUILDBOT,
                    'factory': pypybuilds.PyPyBuildbotTestFactory(),
                    'category': 'buildbot',
-                   }
+                  },
+                  # S390X
+                  {"name": LINUX_S390X,
+                   "slavenames": ["dje"],
+                   "builddir": LINUX_S390X,
+                   "factory": pypyOwnTestFactory,
+                   "category": 's390x',
+                  },
+                  {"name": APPLVLLINUX_S390X,
+                   "slavenames": ["dje"],
+                   "builddir": APPLVLLINUX_S390X,
+                   "factory": pypyTranslatedAppLevelTestFactoryS390X,
+                   "category": "s390x",
+                  },
+                  {"name": LIBPYTHON_LINUX_S390X,
+                   "slavenames": ["dje"],
+                   "builddir": LIBPYTHON_LINUX_S390X,
+                   "factory": pypyTranslatedLibPythonTestFactory,
+                   "category": "s390x",
+                  },
 
                 ] + ARM.builders,
 

From pypy.commits at gmail.com  Wed Mar  9 07:13:33 2016
From: pypy.commits at gmail.com (fijal)
Date: Wed, 09 Mar 2016 04:13:33 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: do a hack in history to
 record the operations *earlier* than we have inputargs
Message-ID: <56e0136d.aa09c20a.ddddb.ffff88b7@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82903:bd97c8e4e94b
Date: 2016-03-09 14:12 +0200
http://bitbucket.org/pypy/pypy/changeset/bd97c8e4e94b/

Log:	do a hack in history to record the operations *earlier* than we have
	inputargs

diff --git a/rpython/jit/metainterp/history.py b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -642,17 +642,26 @@
 
 class History(object):
     ends_with_jump = False
+    trace = None
 
     def __init__(self):
         self.descr_cache = {}
         self.descrs = {}
         self.consts = []
+        self._cache = []
 
     def set_inputargs(self, inpargs):
         from rpython.jit.metainterp.opencoder import Trace
 
         self.trace = Trace(inpargs)
         self.inputargs = inpargs
+        if self._cache:
+            # hack to record the ops *after* we know our inputargs
+            for op in self._cache:
+                newop = self.trace.record_op(op.getopnum(), op.getarglist(),
+                                             op.getdescr())
+                op.position = newop.position
+            self._cache = None
 
     def length(self):
         return self.trace._count
@@ -668,7 +677,11 @@
 
     @specialize.argtype(3)
     def record(self, opnum, argboxes, value, descr=None):
-        op = self.trace.record_op(opnum, argboxes, descr)
+        if self.trace is None:
+            op = ResOperation(opnum, argboxes, -1, descr)
+            self._cache.append(op)
+        else:
+            op = self.trace.record_op(opnum, argboxes, descr)
         if value is None:
             assert op.type == 'v'
         elif isinstance(value, bool):
diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -63,7 +63,7 @@
         if force_inputargs is not None:
             self.inputargs = [rop.inputarg_from_tp(arg.type) for
                               arg in force_inputargs]
-            self._inputargs = [None] * len(force_inputargs)
+            self._inputargs = [None] * len(trace.inputargs)
             for i, arg in enumerate(force_inputargs):
                 if arg.position >= 0:
                     self._cache[arg.position] = self.inputargs[i]
diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -303,8 +303,7 @@
                 patchguardop = self.optimizer.patchguardop
                 for guard in extra_guards.extra_guards:
                     if isinstance(guard, GuardResOp):
-                        guard.rd_snapshot = patchguardop.rd_snapshot
-                        guard.rd_frame_info_list = patchguardop.rd_frame_info_list
+                        guard.rd_resume_position = patchguardop.rd_resume_position
                         guard.setdescr(compile.ResumeAtPositionDescr())
                     self.send_extra_operation(guard)
             except VirtualStatesCantMatch:
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -444,7 +444,7 @@
             if other.level == LEVEL_UNKNOWN:
                 if (runtime_box and runtime_box.nonnull() and
               self.known_class.same_constant(cpu.ts.cls_of_box(runtime_box))):
-                    op = ResOperation(rop.GUARD_NONNULL_CLASS, [box, self.known_class], None)
+                    op = ResOperation(rop.GUARD_NONNULL_CLASS, [box, self.known_class])
                     extra_guards.append(op)
                     return
                 else:
@@ -452,7 +452,7 @@
             elif other.level == LEVEL_NONNULL:
                 if (runtime_box and self.known_class.same_constant(
                         cpu.ts.cls_of_box(runtime_box))):
-                    op = ResOperation(rop.GUARD_CLASS, [box, self.known_class], None)
+                    op = ResOperation(rop.GUARD_CLASS, [box, self.known_class])
                     extra_guards.append(op)
                     return
                 else:
@@ -476,7 +476,7 @@
                     return
                 raise VirtualStatesCantMatch("different constants")
             if runtime_box is not None and self.constbox.same_constant(runtime_box.constbox()):
-                op = ResOperation(rop.GUARD_VALUE, [box, self.constbox], None)
+                op = ResOperation(rop.GUARD_VALUE, [box, self.constbox])
                 extra_guards.append(op)
                 return
             else:

From pypy.commits at gmail.com  Wed Mar  9 07:13:32 2016
From: pypy.commits at gmail.com (fijal)
Date: Wed, 09 Mar 2016 04:13:32 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: yay, fix the retracing
Message-ID: <56e0136c.29cec20a.2cd69.ffff8d0f@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82902:ed279ae0f4f6
Date: 2016-03-09 13:35 +0200
http://bitbucket.org/pypy/pypy/changeset/ed279ae0f4f6/

Log:	yay, fix the retracing

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -338,7 +338,7 @@
 
     end_label = ResOperation(rop.LABEL, inputargs[:],
                              descr=loop_jitcell_token)
-    cut_pos = history.get_trace_position()
+    #cut_pos = history.get_trace_position()
     history.record(rop.JUMP, jumpargs[:], None, descr=loop_jitcell_token)
     enable_opts = jitdriver_sd.warmstate.enable_opts
     call_pure_results = metainterp.call_pure_results
diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -63,12 +63,16 @@
         if force_inputargs is not None:
             self.inputargs = [rop.inputarg_from_tp(arg.type) for
                               arg in force_inputargs]
+            self._inputargs = [None] * len(force_inputargs)
             for i, arg in enumerate(force_inputargs):
                 if arg.position >= 0:
                     self._cache[arg.position] = self.inputargs[i]
+                else:
+                    self._inputargs[-arg.position-1] = self.inputargs[i]
         else:
             self.inputargs = [rop.inputarg_from_tp(arg.type) for
                               arg in self.trace.inputargs]
+            self._inputargs = self.inputargs[:]
         self.start = start
         self.pos = start
         self._count = 0
@@ -76,7 +80,7 @@
 
     def _get(self, i):
         if i < 0:
-            return self.inputargs[-i - 1]
+            return self._inputargs[-i - 1]
         res = self._cache[i]
         assert res is not None
         return res
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_util.py b/rpython/jit/metainterp/optimizeopt/test/test_util.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_util.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_util.py
@@ -454,6 +454,10 @@
         def log_loop(*args, **kwds):
             pass
 
+        @classmethod
+        def log_loop_from_trace(*args, **kwds):
+            pass
+
     class logger_ops:
         repr_of_resop = repr
 

From pypy.commits at gmail.com  Wed Mar  9 07:16:45 2016
From: pypy.commits at gmail.com (fijal)
Date: Wed, 09 Mar 2016 04:16:45 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: fix check_history
Message-ID: <56e0142d.8b941c0a.4de56.6c6e@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82904:091da4a9fe3a
Date: 2016-03-09 14:15 +0200
http://bitbucket.org/pypy/pypy/changeset/091da4a9fe3a/

Log:	fix check_history

diff --git a/rpython/jit/metainterp/history.py b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -753,7 +753,6 @@
     compiled_count = 0
     enter_count = 0
     aborted_count = 0
-    operations = None
 
     def __init__(self):
         self.loops = []
@@ -780,9 +779,7 @@
         self.jitcell_token_wrefs.append(weakref.ref(token))
 
     def set_history(self, history):
-        # XXX think about something
-        pass
-        #self.operations = history.operations
+        self.history = history
 
     def aborted(self):
         self.aborted_count += 1
@@ -819,7 +816,9 @@
 
     def check_history(self, expected=None, **check):
         insns = {}
-        for op in self.operations:
+        t = self.history.trace.get_iter()
+        while not t.done():
+            op = t.next()
             opname = op.getopname()
             insns[opname] = insns.get(opname, 0) + 1
         if expected is not None:

From pypy.commits at gmail.com  Wed Mar  9 08:11:10 2016
From: pypy.commits at gmail.com (arigo)
Date: Wed, 09 Mar 2016 05:11:10 -0800 (PST)
Subject: [pypy-commit] pypy default: Test and workaround for issue #2200:
 tries to remove the rpython-level
Message-ID: <56e020ee.cf0b1c0a.629b.ffffcd6a@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r82905:c4c54cb69aba
Date: 2016-03-09 14:04 +0100
http://bitbucket.org/pypy/pypy/changeset/c4c54cb69aba/

Log:	Test and workaround for issue #2200: tries to remove the rpython-
	level recursion that can rarely occur after failing a guard in the
	jit

diff --git a/rpython/jit/metainterp/blackhole.py b/rpython/jit/metainterp/blackhole.py
--- a/rpython/jit/metainterp/blackhole.py
+++ b/rpython/jit/metainterp/blackhole.py
@@ -1148,35 +1148,45 @@
 
     @arguments("cpu", "i", "R", "d", returns="i")
     def bhimpl_residual_call_r_i(cpu, func, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_i(func, None, args_r, None, calldescr)
     @arguments("cpu", "i", "R", "d", returns="r")
     def bhimpl_residual_call_r_r(cpu, func, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_r(func, None, args_r, None, calldescr)
     @arguments("cpu", "i", "R", "d")
     def bhimpl_residual_call_r_v(cpu, func, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_v(func, None, args_r, None, calldescr)
 
     @arguments("cpu", "i", "I", "R", "d", returns="i")
     def bhimpl_residual_call_ir_i(cpu, func, args_i, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_i(func, args_i, args_r, None, calldescr)
     @arguments("cpu", "i", "I", "R", "d", returns="r")
     def bhimpl_residual_call_ir_r(cpu, func, args_i, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_r(func, args_i, args_r, None, calldescr)
     @arguments("cpu", "i", "I", "R", "d")
     def bhimpl_residual_call_ir_v(cpu, func, args_i, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_v(func, args_i, args_r, None, calldescr)
 
     @arguments("cpu", "i", "I", "R", "F", "d", returns="i")
     def bhimpl_residual_call_irf_i(cpu, func, args_i,args_r,args_f,calldescr):
+        workaround2200.active = True
         return cpu.bh_call_i(func, args_i, args_r, args_f, calldescr)
     @arguments("cpu", "i", "I", "R", "F", "d", returns="r")
     def bhimpl_residual_call_irf_r(cpu, func, args_i,args_r,args_f,calldescr):
+        workaround2200.active = True
         return cpu.bh_call_r(func, args_i, args_r, args_f, calldescr)
     @arguments("cpu", "i", "I", "R", "F", "d", returns="f")
     def bhimpl_residual_call_irf_f(cpu, func, args_i,args_r,args_f,calldescr):
+        workaround2200.active = True
         return cpu.bh_call_f(func, args_i, args_r, args_f, calldescr)
     @arguments("cpu", "i", "I", "R", "F", "d")
     def bhimpl_residual_call_irf_v(cpu, func, args_i,args_r,args_f,calldescr):
+        workaround2200.active = True
         return cpu.bh_call_v(func, args_i, args_r, args_f, calldescr)
 
     # conditional calls - note that they cannot return stuff
@@ -1204,44 +1214,54 @@
 
     @arguments("cpu", "j", "R", returns="i")
     def bhimpl_inline_call_r_i(cpu, jitcode, args_r):
+        workaround2200.active = True
         return cpu.bh_call_i(jitcode.get_fnaddr_as_int(),
                              None, args_r, None, jitcode.calldescr)
     @arguments("cpu", "j", "R", returns="r")
     def bhimpl_inline_call_r_r(cpu, jitcode, args_r):
+        workaround2200.active = True
         return cpu.bh_call_r(jitcode.get_fnaddr_as_int(),
                              None, args_r, None, jitcode.calldescr)
     @arguments("cpu", "j", "R")
     def bhimpl_inline_call_r_v(cpu, jitcode, args_r):
+        workaround2200.active = True
         return cpu.bh_call_v(jitcode.get_fnaddr_as_int(),
                              None, args_r, None, jitcode.calldescr)
 
     @arguments("cpu", "j", "I", "R", returns="i")
     def bhimpl_inline_call_ir_i(cpu, jitcode, args_i, args_r):
+        workaround2200.active = True
         return cpu.bh_call_i(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, None, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R", returns="r")
     def bhimpl_inline_call_ir_r(cpu, jitcode, args_i, args_r):
+        workaround2200.active = True
         return cpu.bh_call_r(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, None, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R")
     def bhimpl_inline_call_ir_v(cpu, jitcode, args_i, args_r):
+        workaround2200.active = True
         return cpu.bh_call_v(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, None, jitcode.calldescr)
 
     @arguments("cpu", "j", "I", "R", "F", returns="i")
     def bhimpl_inline_call_irf_i(cpu, jitcode, args_i, args_r, args_f):
+        workaround2200.active = True
         return cpu.bh_call_i(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, args_f, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R", "F", returns="r")
     def bhimpl_inline_call_irf_r(cpu, jitcode, args_i, args_r, args_f):
+        workaround2200.active = True
         return cpu.bh_call_r(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, args_f, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R", "F", returns="f")
     def bhimpl_inline_call_irf_f(cpu, jitcode, args_i, args_r, args_f):
+        workaround2200.active = True
         return cpu.bh_call_f(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, args_f, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R", "F")
     def bhimpl_inline_call_irf_v(cpu, jitcode, args_i, args_r, args_f):
+        workaround2200.active = True
         return cpu.bh_call_v(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, args_f, jitcode.calldescr)
 
@@ -1528,6 +1548,8 @@
             if not self.nextblackholeinterp:
                 self._exit_frame_with_exception(current_exc)
             return current_exc
+        finally:
+            workaround2200.active = False
         #
         # pass the frame's return value to the caller
         caller = self.nextblackholeinterp
@@ -1701,3 +1723,10 @@
     #
     _run_forever(firstbh, current_exc)
 convert_and_run_from_pyjitpl._dont_inline_ = True
+
+# ____________________________________________________________
+
+class WorkaroundIssue2200(object):
+    pass
+workaround2200 = WorkaroundIssue2200()
+workaround2200.active = False
diff --git a/rpython/jit/metainterp/test/test_ajit.py b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -4377,3 +4377,30 @@
             assert res == -1
         else:
             assert res == 4294967295
+
+    def test_issue2200_recursion(self):
+        # Reproduces issue #2200.  This test contains no recursion,
+        # but due to an unlikely combination of factors it ends up
+        # creating an RPython-level recursion, one per loop iteration.
+        # The recursion is: blackhole interp from the failing guard ->
+        # does the call to enter() as a normal call -> enter() runs
+        # can_enter_jit() as if we're interpreted -> we enter the JIT
+        # again from the start of the loop -> the guard fails again
+        # during the next iteration -> blackhole interp.  All arrows
+        # in the previous sentence are one or more levels of RPython
+        # function calls.
+        driver = JitDriver(greens=[], reds=["i"])
+        def enter(i):
+            driver.can_enter_jit(i=i)
+        def f():
+            set_param(None, 'trace_eagerness', 999999)
+            i = 0
+            while True:
+                driver.jit_merge_point(i=i)
+                i += 1
+                if i >= 300:
+                    return i
+                promote(i + 1)   # a failing guard
+                enter(i)
+
+        self.meta_interp(f, [])
diff --git a/rpython/jit/metainterp/warmstate.py b/rpython/jit/metainterp/warmstate.py
--- a/rpython/jit/metainterp/warmstate.py
+++ b/rpython/jit/metainterp/warmstate.py
@@ -433,6 +433,14 @@
                     bound_reached(hash, None, *args)
                 return
 
+            # Workaround for issue #2200, maybe temporary.  This is not
+            # a proper fix, but only a hack that should work well enough
+            # for PyPy's main jitdriver...  See test_issue2200_recursion
+            from rpython.jit.metainterp.blackhole import workaround2200
+            if workaround2200.active:
+                workaround2200.active = False
+                return
+
             # Here, we have found 'cell'.
             #
             if cell.flags & (JC_TRACING | JC_TEMPORARY):

From pypy.commits at gmail.com  Wed Mar  9 08:11:12 2016
From: pypy.commits at gmail.com (arigo)
Date: Wed, 09 Mar 2016 05:11:12 -0800 (PST)
Subject: [pypy-commit] pypy default: merge heads
Message-ID: <56e020f0.49f9c20a.8174f.ffffa0c4@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r82906:bd53b782ce3d
Date: 2016-03-09 14:10 +0100
http://bitbucket.org/pypy/pypy/changeset/bd53b782ce3d/

Log:	merge heads

diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -60,10 +60,10 @@
     Must be smaller than 1.0
     """
     w_modules = space.sys.get('modules')
-    if space.contains_w(w_modules, space.wrap('_continuation')):
-        space.warn(space.wrap("Using _continuation/greenlet/stacklet together "
-                              "with vmprof will crash"),
-                   space.w_RuntimeWarning)
+    #if space.contains_w(w_modules, space.wrap('_continuation')):
+    #    space.warn(space.wrap("Using _continuation/greenlet/stacklet together "
+    #                          "with vmprof will crash"),
+    #               space.w_RuntimeWarning)
     try:
         rvmprof.enable(fileno, period)
     except rvmprof.VMProfError, e:
diff --git a/rpython/jit/tool/traceviewer.py b/rpython/jit/tool/traceviewer.py
--- a/rpython/jit/tool/traceviewer.py
+++ b/rpython/jit/tool/traceviewer.py
@@ -103,9 +103,9 @@
             self.last_guard = -1
         else:
             # guards can be out of order nowadays
-            groups = sorted(groups)
-            self.first_guard = guard_number(groups[0])
-            self.last_guard = guard_number(groups[-1])
+            groups = sorted(map(guard_number, groups))
+            self.first_guard = groups[0]
+            self.last_guard = groups[-1]
 
     content = property(get_content, set_content)
 

From pypy.commits at gmail.com  Wed Mar  9 08:38:51 2016
From: pypy.commits at gmail.com (arigo)
Date: Wed, 09 Mar 2016 05:38:51 -0800 (PST)
Subject: [pypy-commit] pypy default: push forward the starting point
Message-ID: <56e0276b.84c9c20a.5eb4d.ffffb29b@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r82907:b238b48f9138
Date: 2016-03-09 14:37 +0100
http://bitbucket.org/pypy/pypy/changeset/b238b48f9138/

Log:	push forward the starting point

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
@@ -3,5 +3,5 @@
 =========================
 
 .. this is a revision shortly after release-5.0
-.. startrev: 7bb6381d084c
+.. startrev: 9c4299dc2d60
 

From pypy.commits at gmail.com  Wed Mar  9 09:57:24 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 06:57:24 -0800 (PST)
Subject: [pypy-commit] pypy default: push forward last starting point
Message-ID: <56e039d4.c16dc20a.1a4b8.ffffd1c3@mx.google.com>

Author: mattip 
Branch: 
Changeset: r82909:4dc888d04ebf
Date: 2016-03-09 16:41 +0200
http://bitbucket.org/pypy/pypy/changeset/4dc888d04ebf/

Log:	push forward last starting point

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
@@ -3,5 +3,5 @@
 =========================
 
 .. this is a revision shortly after release-5.0
-.. startrev: 9c4299dc2d60
+.. startrev: b238b48f9138
 

From pypy.commits at gmail.com  Wed Mar  9 09:57:22 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 06:57:22 -0800 (PST)
Subject: [pypy-commit] pypy release-5.x: merge default into release
Message-ID: <56e039d2.03dd1c0a.62e34.ffffe124@mx.google.com>

Author: mattip 
Branch: release-5.x
Changeset: r82908:fa95fe4dcfe3
Date: 2016-03-09 16:37 +0200
http://bitbucket.org/pypy/pypy/changeset/fa95fe4dcfe3/

Log:	merge default into release

diff --git a/pypy/doc/release-5.0.0.rst b/pypy/doc/release-5.0.0.rst
--- a/pypy/doc/release-5.0.0.rst
+++ b/pypy/doc/release-5.0.0.rst
@@ -15,8 +15,8 @@
 `passes all tests`_ on PyPy. The new cpyext is also much faster.
 
 vmprof_ has been a go-to profiler for PyPy on linux for a few releases
-and we're happy to announce that thanks to commercial cooperation, vmprof
-now works on Linux, OS X and Windows on both PyPy and CPython.
+and we're happy to announce that thanks to the cooperation with jetbrains,
+vmprof now works on Linux, OS X and Windows on both PyPy and CPython.
 
 You can download the PyPy 5.0 release here:
 
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
@@ -3,5 +3,5 @@
 =========================
 
 .. this is a revision shortly after release-5.0
-.. startrev: 7bb6381d084c
+.. startrev: 9c4299dc2d60
 
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -60,10 +60,10 @@
     Must be smaller than 1.0
     """
     w_modules = space.sys.get('modules')
-    if space.contains_w(w_modules, space.wrap('_continuation')):
-        space.warn(space.wrap("Using _continuation/greenlet/stacklet together "
-                              "with vmprof will crash"),
-                   space.w_RuntimeWarning)
+    #if space.contains_w(w_modules, space.wrap('_continuation')):
+    #    space.warn(space.wrap("Using _continuation/greenlet/stacklet together "
+    #                          "with vmprof will crash"),
+    #               space.w_RuntimeWarning)
     try:
         rvmprof.enable(fileno, period)
     except rvmprof.VMProfError, e:
diff --git a/rpython/jit/metainterp/blackhole.py b/rpython/jit/metainterp/blackhole.py
--- a/rpython/jit/metainterp/blackhole.py
+++ b/rpython/jit/metainterp/blackhole.py
@@ -1148,35 +1148,45 @@
 
     @arguments("cpu", "i", "R", "d", returns="i")
     def bhimpl_residual_call_r_i(cpu, func, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_i(func, None, args_r, None, calldescr)
     @arguments("cpu", "i", "R", "d", returns="r")
     def bhimpl_residual_call_r_r(cpu, func, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_r(func, None, args_r, None, calldescr)
     @arguments("cpu", "i", "R", "d")
     def bhimpl_residual_call_r_v(cpu, func, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_v(func, None, args_r, None, calldescr)
 
     @arguments("cpu", "i", "I", "R", "d", returns="i")
     def bhimpl_residual_call_ir_i(cpu, func, args_i, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_i(func, args_i, args_r, None, calldescr)
     @arguments("cpu", "i", "I", "R", "d", returns="r")
     def bhimpl_residual_call_ir_r(cpu, func, args_i, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_r(func, args_i, args_r, None, calldescr)
     @arguments("cpu", "i", "I", "R", "d")
     def bhimpl_residual_call_ir_v(cpu, func, args_i, args_r, calldescr):
+        workaround2200.active = True
         return cpu.bh_call_v(func, args_i, args_r, None, calldescr)
 
     @arguments("cpu", "i", "I", "R", "F", "d", returns="i")
     def bhimpl_residual_call_irf_i(cpu, func, args_i,args_r,args_f,calldescr):
+        workaround2200.active = True
         return cpu.bh_call_i(func, args_i, args_r, args_f, calldescr)
     @arguments("cpu", "i", "I", "R", "F", "d", returns="r")
     def bhimpl_residual_call_irf_r(cpu, func, args_i,args_r,args_f,calldescr):
+        workaround2200.active = True
         return cpu.bh_call_r(func, args_i, args_r, args_f, calldescr)
     @arguments("cpu", "i", "I", "R", "F", "d", returns="f")
     def bhimpl_residual_call_irf_f(cpu, func, args_i,args_r,args_f,calldescr):
+        workaround2200.active = True
         return cpu.bh_call_f(func, args_i, args_r, args_f, calldescr)
     @arguments("cpu", "i", "I", "R", "F", "d")
     def bhimpl_residual_call_irf_v(cpu, func, args_i,args_r,args_f,calldescr):
+        workaround2200.active = True
         return cpu.bh_call_v(func, args_i, args_r, args_f, calldescr)
 
     # conditional calls - note that they cannot return stuff
@@ -1204,44 +1214,54 @@
 
     @arguments("cpu", "j", "R", returns="i")
     def bhimpl_inline_call_r_i(cpu, jitcode, args_r):
+        workaround2200.active = True
         return cpu.bh_call_i(jitcode.get_fnaddr_as_int(),
                              None, args_r, None, jitcode.calldescr)
     @arguments("cpu", "j", "R", returns="r")
     def bhimpl_inline_call_r_r(cpu, jitcode, args_r):
+        workaround2200.active = True
         return cpu.bh_call_r(jitcode.get_fnaddr_as_int(),
                              None, args_r, None, jitcode.calldescr)
     @arguments("cpu", "j", "R")
     def bhimpl_inline_call_r_v(cpu, jitcode, args_r):
+        workaround2200.active = True
         return cpu.bh_call_v(jitcode.get_fnaddr_as_int(),
                              None, args_r, None, jitcode.calldescr)
 
     @arguments("cpu", "j", "I", "R", returns="i")
     def bhimpl_inline_call_ir_i(cpu, jitcode, args_i, args_r):
+        workaround2200.active = True
         return cpu.bh_call_i(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, None, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R", returns="r")
     def bhimpl_inline_call_ir_r(cpu, jitcode, args_i, args_r):
+        workaround2200.active = True
         return cpu.bh_call_r(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, None, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R")
     def bhimpl_inline_call_ir_v(cpu, jitcode, args_i, args_r):
+        workaround2200.active = True
         return cpu.bh_call_v(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, None, jitcode.calldescr)
 
     @arguments("cpu", "j", "I", "R", "F", returns="i")
     def bhimpl_inline_call_irf_i(cpu, jitcode, args_i, args_r, args_f):
+        workaround2200.active = True
         return cpu.bh_call_i(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, args_f, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R", "F", returns="r")
     def bhimpl_inline_call_irf_r(cpu, jitcode, args_i, args_r, args_f):
+        workaround2200.active = True
         return cpu.bh_call_r(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, args_f, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R", "F", returns="f")
     def bhimpl_inline_call_irf_f(cpu, jitcode, args_i, args_r, args_f):
+        workaround2200.active = True
         return cpu.bh_call_f(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, args_f, jitcode.calldescr)
     @arguments("cpu", "j", "I", "R", "F")
     def bhimpl_inline_call_irf_v(cpu, jitcode, args_i, args_r, args_f):
+        workaround2200.active = True
         return cpu.bh_call_v(jitcode.get_fnaddr_as_int(),
                              args_i, args_r, args_f, jitcode.calldescr)
 
@@ -1528,6 +1548,8 @@
             if not self.nextblackholeinterp:
                 self._exit_frame_with_exception(current_exc)
             return current_exc
+        finally:
+            workaround2200.active = False
         #
         # pass the frame's return value to the caller
         caller = self.nextblackholeinterp
@@ -1701,3 +1723,10 @@
     #
     _run_forever(firstbh, current_exc)
 convert_and_run_from_pyjitpl._dont_inline_ = True
+
+# ____________________________________________________________
+
+class WorkaroundIssue2200(object):
+    pass
+workaround2200 = WorkaroundIssue2200()
+workaround2200.active = False
diff --git a/rpython/jit/metainterp/test/test_ajit.py b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -4377,3 +4377,30 @@
             assert res == -1
         else:
             assert res == 4294967295
+
+    def test_issue2200_recursion(self):
+        # Reproduces issue #2200.  This test contains no recursion,
+        # but due to an unlikely combination of factors it ends up
+        # creating an RPython-level recursion, one per loop iteration.
+        # The recursion is: blackhole interp from the failing guard ->
+        # does the call to enter() as a normal call -> enter() runs
+        # can_enter_jit() as if we're interpreted -> we enter the JIT
+        # again from the start of the loop -> the guard fails again
+        # during the next iteration -> blackhole interp.  All arrows
+        # in the previous sentence are one or more levels of RPython
+        # function calls.
+        driver = JitDriver(greens=[], reds=["i"])
+        def enter(i):
+            driver.can_enter_jit(i=i)
+        def f():
+            set_param(None, 'trace_eagerness', 999999)
+            i = 0
+            while True:
+                driver.jit_merge_point(i=i)
+                i += 1
+                if i >= 300:
+                    return i
+                promote(i + 1)   # a failing guard
+                enter(i)
+
+        self.meta_interp(f, [])
diff --git a/rpython/jit/metainterp/warmstate.py b/rpython/jit/metainterp/warmstate.py
--- a/rpython/jit/metainterp/warmstate.py
+++ b/rpython/jit/metainterp/warmstate.py
@@ -433,6 +433,14 @@
                     bound_reached(hash, None, *args)
                 return
 
+            # Workaround for issue #2200, maybe temporary.  This is not
+            # a proper fix, but only a hack that should work well enough
+            # for PyPy's main jitdriver...  See test_issue2200_recursion
+            from rpython.jit.metainterp.blackhole import workaround2200
+            if workaround2200.active:
+                workaround2200.active = False
+                return
+
             # Here, we have found 'cell'.
             #
             if cell.flags & (JC_TRACING | JC_TEMPORARY):
diff --git a/rpython/jit/tool/traceviewer.py b/rpython/jit/tool/traceviewer.py
--- a/rpython/jit/tool/traceviewer.py
+++ b/rpython/jit/tool/traceviewer.py
@@ -103,9 +103,9 @@
             self.last_guard = -1
         else:
             # guards can be out of order nowadays
-            groups = sorted(groups)
-            self.first_guard = guard_number(groups[0])
-            self.last_guard = guard_number(groups[-1])
+            groups = sorted(map(guard_number, groups))
+            self.first_guard = groups[0]
+            self.last_guard = groups[-1]
 
     content = property(get_content, set_content)
 

From pypy.commits at gmail.com  Wed Mar  9 10:35:39 2016
From: pypy.commits at gmail.com (arigo)
Date: Wed, 09 Mar 2016 07:35:39 -0800 (PST)
Subject: [pypy-commit] pypy default: An arguably bogus check in the stdlib.
Message-ID: <56e042cb.d4e41c0a.c6818.0823@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r82910:8f04b833f59a
Date: 2016-03-09 16:34 +0100
http://bitbucket.org/pypy/pypy/changeset/8f04b833f59a/

Log:	An arguably bogus check in the stdlib.

diff --git a/lib-python/2.7/xml/etree/ElementTree.py b/lib-python/2.7/xml/etree/ElementTree.py
--- a/lib-python/2.7/xml/etree/ElementTree.py
+++ b/lib-python/2.7/xml/etree/ElementTree.py
@@ -1606,7 +1606,17 @@
                     pubid = pubid[1:-1]
                 if hasattr(self.target, "doctype"):
                     self.target.doctype(name, pubid, system[1:-1])
-                elif self.doctype is not self._XMLParser__doctype:
+                elif 1:  # XXX PyPy fix, used to be
+                         #   elif self.doctype is not self._XMLParser__doctype:
+                         # but that condition is always True on CPython, as far
+                         # as I can tell: self._XMLParser__doctype always
+                         # returns a fresh unbound method object.
+                         # On PyPy, unbound and bound methods have stronger
+                         # unicity guarantees: self._XMLParser__doctype
+                         # can return the same unbound method object, in
+                         # some cases making the test above incorrectly False.
+                         # (My guess would be that the line above is a backport
+                         # from Python 3.)
                     # warn about deprecated call
                     self._XMLParser__doctype(name, pubid, system[1:-1])
                     self.doctype(name, pubid, system[1:-1])

From pypy.commits at gmail.com  Wed Mar  9 11:15:06 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 08:15:06 -0800 (PST)
Subject: [pypy-commit] pypy release-5.x: redo changeset 666871b885d9,
 which was backed out in 1f238bdfca88
Message-ID: <56e04c0a.e6ebc20a.36ac0.ffffee67@mx.google.com>

Author: mattip 
Branch: release-5.x
Changeset: r82911:0ae5f56feb15
Date: 2016-03-09 18:12 +0200
http://bitbucket.org/pypy/pypy/changeset/0ae5f56feb15/

Log:	redo changeset 666871b885d9, which was backed out in 1f238bdfca88

diff --git a/pypy/interpreter/function.py b/pypy/interpreter/function.py
--- a/pypy/interpreter/function.py
+++ b/pypy/interpreter/function.py
@@ -13,6 +13,9 @@
 from pypy.interpreter.argument import Arguments
 from rpython.rlib import jit
 
+from rpython.rlib.rarithmetic import LONG_BIT
+from rpython.rlib.rbigint import rbigint
+
 
 funccallunrolling = unrolling_iterable(range(4))
 
@@ -557,6 +560,26 @@
                 return space.w_False
         return space.eq(self.w_function, w_other.w_function)
 
+    def is_w(self, space, other):
+        if not isinstance(other, Method):
+            return False
+        return (self.w_instance is other.w_instance and
+                self.w_function is other.w_function and
+                self.w_class is other.w_class)
+
+    def immutable_unique_id(self, space):
+        from pypy.objspace.std.util import IDTAG_METHOD as tag
+        from pypy.objspace.std.util import IDTAG_SHIFT
+        if self.w_instance is not None:
+            id = space.bigint_w(space.id(self.w_instance))
+            id = id.lshift(LONG_BIT)
+        else:
+            id = rbigint.fromint(0)
+        id = id.or_(space.bigint_w(space.id(self.w_function)))
+        id = id.lshift(LONG_BIT).or_(space.bigint_w(space.id(self.w_class)))
+        id = id.lshift(IDTAG_SHIFT).int_or_(tag)
+        return space.newlong_from_rbigint(id)
+
     def descr_method_hash(self):
         space = self.space
         w_result = space.hash(self.w_function)
diff --git a/pypy/interpreter/test/test_function.py b/pypy/interpreter/test/test_function.py
--- a/pypy/interpreter/test/test_function.py
+++ b/pypy/interpreter/test/test_function.py
@@ -560,6 +560,37 @@
         assert A().m == X()
         assert X() == A().m
 
+    @pytest.mark.skipif("config.option.runappdirect")
+    def test_method_identity(self):
+        class A(object):
+            def m(self):
+                pass
+            def n(self):
+                pass
+
+        class B(A):
+            pass
+
+        class X(object):
+            def __eq__(self, other):
+                return True
+
+        a = A()
+        a2 = A()
+        assert a.m is a.m
+        assert id(a.m) == id(a.m)
+        assert a.m is not a.n
+        assert id(a.m) != id(a.n)
+        assert a.m is not a2.m
+        assert id(a.m) != id(a2.m)
+
+        assert A.m is A.m
+        assert id(A.m) == id(A.m)
+        assert A.m is not A.n
+        assert id(A.m) != id(A.n)
+        assert A.m is not B.m
+        assert id(A.m) != id(B.m)
+
 
 class TestMethod:
     def setup_method(self, method):
diff --git a/pypy/objspace/std/util.py b/pypy/objspace/std/util.py
--- a/pypy/objspace/std/util.py
+++ b/pypy/objspace/std/util.py
@@ -2,12 +2,13 @@
 
 from pypy.interpreter.error import OperationError, oefmt
 
-IDTAG_SHIFT   = 3
+IDTAG_SHIFT   = 4
 
 IDTAG_INT     = 1
 IDTAG_LONG    = 3
 IDTAG_FLOAT   = 5
 IDTAG_COMPLEX = 7
+IDTAG_METHOD  = 9
 
 CMP_OPS = dict(lt='<', le='<=', eq='==', ne='!=', gt='>', ge='>=')
 BINARY_BITWISE_OPS = {'and': '&', 'lshift': '<<', 'or': '|', 'rshift': '>>',

From pypy.commits at gmail.com  Wed Mar  9 11:15:08 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 08:15:08 -0800 (PST)
Subject: [pypy-commit] pypy release-5.x: redo c7cc35224c29 which was backed
 out in 71586f7de6b0
Message-ID: <56e04c0c.e213c20a.c6806.ffffeef1@mx.google.com>

Author: mattip 
Branch: release-5.x
Changeset: r82912:f989e0a0742a
Date: 2016-03-09 18:13 +0200
http://bitbucket.org/pypy/pypy/changeset/f989e0a0742a/

Log:	redo c7cc35224c29 which was backed out in 71586f7de6b0

diff --git a/pypy/objspace/std/test/test_obj.py b/pypy/objspace/std/test/test_obj.py
--- a/pypy/objspace/std/test/test_obj.py
+++ b/pypy/objspace/std/test/test_obj.py
@@ -172,15 +172,15 @@
     def test_id_on_primitives(self):
         if self.cpython_apptest:
             skip("cpython behaves differently")
-        assert id(1) == (1 << 3) + 1
-        assert id(1l) == (1 << 3) + 3
+        assert id(1) == (1 << 4) + 1
+        assert id(1l) == (1 << 4) + 3
         class myint(int):
             pass
         assert id(myint(1)) != id(1)
 
         assert id(1.0) & 7 == 5
         assert id(-0.0) != id(0.0)
-        assert hex(id(2.0)) == '0x20000000000000005L'
+        assert hex(id(2.0)) == '0x40000000000000005L'
         assert id(0.0) == 5
 
     def test_id_on_strs(self):

From pypy.commits at gmail.com  Wed Mar  9 11:15:09 2016
From: pypy.commits at gmail.com (arigo)
Date: Wed, 09 Mar 2016 08:15:09 -0800 (PST)
Subject: [pypy-commit] pypy release-5.x: An arguably bogus check in the
 stdlib.
Message-ID: <56e04c0d.8ee61c0a.a3473.126a@mx.google.com>

Author: Armin Rigo 
Branch: release-5.x
Changeset: r82913:246c9cf22037
Date: 2016-03-09 16:34 +0100
http://bitbucket.org/pypy/pypy/changeset/246c9cf22037/

Log:	An arguably bogus check in the stdlib.

diff --git a/lib-python/2.7/xml/etree/ElementTree.py b/lib-python/2.7/xml/etree/ElementTree.py
--- a/lib-python/2.7/xml/etree/ElementTree.py
+++ b/lib-python/2.7/xml/etree/ElementTree.py
@@ -1606,7 +1606,17 @@
                     pubid = pubid[1:-1]
                 if hasattr(self.target, "doctype"):
                     self.target.doctype(name, pubid, system[1:-1])
-                elif self.doctype is not self._XMLParser__doctype:
+                elif 1:  # XXX PyPy fix, used to be
+                         #   elif self.doctype is not self._XMLParser__doctype:
+                         # but that condition is always True on CPython, as far
+                         # as I can tell: self._XMLParser__doctype always
+                         # returns a fresh unbound method object.
+                         # On PyPy, unbound and bound methods have stronger
+                         # unicity guarantees: self._XMLParser__doctype
+                         # can return the same unbound method object, in
+                         # some cases making the test above incorrectly False.
+                         # (My guess would be that the line above is a backport
+                         # from Python 3.)
                     # warn about deprecated call
                     self._XMLParser__doctype(name, pubid, system[1:-1])
                     self.doctype(name, pubid, system[1:-1])

From pypy.commits at gmail.com  Wed Mar  9 11:40:44 2016
From: pypy.commits at gmail.com (arigo)
Date: Wed, 09 Mar 2016 08:40:44 -0800 (PST)
Subject: [pypy-commit] pypy default: Playing around with hypothesis
Message-ID: <56e0520c.890bc30a.f4844.fffffbcc@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r82914:d994482a6040
Date: 2016-03-09 17:40 +0100
http://bitbucket.org/pypy/pypy/changeset/d994482a6040/

Log:	Playing around with hypothesis

diff --git a/rpython/rlib/test/test_rbigint.py b/rpython/rlib/test/test_rbigint.py
--- a/rpython/rlib/test/test_rbigint.py
+++ b/rpython/rlib/test/test_rbigint.py
@@ -15,6 +15,8 @@
 from rpython.rtyper.test.test_llinterp import interpret
 from rpython.translator.c.test.test_standalone import StandaloneTests
 
+from hypothesis import given, strategies
+
 long_vals_not_too_big = range(17) + [
         37, 50,
         127, 128, 129, 511, 512, 513, sys.maxint, sys.maxint + 1,
@@ -967,6 +969,14 @@
         py.test.raises(InvalidSignednessError, i.tobytes, 3, 'little', signed=False)
         py.test.raises(OverflowError, i.tobytes, 2, 'little', signed=True)
 
+    @given(strategies.binary(), strategies.booleans(), strategies.booleans())
+    def test_frombytes_tobytes_hypothesis(self, s, big, signed):
+        # check the roundtrip from binary strings to bigints and back
+        byteorder = 'big' if big else 'little'
+        bigint = rbigint.frombytes(s, byteorder=byteorder, signed=signed)
+        t = bigint.tobytes(len(s), byteorder=byteorder, signed=signed)
+        assert s == t
+
 
 class TestTranslated(StandaloneTests):
 

From pypy.commits at gmail.com  Wed Mar  9 12:02:17 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 09:02:17 -0800 (PST)
Subject: [pypy-commit] pypy default: Backed out changeset: b96f63e5e9fd,
 the bugfix made it into the release after all
Message-ID: <56e05719.46fac20a.bff32.0027@mx.google.com>

Author: mattip 
Branch: 
Changeset: r82915:92200db9424a
Date: 2016-03-09 19:00 +0200
http://bitbucket.org/pypy/pypy/changeset/92200db9424a/

Log:	Backed out changeset: b96f63e5e9fd, the bugfix made it into the
	release after all

diff --git a/pypy/doc/release-5.0.0.rst b/pypy/doc/release-5.0.0.rst
--- a/pypy/doc/release-5.0.0.rst
+++ b/pypy/doc/release-5.0.0.rst
@@ -128,6 +128,9 @@
   * Fix for corner case (likely shown by Krakatau) for consecutive guards with
     interdependencies
 
+  * Fix applevel bare class method comparisons which should fix pretty printing
+    in IPython
+
   * Issues reported with our previous release were resolved_ after reports from users on
     our issue tracker at https://bitbucket.org/pypy/pypy/issues or on IRC at
     #pypy

From pypy.commits at gmail.com  Wed Mar  9 12:52:21 2016
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 09 Mar 2016 09:52:21 -0800 (PST)
Subject: [pypy-commit] pypy default: small cleanup
Message-ID: <56e062d5.a3f6c20a.71577.168a@mx.google.com>

Author: Ronan Lamy 
Branch: 
Changeset: r82916:6e82c4562984
Date: 2016-03-09 17:51 +0000
http://bitbucket.org/pypy/pypy/changeset/6e82c4562984/

Log:	small cleanup

diff --git a/pypy/interpreter/mixedmodule.py b/pypy/interpreter/mixedmodule.py
--- a/pypy/interpreter/mixedmodule.py
+++ b/pypy/interpreter/mixedmodule.py
@@ -3,7 +3,7 @@
 from pypy.interpreter import gateway
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.baseobjspace import W_Root
-import os, sys
+import sys
 
 class MixedModule(Module):
     applevel_name = None
@@ -60,7 +60,7 @@
     def save_module_content_for_future_reload(self):
         self.w_initialdict = self.space.call_method(self.w_dict, 'items')
 
-
+    @classmethod
     def get_applevel_name(cls):
         """ NOT_RPYTHON """
         if cls.applevel_name is not None:
@@ -68,7 +68,6 @@
         else:
             pkgroot = cls.__module__
             return pkgroot.split('.')[-1]
-    get_applevel_name = classmethod(get_applevel_name)
 
     def get(self, name):
         space = self.space
@@ -103,7 +102,7 @@
             # be normal Functions to get the correct binding behaviour
             func = w_value
             if (isinstance(func, Function) and
-                type(func) is not BuiltinFunction):
+                    type(func) is not BuiltinFunction):
                 try:
                     bltin = func._builtinversion_
                 except AttributeError:
@@ -115,7 +114,6 @@
             space.setitem(self.w_dict, w_name, w_value)
             return w_value
 
-
     def getdict(self, space):
         if self.lazy:
             for name in self.loaders:
@@ -131,6 +129,7 @@
         self.startup_called = False
         self._frozen = True
 
+    @classmethod
     def buildloaders(cls):
         """ NOT_RPYTHON """
         if not hasattr(cls, 'loaders'):
@@ -149,8 +148,6 @@
             if '__doc__' not in loaders:
                 loaders['__doc__'] = cls.get__doc__
 
-    buildloaders = classmethod(buildloaders)
-
     def extra_interpdef(self, name, spec):
         cls = self.__class__
         pkgroot = cls.__module__
@@ -159,21 +156,21 @@
         w_obj = loader(space)
         space.setattr(space.wrap(self), space.wrap(name), w_obj)
 
+    @classmethod
     def get__doc__(cls, space):
         return space.wrap(cls.__doc__)
-    get__doc__ = classmethod(get__doc__)
 
 
 def getinterpevalloader(pkgroot, spec):
     """ NOT_RPYTHON """
     def ifileloader(space):
-        d = {'space' : space}
+        d = {'space':space}
         # EVIL HACK (but it works, and this is not RPython :-)
         while 1:
             try:
                 value = eval(spec, d)
             except NameError, ex:
-                name = ex.args[0].split("'")[1] # super-Evil
+                name = ex.args[0].split("'")[1]  # super-Evil
                 if name in d:
                     raise   # propagate the NameError
                 try:

From pypy.commits at gmail.com  Wed Mar  9 13:16:20 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 10:16:20 -0800 (PST)
Subject: [pypy-commit] pypy default: Added tag release-5.0 for changeset
 246c9cf22037
Message-ID: <56e06874.465ec20a.11873.2095@mx.google.com>

Author: mattip 
Branch: 
Changeset: r82917:8bf6238bab25
Date: 2016-03-09 20:14 +0200
http://bitbucket.org/pypy/pypy/changeset/8bf6238bab25/

Log:	Added tag release-5.0 for changeset 246c9cf22037

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -18,3 +18,4 @@
 f3ad1e1e1d6215e20d34bb65ab85ff9188c9f559 release-2.6.1
 850edf14b2c75573720f59e95767335fb1affe55 release-4.0.0
 5f8302b8bf9f53056e40426f10c72151564e5b19 release-4.0.1
+246c9cf22037b11dc0e8c29ce3f291d3b8c5935a release-5.0

From pypy.commits at gmail.com  Wed Mar  9 13:49:27 2016
From: pypy.commits at gmail.com (arigo)
Date: Wed, 09 Mar 2016 10:49:27 -0800 (PST)
Subject: [pypy-commit] pypy default: update
Message-ID: <56e07037.d4e41c0a.c6818.575f@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r82918:558191c38db3
Date: 2016-03-09 19:48 +0100
http://bitbucket.org/pypy/pypy/changeset/558191c38db3/

Log:	update

diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -2,6 +2,8 @@
 maj=5
 min=0
 rev=0
+branchname=release-$maj.x  # ==OR== release-$maj.$min.x
+tagname=release-$maj.$min  # ==OR== release-$maj.$min.$rev
 # This script will download latest builds from the buildmaster, rename the top
 # level directory, and repackage ready to be uploaded to bitbucket. It will also
 # download source, assuming a tag for the release already exists, and repackage them.
@@ -9,7 +11,7 @@
 
 for plat in linux linux64 linux-armhf-raspbian linux-armhf-raring linux-armel osx64 freebsd64
   do
-    wget http://buildbot.pypy.org/nightly/release-$maj.$min.x/pypy-c-jit-latest-$plat.tar.bz2
+    wget http://buildbot.pypy.org/nightly/$branchname/pypy-c-jit-latest-$plat.tar.bz2
     tar -xf pypy-c-jit-latest-$plat.tar.bz2
     rm pypy-c-jit-latest-$plat.tar.bz2
     mv pypy-c-jit-*-$plat pypy-$maj.$min.$rev-$plat
@@ -18,7 +20,7 @@
   done
 
 plat=win32
-wget http://buildbot.pypy.org/nightly/release-$maj.$min.x/pypy-c-jit-latest-$plat.zip
+wget http://buildbot.pypy.org/nightly/$branchname/pypy-c-jit-latest-$plat.zip
 unzip pypy-c-jit-latest-$plat.zip
 mv pypy-c-jit-*-$plat pypy-$maj.$min.$rev-$plat
 zip -r pypy-$maj.$min.$rev-$plat.zip pypy-$maj.$min.$rev-$plat
@@ -26,7 +28,7 @@
 
 # Do this after creating a tag, note the untarred directory is pypy-pypy-
 # so make sure there is not another one
-wget https://bitbucket.org/pypy/pypy/get/release-$maj.$min.$rev.tar.bz2
+wget https://bitbucket.org/pypy/pypy/get/$tagname.tar.bz2
 tar -xf release-$maj.$min.$rev.tar.bz2
 mv pypy-pypy-* pypy-$maj.$min.$rev-src
 tar --owner=root --group=root --numeric-owner -cvjf pypy-$maj.$min.$rev-src.tar.bz2 pypy-$maj.$min.$rev-src

From pypy.commits at gmail.com  Wed Mar  9 14:11:43 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 11:11:43 -0800 (PST)
Subject: [pypy-commit] pypy default: hack test runner to log wall time to
 debug buildbot getting kill signal
Message-ID: <56e0756f.e853c20a.2f740.2b79@mx.google.com>

Author: mattip 
Branch: 
Changeset: r82919:380503fd3fa7
Date: 2016-03-09 21:10 +0200
http://bitbucket.org/pypy/pypy/changeset/380503fd3fa7/

Log:	hack test runner to log wall time to debug buildbot getting kill
	signal

diff --git a/testrunner/runner.py b/testrunner/runner.py
--- a/testrunner/runner.py
+++ b/testrunner/runner.py
@@ -259,7 +259,8 @@
 
         if res[0] == 'start':
             started += 1
-            out.write("++ starting %s [%d started in total]\n" % (res[1],
+            now = time.strftime('%H:%M:%S')
+            out.write("++ %s starting %s [%d started in total]\n" % (now, res[1],
                                                                   started))
             continue
         

From pypy.commits at gmail.com  Wed Mar  9 14:23:34 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 11:23:34 -0800 (PST)
Subject: [pypy-commit] jitviewer default: Added tag pypy-5.0 for changeset
 e49b88557c99
Message-ID: <56e07836.07b71c0a.de980.07f1@mx.google.com>

Author: mattip 
Branch: 
Changeset: r278:e792c6a807c3
Date: 2016-03-09 21:23 +0200
http://bitbucket.org/pypy/jitviewer/changeset/e792c6a807c3/

Log:	Added tag pypy-5.0 for changeset e49b88557c99

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -7,3 +7,4 @@
 3a0152b4ac6b8f930c493ef357fc5e9d8f4b91b7 pypy-2.6.0
 01dbb2d473162ccf7f2efe47888e86429c2498ad pypy-4.0.0
 6b11394062835e86ca53bd7ec34d427a0485acd5 pypy-4.0.1
+e49b88557c99c38e7698a6dced70a8739a36ec9b pypy-5.0

From pypy.commits at gmail.com  Wed Mar  9 14:32:48 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 11:32:48 -0800 (PST)
Subject: [pypy-commit] pypy cpyext-ext: merge default into branch
Message-ID: <56e07a60.6bb8c20a.7652f.07ff@mx.google.com>

Author: mattip 
Branch: cpyext-ext
Changeset: r82920:48d4c2cf24e3
Date: 2016-03-09 21:18 +0200
http://bitbucket.org/pypy/pypy/changeset/48d4c2cf24e3/

Log:	merge default into branch

diff too long, truncating to 2000 out of 4911 lines

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -18,3 +18,4 @@
 f3ad1e1e1d6215e20d34bb65ab85ff9188c9f559 release-2.6.1
 850edf14b2c75573720f59e95767335fb1affe55 release-4.0.0
 5f8302b8bf9f53056e40426f10c72151564e5b19 release-4.0.1
+246c9cf22037b11dc0e8c29ce3f291d3b8c5935a release-5.0
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -41,29 +41,29 @@
   Amaury Forgeot d'Arc
   Antonio Cuni
   Samuele Pedroni
+  Matti Picus
   Alex Gaynor
   Brian Kearns
-  Matti Picus
   Philip Jenvey
   Michael Hudson
+  Ronan Lamy
   David Schneider
+  Manuel Jacob
   Holger Krekel
   Christian Tismer
   Hakan Ardo
-  Manuel Jacob
-  Ronan Lamy
   Benjamin Peterson
+  Richard Plangger
   Anders Chrigstrom
   Eric van Riet Paap
   Wim Lavrijsen
-  Richard Plangger
   Richard Emslie
   Alexander Schremmer
   Dan Villiom Podlaski Christiansen
+  Remi Meier
   Lukas Diekmann
   Sven Hager
   Anders Lehmann
-  Remi Meier
   Aurelien Campeas
   Niklaus Haldimann
   Camillo Bruni
@@ -72,8 +72,8 @@
   Romain Guillebert
   Leonardo Santagada
   Seo Sanghyeon
+  Ronny Pfannschmidt
   Justin Peel
-  Ronny Pfannschmidt
   David Edelsohn
   Anders Hammarquist
   Jakub Gustak
@@ -95,6 +95,7 @@
   Tyler Wade
   Michael Foord
   Stephan Diehl
+  Vincent Legoll
   Stefan Schwarzer
   Valentino Volonghi
   Tomek Meka
@@ -105,9 +106,9 @@
   Jean-Paul Calderone
   Timo Paulssen
   Squeaky
+  Marius Gedminas
   Alexandre Fayolle
   Simon Burton
-  Marius Gedminas
   Martin Matusiak
   Konstantin Lopuhin
   Wenzhu Man
@@ -116,16 +117,20 @@
   Ivan Sichmann Freitas
   Greg Price
   Dario Bertini
+  Stefano Rivera
   Mark Pearse
   Simon Cross
   Andreas Stührk
-  Stefano Rivera
+  Edd Barrett
   Jean-Philippe St. Pierre
   Guido van Rossum
   Pavel Vinogradov
+  Jeremy Thurgood
   Paweł Piotr Przeradowski
+  Spenser Bauman
   Paul deGrandis
   Ilya Osadchiy
+  marky1991
   Tobias Oberstein
   Adrian Kuhn
   Boris Feigin
@@ -134,14 +139,12 @@
   Georg Brandl
   Bert Freudenberg
   Stian Andreassen
-  Edd Barrett
+  Tobias Pape
   Wanja Saatkamp
   Gerald Klix
   Mike Blume
-  Tobias Pape
   Oscar Nierstrasz
   Stefan H. Muller
-  Jeremy Thurgood
   Rami Chowdhury
   Eugene Oden
   Henry Mason
@@ -153,6 +156,8 @@
   Lukas Renggli
   Guenter Jantzen
   Ned Batchelder
+  Tim Felgentreff
+  Anton Gulenko
   Amit Regmi
   Ben Young
   Nicolas Chauvat
@@ -162,12 +167,12 @@
   Nicholas Riley
   Jason Chu
   Igor Trindade Oliveira
-  Tim Felgentreff
+  Yichao Yu
   Rocco Moretti
   Gintautas Miliauskas
   Michael Twomey
   Lucian Branescu Mihaila
-  Yichao Yu
+  Devin Jeanpierre
   Gabriel Lavoie
   Olivier Dormond
   Jared Grubb
@@ -191,33 +196,33 @@
   Stanislaw Halik
   Mikael Schönenberg
   Berkin Ilbeyi
-  Elmo M?ntynen
+  Elmo Mäntynen
+  Faye Zhao
   Jonathan David Riehl
   Anders Qvist
   Corbin Simpson
   Chirag Jadwani
   Beatrice During
   Alex Perry
-  Vincent Legoll
+  Vaibhav Sood
   Alan McIntyre
-  Spenser Bauman
+  William Leslie
   Alexander Sedov
   Attila Gobi
+  Jasper.Schulz
   Christopher Pope
-  Devin Jeanpierre
-  Vaibhav Sood
   Christian Tismer 
   Marc Abramowitz
   Dan Stromberg
   Arjun Naik
   Valentina Mukhamedzhanova
   Stefano Parmesan
+  Mark Young
   Alexis Daboville
   Jens-Uwe Mager
   Carl Meyer
   Karl Ramm
   Pieter Zieschang
-  Anton Gulenko
   Gabriel
   Lukas Vacek
   Andrew Dalke
@@ -225,6 +230,7 @@
   Jakub Stasiak
   Nathan Taylor
   Vladimir Kryachko
+  Omer Katz
   Jacek Generowicz
   Alejandro J. Cura
   Jacob Oscarson
@@ -234,11 +240,13 @@
   Kristjan Valur Jonsson
   David Lievens
   Neil Blakey-Milner
+  Sergey Matyunin
   Lutz Paelike
   Lucio Torre
   Lars Wassermann
   Philipp Rustemeuer
   Henrik Vendelbo
+  Richard Lancaster
   Dan Buch
   Miguel de Val Borro
   Artur Lisiecki
@@ -250,20 +258,21 @@
   Tomo Cocoa
   Kim Jin Su
   Toni Mattis
+  Amber Brown
   Lucas Stadler
   Julian Berman
   Markus Holtermann
   roberto at goyle
   Yury V. Zaytsev
   Anna Katrina Dominguez
-  William Leslie
   Bobby Impollonia
-  Faye Zhao
   timo at eistee.fritz.box
   Andrew Thompson
   Yusei Tahara
+  Aaron Tubbs
   Ben Darnell
   Roberto De Ioris
+  Logan Chien
   Juan Francisco Cantero Hurtado
   Ruochen Huang
   Jeong YunWon
@@ -273,6 +282,7 @@
   Christopher Armstrong
   Michael Hudson-Doyle
   Anders Sigfridsson
+  Nikolay Zinov
   Yasir Suhail
   Jason Michalski
   rafalgalczynski at gmail.com
@@ -282,6 +292,7 @@
   Gustavo Niemeyer
   Stephan Busemann
   Rafał Gałczyński
+  Matt Bogosian
   Christian Muirhead
   Berker Peksag
   James Lan
@@ -316,9 +327,9 @@
   Stefan Marr
   jiaaro
   Mads Kiilerich
-  Richard Lancaster
   opassembler.py
   Antony Lee
+  Jason Madden
   Yaroslav Fedevych
   Jim Hunziker
   Markus Unterwaditzer
@@ -327,6 +338,7 @@
   squeaky
   Zearin
   soareschen
+  Jonas Pfannschmidt
   Kurt Griffiths
   Mike Bayer
   Matthew Miller
diff --git a/lib-python/2.7/xml/etree/ElementTree.py b/lib-python/2.7/xml/etree/ElementTree.py
--- a/lib-python/2.7/xml/etree/ElementTree.py
+++ b/lib-python/2.7/xml/etree/ElementTree.py
@@ -1606,7 +1606,17 @@
                     pubid = pubid[1:-1]
                 if hasattr(self.target, "doctype"):
                     self.target.doctype(name, pubid, system[1:-1])
-                elif self.doctype is not self._XMLParser__doctype:
+                elif 1:  # XXX PyPy fix, used to be
+                         #   elif self.doctype is not self._XMLParser__doctype:
+                         # but that condition is always True on CPython, as far
+                         # as I can tell: self._XMLParser__doctype always
+                         # returns a fresh unbound method object.
+                         # On PyPy, unbound and bound methods have stronger
+                         # unicity guarantees: self._XMLParser__doctype
+                         # can return the same unbound method object, in
+                         # some cases making the test above incorrectly False.
+                         # (My guess would be that the line above is a backport
+                         # from Python 3.)
                     # warn about deprecated call
                     self._XMLParser__doctype(name, pubid, system[1:-1])
                     self.doctype(name, pubid, system[1:-1])
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -170,12 +170,8 @@
                cmdline="--translationmodules",
                suggests=[("objspace.allworkingmodules", False)]),
 
-    BoolOption("usepycfiles", "Write and read pyc files when importing",
-               default=True),
-
     BoolOption("lonepycfiles", "Import pyc files with no matching py file",
-               default=False,
-               requires=[("objspace.usepycfiles", True)]),
+               default=False),
 
     StrOption("soabi",
               "Tag to differentiate extension modules built for different Python interpreters",
diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py
--- a/pypy/doc/conf.py
+++ b/pypy/doc/conf.py
@@ -123,7 +123,7 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # " v documentation".
-#html_title = None
+html_title = 'PyPy documentation'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst
--- a/pypy/doc/contributor.rst
+++ b/pypy/doc/contributor.rst
@@ -11,29 +11,29 @@
   Amaury Forgeot d'Arc
   Antonio Cuni
   Samuele Pedroni
+  Matti Picus
   Alex Gaynor
   Brian Kearns
-  Matti Picus
   Philip Jenvey
   Michael Hudson
+  Ronan Lamy
   David Schneider
+  Manuel Jacob
   Holger Krekel
   Christian Tismer
   Hakan Ardo
-  Manuel Jacob
-  Ronan Lamy
   Benjamin Peterson
+  Richard Plangger
   Anders Chrigstrom
   Eric van Riet Paap
   Wim Lavrijsen
-  Richard Plangger
   Richard Emslie
   Alexander Schremmer
   Dan Villiom Podlaski Christiansen
+  Remi Meier
   Lukas Diekmann
   Sven Hager
   Anders Lehmann
-  Remi Meier
   Aurelien Campeas
   Niklaus Haldimann
   Camillo Bruni
@@ -42,8 +42,8 @@
   Romain Guillebert
   Leonardo Santagada
   Seo Sanghyeon
+  Ronny Pfannschmidt
   Justin Peel
-  Ronny Pfannschmidt
   David Edelsohn
   Anders Hammarquist
   Jakub Gustak
@@ -65,6 +65,7 @@
   Tyler Wade
   Michael Foord
   Stephan Diehl
+  Vincent Legoll
   Stefan Schwarzer
   Valentino Volonghi
   Tomek Meka
@@ -75,9 +76,9 @@
   Jean-Paul Calderone
   Timo Paulssen
   Squeaky
+  Marius Gedminas
   Alexandre Fayolle
   Simon Burton
-  Marius Gedminas
   Martin Matusiak
   Konstantin Lopuhin
   Wenzhu Man
@@ -86,16 +87,20 @@
   Ivan Sichmann Freitas
   Greg Price
   Dario Bertini
+  Stefano Rivera
   Mark Pearse
   Simon Cross
   Andreas Stührk
-  Stefano Rivera
+  Edd Barrett
   Jean-Philippe St. Pierre
   Guido van Rossum
   Pavel Vinogradov
+  Jeremy Thurgood
   Paweł Piotr Przeradowski
+  Spenser Bauman
   Paul deGrandis
   Ilya Osadchiy
+  marky1991
   Tobias Oberstein
   Adrian Kuhn
   Boris Feigin
@@ -104,14 +109,12 @@
   Georg Brandl
   Bert Freudenberg
   Stian Andreassen
-  Edd Barrett
+  Tobias Pape
   Wanja Saatkamp
   Gerald Klix
   Mike Blume
-  Tobias Pape
   Oscar Nierstrasz
   Stefan H. Muller
-  Jeremy Thurgood
   Rami Chowdhury
   Eugene Oden
   Henry Mason
@@ -123,6 +126,8 @@
   Lukas Renggli
   Guenter Jantzen
   Ned Batchelder
+  Tim Felgentreff
+  Anton Gulenko
   Amit Regmi
   Ben Young
   Nicolas Chauvat
@@ -132,12 +137,12 @@
   Nicholas Riley
   Jason Chu
   Igor Trindade Oliveira
-  Tim Felgentreff
+  Yichao Yu
   Rocco Moretti
   Gintautas Miliauskas
   Michael Twomey
   Lucian Branescu Mihaila
-  Yichao Yu
+  Devin Jeanpierre
   Gabriel Lavoie
   Olivier Dormond
   Jared Grubb
@@ -161,33 +166,33 @@
   Stanislaw Halik
   Mikael Schönenberg
   Berkin Ilbeyi
-  Elmo M?ntynen
+  Elmo Mäntynen
+  Faye Zhao
   Jonathan David Riehl
   Anders Qvist
   Corbin Simpson
   Chirag Jadwani
   Beatrice During
   Alex Perry
-  Vincent Legoll
+  Vaibhav Sood
   Alan McIntyre
-  Spenser Bauman
+  William Leslie
   Alexander Sedov
   Attila Gobi
+  Jasper.Schulz
   Christopher Pope
-  Devin Jeanpierre
-  Vaibhav Sood
   Christian Tismer 
   Marc Abramowitz
   Dan Stromberg
   Arjun Naik
   Valentina Mukhamedzhanova
   Stefano Parmesan
+  Mark Young
   Alexis Daboville
   Jens-Uwe Mager
   Carl Meyer
   Karl Ramm
   Pieter Zieschang
-  Anton Gulenko
   Gabriel
   Lukas Vacek
   Andrew Dalke
@@ -195,6 +200,7 @@
   Jakub Stasiak
   Nathan Taylor
   Vladimir Kryachko
+  Omer Katz
   Jacek Generowicz
   Alejandro J. Cura
   Jacob Oscarson
@@ -204,11 +210,13 @@
   Kristjan Valur Jonsson
   David Lievens
   Neil Blakey-Milner
+  Sergey Matyunin
   Lutz Paelike
   Lucio Torre
   Lars Wassermann
   Philipp Rustemeuer
   Henrik Vendelbo
+  Richard Lancaster
   Dan Buch
   Miguel de Val Borro
   Artur Lisiecki
@@ -220,20 +228,21 @@
   Tomo Cocoa
   Kim Jin Su
   Toni Mattis
+  Amber Brown
   Lucas Stadler
   Julian Berman
   Markus Holtermann
   roberto at goyle
   Yury V. Zaytsev
   Anna Katrina Dominguez
-  William Leslie
   Bobby Impollonia
-  Faye Zhao
   timo at eistee.fritz.box
   Andrew Thompson
   Yusei Tahara
+  Aaron Tubbs
   Ben Darnell
   Roberto De Ioris
+  Logan Chien
   Juan Francisco Cantero Hurtado
   Ruochen Huang
   Jeong YunWon
@@ -243,6 +252,7 @@
   Christopher Armstrong
   Michael Hudson-Doyle
   Anders Sigfridsson
+  Nikolay Zinov
   Yasir Suhail
   Jason Michalski
   rafalgalczynski at gmail.com
@@ -252,6 +262,7 @@
   Gustavo Niemeyer
   Stephan Busemann
   Rafał Gałczyński
+  Matt Bogosian
   Christian Muirhead
   Berker Peksag
   James Lan
@@ -286,9 +297,9 @@
   Stefan Marr
   jiaaro
   Mads Kiilerich
-  Richard Lancaster
   opassembler.py
   Antony Lee
+  Jason Madden
   Yaroslav Fedevych
   Jim Hunziker
   Markus Unterwaditzer
@@ -297,6 +308,7 @@
   squeaky
   Zearin
   soareschen
+  Jonas Pfannschmidt
   Kurt Griffiths
   Mike Bayer
   Matthew Miller
@@ -311,4 +323,3 @@
   Julien Phalip
   Roman Podoliaka
   Dan Loewenherz
-
diff --git a/pypy/doc/cpython_differences.rst b/pypy/doc/cpython_differences.rst
--- a/pypy/doc/cpython_differences.rst
+++ b/pypy/doc/cpython_differences.rst
@@ -265,7 +265,7 @@
         return False
 
     def evil(y):
-        d = {x(): 1}
+        d = {X(): 1}
         X.__eq__ = __evil_eq__
         d[y] # might trigger a call to __eq__?
 
diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst
--- a/pypy/doc/how-to-release.rst
+++ b/pypy/doc/how-to-release.rst
@@ -1,5 +1,20 @@
-Making a PyPy Release
-=====================
+The PyPy Release Process
+========================
+
+Release Policy
+++++++++++++++
+
+We try to create a stable release a few times a year. These are released on
+a branch named like release-2.x or release-4.x, and each release is tagged,
+for instance release-4.0.1. 
+
+After release, inevitably there are bug fixes. It is the responsibility of
+the commiter who fixes a bug to make sure this fix is on the release branch,
+so that we can then create a tagged bug-fix release, which will hopefully
+happen more often than stable releases.
+
+How to Create a PyPy Release
+++++++++++++++++++++++++++++
 
 Overview
 --------
diff --git a/pypy/doc/index-of-release-notes.rst b/pypy/doc/index-of-release-notes.rst
--- a/pypy/doc/index-of-release-notes.rst
+++ b/pypy/doc/index-of-release-notes.rst
@@ -6,6 +6,7 @@
 
 .. toctree::
 
+   release-5.0.0.rst
    release-4.0.1.rst
    release-4.0.0.rst
    release-2.6.1.rst
diff --git a/pypy/doc/index-of-whatsnew.rst b/pypy/doc/index-of-whatsnew.rst
--- a/pypy/doc/index-of-whatsnew.rst
+++ b/pypy/doc/index-of-whatsnew.rst
@@ -7,6 +7,7 @@
 .. toctree::
 
    whatsnew-head.rst
+   whatsnew-5.0.0.rst
    whatsnew-4.0.1.rst
    whatsnew-4.0.0.rst
    whatsnew-2.6.1.rst
diff --git a/pypy/doc/release-5.0.0.rst b/pypy/doc/release-5.0.0.rst
new file mode 100644
--- /dev/null
+++ b/pypy/doc/release-5.0.0.rst
@@ -0,0 +1,230 @@
+========
+PyPy 5.0
+========
+
+We have released PyPy 5.0, about three months after PyPy 4.0.1.
+We encourage all users of PyPy to update to this version. Apart from the usual
+bug fixes, there is an ongoing effort to improve the warmup time and memory
+usage of JIT-related metadata. The exact effects depend vastly on the program
+you're running and can range from insignificant to warmup being up to 30%
+faster and memory dropping by about 30%.
+
+We also merged a major upgrade to our C-API layer (cpyext), simplifying the
+interaction between c-level objects and PyPy interpreter level objects. As a
+result, lxml  (prerelease) with its cython compiled component
+`passes all tests`_ on PyPy. The new cpyext is also much faster.
+
+vmprof_ has been a go-to profiler for PyPy on linux for a few releases
+and we're happy to announce that thanks to the cooperation with jetbrains,
+vmprof now works on Linux, OS X and Windows on both PyPy and CPython.
+
+You can download the PyPy 5.0 release here:
+
+    http://pypy.org/download.html
+
+We would like to thank our donors for the continued support of the PyPy
+project.
+
+We would also like to thank our contributors and
+encourage new people to join the project. PyPy has many
+layers and we need help with all of them: `PyPy`_ and `RPython`_ documentation
+improvements, tweaking popular `modules`_ to run on pypy, or general `help`_
+with making RPython's JIT even better.
+
+CFFI
+====
+
+While not applicable only to PyPy, `cffi`_ is arguably our most significant
+contribution to the python ecosystem. PyPy 5.0 ships with
+`cffi-1.5.2`_ which now allows embedding PyPy (or cpython) in a C program.
+
+.. _`PyPy`: http://doc.pypy.org
+.. _`RPython`: https://rpython.readthedocs.org
+.. _`cffi`: https://cffi.readthedocs.org
+.. _`cffi-1.5.2`: http://cffi.readthedocs.org/en/latest/whatsnew.html#v1-5-2
+.. _`modules`: http://doc.pypy.org/en/latest/project-ideas.html#make-more-python-modules-pypy-friendly
+.. _`help`: http://doc.pypy.org/en/latest/project-ideas.html
+.. _`numpy`: https://bitbucket.org/pypy/numpy
+.. _`passes all tests`: https://bitbucket.org/pypy/compatibility/wiki/lxml
+.. _vmprof: http://vmprof.readthedocs.org
+
+What is PyPy?
+=============
+
+PyPy is a very compliant Python interpreter, almost a drop-in replacement for
+CPython 2.7. It's fast (`PyPy and CPython 2.7.x`_ performance comparison)
+due to its integrated tracing JIT compiler.
+
+We also welcome developers of other
+`dynamic languages`_ to see what RPython can do for them.
+
+This release supports **x86** machines on most common operating systems
+(Linux 32/64, Mac OS X 64, Windows 32, OpenBSD, FreeBSD),
+newer **ARM** hardware (ARMv6 or ARMv7, with VFPv3) running Linux, and the
+big- and little-endian variants of **PPC64** running Linux.
+
+.. _`PyPy and CPython 2.7.x`: http://speed.pypy.org
+.. _`dynamic languages`: http://pypyjs.org
+
+Other Highlights (since 4.0.1 released in November 2015)
+=========================================================
+
+* New features:
+
+  * Support embedding PyPy in a C-program via cffi and static callbacks in cffi.
+    This deprecates the old method of embedding PyPy
+
+  * Refactor vmprof to work cross-operating-system, deprecate using buggy
+    libunwind on Linux platforms. Vmprof even works on Windows now.
+
+  * Support more of the C-API type slots, like tp_getattro, and fix C-API
+    macros, functions, and structs such as _PyLong_FromByteArray(),
+    PyString_GET_SIZE, f_locals in PyFrameObject, Py_NAN, co_filename in
+    PyCodeObject
+
+  * Use a more stable approach for allocating PyObjects in cpyext. (see
+    `blog post`_). Once the PyObject corresponding to a PyPy object is created,
+    it stays around at the same location until the death of the PyPy object.
+    Done with a little bit of custom GC support.  It allows us to kill the
+    notion of "borrowing" inside cpyext, reduces 4 dictionaries down to 1, and
+    significantly simplifies the whole approach (which is why it is a new
+    feature while technically a refactoring) and allows PyPy to support the
+    populart lxml module (as of the *next* release) with no PyPy specific
+    patches needed
+
+  * Make the default filesystem encoding ASCII, like CPython
+
+  * Use `hypothesis`_ in test creation, which is great for randomizing tests
+
+* Bug Fixes
+
+  * Backport always using os.urandom for uuid4 from cpython and fix the JIT as well
+    (issue #2202)
+
+  * More completely support datetime, optimize timedelta creation
+
+  * Fix for issue #2185 which caused an inconsistent list of operations to be
+    generated by the unroller, appeared in a complicated DJango app
+
+  * Fix an elusive issue with stacklets on shadowstack which showed up when
+    forgetting stacklets without resuming them
+
+  * Fix entrypoint() which now acquires the GIL
+
+  * Fix direct_ffi_call() so failure does not bail out before setting CALL_MAY_FORCE
+
+  * Fix (de)pickling long values by simplifying the implementation
+
+  * Fix RPython rthread so that objects stored as threadlocal do not force minor
+    GC collection and are kept alive automatically. This improves perfomance of
+    short-running Python callbacks and prevents resetting such object between
+    calls
+
+  * Support floats as parameters to itertools.isslice()
+
+  * Check for the existence of CODESET, ignoring it should have prevented PyPy
+    from working on FreeBSD
+
+  * Fix for corner case (likely shown by Krakatau) for consecutive guards with
+    interdependencies
+
+  * Fix applevel bare class method comparisons which should fix pretty printing
+    in IPython
+
+  * Issues reported with our previous release were resolved_ after reports from users on
+    our issue tracker at https://bitbucket.org/pypy/pypy/issues or on IRC at
+    #pypy
+
+* Numpy:
+
+  * Updates to numpy 1.10.2 (incompatibilities and not-implemented features
+    still exist)
+
+  * Support dtype=(('O', spec)) union while disallowing record arrays with
+    mixed object, non-object values
+
+  * Remove all traces of micronumpy from cpyext if --withoutmod-micronumpy option used
+
+  * Support indexing filtering with a boolean ndarray
+
+  * Support partition() as an app-level function, together with a cffi wrapper
+    in pypy/numpy, this now provides partial support for partition()
+
+* Performance improvements:
+
+  * Optimize global lookups
+
+  * Improve the memory signature of numbering instances in the JIT. This should
+    massively decrease the amount of memory consumed by the JIT, which is
+    significant for most programs. Also compress the numberings using variable-
+    size encoding
+
+  * Optimize string concatenation
+
+  * Use INT_LSHIFT instead of INT_MUL when possible
+
+  * Improve struct.unpack by casting directly from the underlying buffer.
+    Unpacking floats and doubles is about 15 times faster, and integer types
+    about 50% faster (on 64 bit integers). This was then subsequently
+    improved further in optimizeopt.py.
+
+  * Optimize two-tuple lookups in mapdict, which improves warmup of instance
+    variable access somewhat
+
+  * Reduce all guards from int_floordiv_ovf if one of the arguments is constant
+
+  * Identify permutations of attributes at instance creation, reducing the
+    number of bridges created
+
+  * Greatly improve re.sub() performance
+
+
+* Internal refactorings:
+
+  * Refactor and improve exception analysis in the annotator
+
+  * Remove unnecessary special handling of space.wrap().
+
+  * Support list-resizing setslice operations in RPython
+
+  * Tweak the trace-too-long heuristic for multiple jit drivers
+
+  * Refactor bookkeeping (such a cool word - three double letters) in the
+    annotater
+
+  * Refactor wrappers for OS functions from rtyper to rlib and simplify them
+
+  * Simplify backend loading instructions to only use four variants
+
+  * Simplify GIL handling in non-jitted code
+
+  * Refactor naming in optimizeopt
+
+  * Change GraphAnalyzer to use a more precise way to recognize external
+    functions and fix null pointer handling, generally clean up external
+    function handling
+
+  * Remove pure variants of ``getfield_gc_*`` operations from the JIT by
+    determining purity while tracing
+
+  * Refactor databasing
+
+  * Simplify bootstrapping in cpyext
+
+  * Refactor rtyper debug code into python.rtyper.debug
+
+  * Seperate structmember.h from Python.h Also enhance creating api functions
+    to specify which header file they appear in (previously only pypy_decl.h)
+
+  * Fix tokenizer to enforce universal newlines, needed for Python 3 support
+
+.. _resolved: http://doc.pypy.org/en/latest/whatsnew-5.0.0.html
+.. _`hypothesis`: http://hypothesis.readthedocs.org
+.. _`blog post`: http://morepypy.blogspot.com/2016/02/c-api-support-update.html
+
+Please update, and continue to help us make PyPy better.
+
+Cheers
+
+The PyPy Team
+
diff --git a/pypy/doc/tool/makecontributor.py b/pypy/doc/tool/makecontributor.py
--- a/pypy/doc/tool/makecontributor.py
+++ b/pypy/doc/tool/makecontributor.py
@@ -72,6 +72,7 @@
     'Anton Gulenko':['anton gulenko', 'anton_gulenko'],
     'Richard Lancaster':['richardlancaster'],
     'William Leslie':['William ML Leslie'],
+    'Spenser Bauman':['Spenser Andrew Bauman'],
     }
 
 alias_map = {}
diff --git a/pypy/doc/whatsnew-5.0.0.rst b/pypy/doc/whatsnew-5.0.0.rst
new file mode 100644
--- /dev/null
+++ b/pypy/doc/whatsnew-5.0.0.rst
@@ -0,0 +1,197 @@
+======================
+What's new in PyPy 5.0
+======================
+
+.. this is a revision shortly after release-4.0.1
+.. startrev: 4b5c840d0da2
+
+Fixed ``_PyLong_FromByteArray()``, which was buggy.
+
+Fixed a crash with stacklets (or greenlets) on non-Linux machines
+which showed up if you forget stacklets without resuming them.
+
+.. branch: numpy-1.10
+
+Fix tests to run cleanly with -A and start to fix micronumpy for upstream numpy
+which is now 1.10.2
+
+.. branch: osx-flat-namespace
+
+Fix the cpyext tests on OSX by linking with -flat_namespace
+
+.. branch: anntype
+
+Refactor and improve exception analysis in the annotator.
+
+.. branch: posita/2193-datetime-timedelta-integrals
+
+Fix issue #2193. ``isinstance(..., int)`` => ``isinstance(..., numbers.Integral)`` 
+to allow for alternate ``int``-like implementations (e.g., ``future.types.newint``)
+
+.. branch: faster-rstruct
+
+Improve the performace of struct.unpack, which now directly reads inside the
+string buffer and directly casts the bytes to the appropriate type, when
+allowed. Unpacking of floats and doubles is about 15 times faster now, while
+for integer types it's up to ~50% faster for 64bit integers.
+
+.. branch: wrap-specialisation
+
+Remove unnecessary special handling of space.wrap().
+
+.. branch: compress-numbering
+
+Improve the memory signature of numbering instances in the JIT. This should massively
+decrease the amount of memory consumed by the JIT, which is significant for most programs.
+
+.. branch: fix-trace-too-long-heuristic
+
+Improve the heuristic when disable trace-too-long
+
+.. branch: fix-setslice-can-resize
+
+Make rlist's ll_listsetslice() able to resize the target list to help
+simplify objspace/std/listobject.py. Was issue #2196.
+
+.. branch: anntype2
+
+A somewhat random bunch of changes and fixes following up on branch 'anntype'. Highlights:
+
+- Implement @doubledispatch decorator and use it for intersection() and difference().
+
+- Turn isinstance into a SpaceOperation
+
+- Create a few direct tests of the fundamental annotation invariant in test_model.py
+
+- Remove bookkeeper attribute from DictDef and ListDef.
+
+.. branch: cffi-static-callback
+
+.. branch: vecopt-absvalue
+
+- Enhancement. Removed vector fields from AbstractValue.
+
+.. branch: memop-simplify2
+
+Simplification. Backends implement too many loading instructions, only having a slightly different interface.
+Four new operations (gc_load/gc_load_indexed, gc_store/gc_store_indexed) replace all the
+commonly known loading operations
+
+.. branch: more-rposix
+
+Move wrappers for OS functions from `rpython/rtyper` to `rpython/rlib` and 
+turn them into regular RPython functions. Most RPython-compatible `os.*` 
+functions are now directly accessible as `rpython.rposix.*`.
+
+.. branch: always-enable-gil
+
+Simplify a bit the GIL handling in non-jitted code.  Fixes issue #2205.
+
+.. branch: flowspace-cleanups
+
+Trivial cleanups in flowspace.operation : fix comment & duplicated method
+
+.. branch: test-AF_NETLINK
+
+Add a test for pre-existing AF_NETLINK support. Was part of issue #1942.
+
+.. branch: small-cleanups-misc
+
+Trivial misc cleanups: typo, whitespace, obsolete comments
+
+.. branch: cpyext-slotdefs
+.. branch: fix-missing-canraise
+.. branch: whatsnew
+
+.. branch: fix-2211
+
+Fix the cryptic exception message when attempting to use extended slicing
+in rpython. Was issue #2211.
+
+.. branch: ec-keepalive
+
+Optimize the case where, in a new C-created thread, we keep invoking
+short-running Python callbacks.  (CFFI on CPython has a hack to achieve
+the same result.)  This can also be seen as a bug fix: previously,
+thread-local objects would be reset between two such calls.
+
+.. branch: globals-quasiimmut
+
+Optimize global lookups.
+
+.. branch: cffi-static-callback-embedding
+
+Updated to CFFI 1.5, which supports a new way to do embedding.
+Deprecates http://pypy.readthedocs.org/en/latest/embedding.html.
+
+.. branch: fix-cpython-ssl-tests-2.7
+
+Fix SSL tests by importing cpython's patch
+
+
+.. branch: remove-getfield-pure
+
+Remove pure variants of ``getfield_gc_*`` operations from the JIT. Relevant
+optimizations instead consult the field descriptor to determine the purity of
+the operation. Additionally, pure ``getfield`` operations are now handled
+entirely by `rpython/jit/metainterp/optimizeopt/heap.py` rather than
+`rpython/jit/metainterp/optimizeopt/pure.py`, which can result in better codegen
+for traces containing a large number of pure getfield operations.
+
+.. branch: exctrans
+
+Try to ensure that no new functions get annotated during the 'source_c' phase.
+Refactor sandboxing to operate at a higher level.
+
+.. branch: cpyext-bootstrap
+
+.. branch: vmprof-newstack
+
+Refactor vmprof to work cross-operating-system.
+
+.. branch: seperate-strucmember_h
+
+Seperate structmember.h from Python.h Also enhance creating api functions
+to specify which header file they appear in (previously only pypy_decl.h) 
+
+.. branch: llimpl
+
+Refactor register_external(), remove running_on_llinterp mechanism and
+apply sandbox transform on externals at the end of annotation.
+
+.. branch: cffi-embedding-win32
+
+.. branch: windows-vmprof-support
+
+vmprof should work on Windows.
+
+
+.. branch: reorder-map-attributes
+
+When creating instances and adding attributes in several different orders
+depending on some condition, the JIT would create too much code. This is now
+fixed.
+
+.. branch: cpyext-gc-support-2
+
+Improve CPython C API support, which means lxml now runs unmodified
+(after removing pypy hacks, pending pull request)
+
+.. branch: look-inside-tuple-hash
+
+Look inside tuple hash, improving mdp benchmark
+
+.. branch: vlen-resume
+
+Compress resume data, saving 10-20% of memory consumed by the JIT
+
+.. branch: issue-2248
+
+.. branch: ndarray-setitem-filtered
+
+Fix boolean-array indexing in micronumpy
+
+.. branch: numpy_partition
+Support ndarray.partition() as an app-level function numpy.core._partition_use,
+provided as a cffi wrapper to upstream's implementation in the pypy/numpy repo
+
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
@@ -1,173 +1,7 @@
 =========================
-What's new in PyPy 4.1.+
+What's new in PyPy 5.0.+
 =========================
 
-.. this is a revision shortly after release-4.0.1
-.. startrev: 4b5c840d0da2
+.. this is a revision shortly after release-5.0
+.. startrev: b238b48f9138
 
-Fixed ``_PyLong_FromByteArray()``, which was buggy.
-
-Fixed a crash with stacklets (or greenlets) on non-Linux machines
-which showed up if you forget stacklets without resuming them.
-
-.. branch: numpy-1.10
-
-Fix tests to run cleanly with -A and start to fix micronumpy for upstream numpy
-which is now 1.10.2
-
-.. branch: osx-flat-namespace
-
-Fix the cpyext tests on OSX by linking with -flat_namespace
-
-.. branch: anntype
-
-Refactor and improve exception analysis in the annotator.
-
-.. branch: posita/2193-datetime-timedelta-integrals
-
-Fix issue #2193. ``isinstance(..., int)`` => ``isinstance(..., numbers.Integral)`` 
-to allow for alternate ``int``-like implementations (e.g., ``future.types.newint``)
-
-.. branch: faster-rstruct
-
-Improve the performace of struct.unpack, which now directly reads inside the
-string buffer and directly casts the bytes to the appropriate type, when
-allowed. Unpacking of floats and doubles is about 15 times faster now, while
-for integer types it's up to ~50% faster for 64bit integers.
-
-.. branch: wrap-specialisation
-
-Remove unnecessary special handling of space.wrap().
-
-.. branch: compress-numbering
-
-Improve the memory signature of numbering instances in the JIT. This should massively
-decrease the amount of memory consumed by the JIT, which is significant for most programs.
-
-.. branch: fix-trace-too-long-heuristic
-
-Improve the heuristic when disable trace-too-long
-
-.. branch: fix-setslice-can-resize
-
-Make rlist's ll_listsetslice() able to resize the target list to help
-simplify objspace/std/listobject.py. Was issue #2196.
-
-.. branch: anntype2
-
-A somewhat random bunch of changes and fixes following up on branch 'anntype'. Highlights:
-
-- Implement @doubledispatch decorator and use it for intersection() and difference().
-
-- Turn isinstance into a SpaceOperation
-
-- Create a few direct tests of the fundamental annotation invariant in test_model.py
-
-- Remove bookkeeper attribute from DictDef and ListDef.
-
-.. branch: cffi-static-callback
-
-.. branch: vecopt-absvalue
-
-- Enhancement. Removed vector fields from AbstractValue.
-
-.. branch: memop-simplify2
-
-Simplification. Backends implement too many loading instructions, only having a slightly different interface.
-Four new operations (gc_load/gc_load_indexed, gc_store/gc_store_indexed) replace all the
-commonly known loading operations
-
-.. branch: more-rposix
-
-Move wrappers for OS functions from `rpython/rtyper` to `rpython/rlib` and 
-turn them into regular RPython functions. Most RPython-compatible `os.*` 
-functions are now directly accessible as `rpython.rposix.*`.
-
-.. branch: always-enable-gil
-
-Simplify a bit the GIL handling in non-jitted code.  Fixes issue #2205.
-
-.. branch: flowspace-cleanups
-
-Trivial cleanups in flowspace.operation : fix comment & duplicated method
-
-.. branch: test-AF_NETLINK
-
-Add a test for pre-existing AF_NETLINK support. Was part of issue #1942.
-
-.. branch: small-cleanups-misc
-
-Trivial misc cleanups: typo, whitespace, obsolete comments
-
-.. branch: cpyext-slotdefs
-.. branch: fix-missing-canraise
-.. branch: whatsnew
-
-.. branch: fix-2211
-
-Fix the cryptic exception message when attempting to use extended slicing
-in rpython. Was issue #2211.
-
-.. branch: ec-keepalive
-
-Optimize the case where, in a new C-created thread, we keep invoking
-short-running Python callbacks.  (CFFI on CPython has a hack to achieve
-the same result.)  This can also be seen as a bug fix: previously,
-thread-local objects would be reset between two such calls.
-
-.. branch: globals-quasiimmut
-
-Optimize global lookups.
-
-.. branch: cffi-static-callback-embedding
-
-Updated to CFFI 1.5, which supports a new way to do embedding.
-Deprecates http://pypy.readthedocs.org/en/latest/embedding.html.
-
-.. branch: fix-cpython-ssl-tests-2.7
-
-Fix SSL tests by importing cpython's patch
-
-
-.. branch: remove-getfield-pure
-
-Remove pure variants of ``getfield_gc_*`` operations from the JIT. Relevant
-optimizations instead consult the field descriptor to determine the purity of
-the operation. Additionally, pure ``getfield`` operations are now handled
-entirely by `rpython/jit/metainterp/optimizeopt/heap.py` rather than
-`rpython/jit/metainterp/optimizeopt/pure.py`, which can result in better codegen
-for traces containing a large number of pure getfield operations.
-
-.. branch: exctrans
-
-Try to ensure that no new functions get annotated during the 'source_c' phase.
-Refactor sandboxing to operate at a higher level.
-
-.. branch: cpyext-bootstrap
-
-.. branch: vmprof-newstack
-
-Refactor vmprof to work cross-operating-system.
-
-.. branch: seperate-strucmember_h
-
-Seperate structmember.h from Python.h Also enhance creating api functions
-to specify which header file they appear in (previously only pypy_decl.h) 
-
-.. branch: llimpl
-
-Refactor register_external(), remove running_on_llinterp mechanism and
-apply sandbox transform on externals at the end of annotation.
-
-.. branch: cffi-embedding-win32
-
-.. branch: windows-vmprof-support
-
-vmprof should work on Windows.
-
-
-.. branch: reorder-map-attributes
-
-When creating instances and adding attributes in several different orders
-depending on some condition, the JIT would create too much code. This is now
-fixed.
\ No newline at end of file
diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -277,7 +277,6 @@
 
         if config.translation.sandbox:
             config.objspace.lonepycfiles = False
-            config.objspace.usepycfiles = False
 
         config.translating = True
 
diff --git a/pypy/interpreter/function.py b/pypy/interpreter/function.py
--- a/pypy/interpreter/function.py
+++ b/pypy/interpreter/function.py
@@ -13,6 +13,9 @@
 from pypy.interpreter.argument import Arguments
 from rpython.rlib import jit
 
+from rpython.rlib.rarithmetic import LONG_BIT
+from rpython.rlib.rbigint import rbigint
+
 
 funccallunrolling = unrolling_iterable(range(4))
 
@@ -557,6 +560,26 @@
                 return space.w_False
         return space.eq(self.w_function, w_other.w_function)
 
+    def is_w(self, space, other):
+        if not isinstance(other, Method):
+            return False
+        return (self.w_instance is other.w_instance and
+                self.w_function is other.w_function and
+                self.w_class is other.w_class)
+
+    def immutable_unique_id(self, space):
+        from pypy.objspace.std.util import IDTAG_METHOD as tag
+        from pypy.objspace.std.util import IDTAG_SHIFT
+        if self.w_instance is not None:
+            id = space.bigint_w(space.id(self.w_instance))
+            id = id.lshift(LONG_BIT)
+        else:
+            id = rbigint.fromint(0)
+        id = id.or_(space.bigint_w(space.id(self.w_function)))
+        id = id.lshift(LONG_BIT).or_(space.bigint_w(space.id(self.w_class)))
+        id = id.lshift(IDTAG_SHIFT).int_or_(tag)
+        return space.newlong_from_rbigint(id)
+
     def descr_method_hash(self):
         space = self.space
         w_result = space.hash(self.w_function)
diff --git a/pypy/interpreter/mixedmodule.py b/pypy/interpreter/mixedmodule.py
--- a/pypy/interpreter/mixedmodule.py
+++ b/pypy/interpreter/mixedmodule.py
@@ -3,7 +3,7 @@
 from pypy.interpreter import gateway
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.baseobjspace import W_Root
-import os, sys
+import sys
 
 class MixedModule(Module):
     applevel_name = None
@@ -60,7 +60,7 @@
     def save_module_content_for_future_reload(self):
         self.w_initialdict = self.space.call_method(self.w_dict, 'items')
 
-
+    @classmethod
     def get_applevel_name(cls):
         """ NOT_RPYTHON """
         if cls.applevel_name is not None:
@@ -68,7 +68,6 @@
         else:
             pkgroot = cls.__module__
             return pkgroot.split('.')[-1]
-    get_applevel_name = classmethod(get_applevel_name)
 
     def get(self, name):
         space = self.space
@@ -103,7 +102,7 @@
             # be normal Functions to get the correct binding behaviour
             func = w_value
             if (isinstance(func, Function) and
-                type(func) is not BuiltinFunction):
+                    type(func) is not BuiltinFunction):
                 try:
                     bltin = func._builtinversion_
                 except AttributeError:
@@ -115,7 +114,6 @@
             space.setitem(self.w_dict, w_name, w_value)
             return w_value
 
-
     def getdict(self, space):
         if self.lazy:
             for name in self.loaders:
@@ -131,6 +129,7 @@
         self.startup_called = False
         self._frozen = True
 
+    @classmethod
     def buildloaders(cls):
         """ NOT_RPYTHON """
         if not hasattr(cls, 'loaders'):
@@ -149,8 +148,6 @@
             if '__doc__' not in loaders:
                 loaders['__doc__'] = cls.get__doc__
 
-    buildloaders = classmethod(buildloaders)
-
     def extra_interpdef(self, name, spec):
         cls = self.__class__
         pkgroot = cls.__module__
@@ -159,21 +156,21 @@
         w_obj = loader(space)
         space.setattr(space.wrap(self), space.wrap(name), w_obj)
 
+    @classmethod
     def get__doc__(cls, space):
         return space.wrap(cls.__doc__)
-    get__doc__ = classmethod(get__doc__)
 
 
 def getinterpevalloader(pkgroot, spec):
     """ NOT_RPYTHON """
     def ifileloader(space):
-        d = {'space' : space}
+        d = {'space':space}
         # EVIL HACK (but it works, and this is not RPython :-)
         while 1:
             try:
                 value = eval(spec, d)
             except NameError, ex:
-                name = ex.args[0].split("'")[1] # super-Evil
+                name = ex.args[0].split("'")[1]  # super-Evil
                 if name in d:
                     raise   # propagate the NameError
                 try:
diff --git a/pypy/interpreter/test/test_app_main.py b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_main.py
+++ b/pypy/interpreter/test/test_app_main.py
@@ -133,7 +133,7 @@
         self.check(['-S', '-tO', '--info'], {}, output_contains='translation')
         self.check(['-S', '-tO', '--version'], {}, output_contains='Python')
         self.check(['-S', '-tOV'], {}, output_contains='Python')
-        self.check(['--jit', 'foobar', '-S'], {}, sys_argv=[''],
+        self.check(['--jit', 'off', '-S'], {}, sys_argv=[''],
                    run_stdin=True, no_site=1)
         self.check(['-c', 'pass'], {}, sys_argv=['-c'], run_command='pass')
         self.check(['-cpass'], {}, sys_argv=['-c'], run_command='pass')
diff --git a/pypy/interpreter/test/test_function.py b/pypy/interpreter/test/test_function.py
--- a/pypy/interpreter/test/test_function.py
+++ b/pypy/interpreter/test/test_function.py
@@ -1,5 +1,4 @@
-
-import unittest
+import pytest
 from pypy.interpreter import eval
 from pypy.interpreter.function import Function, Method, descr_function_get
 from pypy.interpreter.pycode import PyCode
@@ -187,6 +186,7 @@
         raises(
             TypeError, func, 42, {'arg1': 23})
 
+    @pytest.mark.skipif("config.option.runappdirect")
     def test_kwargs_nondict_mapping(self):
         class Mapping:
             def keys(self):
@@ -257,6 +257,14 @@
         meth = func.__get__(obj, object)
         assert meth() == obj
 
+    def test_none_get_interaction(self):
+        skip("XXX issue #2083")
+        assert type(None).__repr__(None) == 'None'
+
+    def test_none_get_interaction_2(self):
+        f = None.__repr__
+        assert f() == 'None'
+
     def test_no_get_builtin(self):
         assert not hasattr(dir, '__get__')
         class A(object):
@@ -284,6 +292,7 @@
         raises(TypeError, len, s, some_unknown_keyword=s)
         raises(TypeError, len, s, s, some_unknown_keyword=s)
 
+    @pytest.mark.skipif("config.option.runappdirect")
     def test_call_error_message(self):
         try:
             len()
@@ -325,6 +334,7 @@
         f = lambda: 42
         assert f.func_doc is None
 
+    @pytest.mark.skipif("config.option.runappdirect")
     def test_setstate_called_with_wrong_args(self):
         f = lambda: 42
         # not sure what it should raise, since CPython doesn't have setstate
@@ -550,6 +560,37 @@
         assert A().m == X()
         assert X() == A().m
 
+    @pytest.mark.skipif("config.option.runappdirect")
+    def test_method_identity(self):
+        class A(object):
+            def m(self):
+                pass
+            def n(self):
+                pass
+
+        class B(A):
+            pass
+
+        class X(object):
+            def __eq__(self, other):
+                return True
+
+        a = A()
+        a2 = A()
+        assert a.m is a.m
+        assert id(a.m) == id(a.m)
+        assert a.m is not a.n
+        assert id(a.m) != id(a.n)
+        assert a.m is not a2.m
+        assert id(a.m) != id(a2.m)
+
+        assert A.m is A.m
+        assert id(A.m) == id(A.m)
+        assert A.m is not A.n
+        assert id(A.m) != id(A.n)
+        assert A.m is not B.m
+        assert id(A.m) != id(B.m)
+
 
 class TestMethod:
     def setup_method(self, method):
diff --git a/pypy/module/__builtin__/descriptor.py b/pypy/module/__builtin__/descriptor.py
--- a/pypy/module/__builtin__/descriptor.py
+++ b/pypy/module/__builtin__/descriptor.py
@@ -79,6 +79,7 @@
 W_Super.typedef = TypeDef(
     'super',
     __new__          = interp2app(descr_new_super),
+    __thisclass__    = interp_attrproperty_w("w_starttype", W_Super),
     __getattribute__ = interp2app(W_Super.getattribute),
     __get__          = interp2app(W_Super.get),
     __doc__          =     """super(type) -> unbound super object
diff --git a/pypy/module/__builtin__/test/test_classobj.py b/pypy/module/__builtin__/test/test_classobj.py
--- a/pypy/module/__builtin__/test/test_classobj.py
+++ b/pypy/module/__builtin__/test/test_classobj.py
@@ -452,7 +452,6 @@
         assert a + 1 == 2
         assert a + 1.1 == 2
 
-
     def test_binaryop_calls_coerce_always(self):
         l = []
         class A:
@@ -1076,6 +1075,16 @@
         assert (D() >  A()) == 'D:A.gt'
         assert (D() >= A()) == 'D:A.ge'
 
+    def test_override___int__(self):
+        class F(float):
+            def __int__(self):
+                return 666
+        f = F(-12.3)
+        assert int(f) == 666
+        # on cpython, this calls float_trunc() in floatobject.c
+        # which ends up calling PyFloat_AS_DOUBLE((PyFloatObject*) f)
+        assert float.__int__(f) == -12
+
 
 class AppTestOldStyleClassBytesDict(object):
     def setup_class(cls):
diff --git a/pypy/module/__builtin__/test/test_descriptor.py b/pypy/module/__builtin__/test/test_descriptor.py
--- a/pypy/module/__builtin__/test/test_descriptor.py
+++ b/pypy/module/__builtin__/test/test_descriptor.py
@@ -214,7 +214,7 @@
         c = C()
         assert C.goo(1) == (C, 1)
         assert c.goo(1) == (C, 1)
-        
+
         assert c.foo(1) == (c, 1)
         class D(C):
             pass
@@ -238,6 +238,17 @@
         meth = classmethod(1).__get__(1)
         raises(TypeError, meth)
 
+    def test_super_thisclass(self):
+        class A(object):
+            pass
+
+        assert super(A, A()).__thisclass__ is A
+
+        class B(A):
+            pass
+
+        assert super(B, B()).__thisclass__ is B
+        assert super(A, B()).__thisclass__ is A
 
     def test_property_docstring(self):
         assert property.__doc__.startswith('property')
diff --git a/pypy/module/_collections/app_defaultdict.py b/pypy/module/_collections/app_defaultdict.py
--- a/pypy/module/_collections/app_defaultdict.py
+++ b/pypy/module/_collections/app_defaultdict.py
@@ -12,6 +12,7 @@
 
 class defaultdict(dict):
     __slots__ = ['default_factory']
+    __module__ = 'collections'
 
     def __init__(self, *args, **kwds):
         if len(args) > 0:
diff --git a/pypy/module/_collections/test/test_defaultdict.py b/pypy/module/_collections/test/test_defaultdict.py
--- a/pypy/module/_collections/test/test_defaultdict.py
+++ b/pypy/module/_collections/test/test_defaultdict.py
@@ -14,6 +14,12 @@
         d[5].append(44)
         assert l == [42, 43] and l2 == [44]
 
+    def test_module(self):
+        from _collections import defaultdict
+        assert repr(defaultdict) in (
+            "",   # on PyPy
+            "")    # on CPython
+
     def test_keyerror_without_factory(self):
         from _collections import defaultdict
         for d1 in [defaultdict(), defaultdict(None)]:
diff --git a/pypy/module/_sre/interp_sre.py b/pypy/module/_sre/interp_sre.py
--- a/pypy/module/_sre/interp_sre.py
+++ b/pypy/module/_sre/interp_sre.py
@@ -7,6 +7,7 @@
 from pypy.interpreter.error import OperationError
 from rpython.rlib.rarithmetic import intmask
 from rpython.rlib import jit
+from rpython.rlib.rstring import StringBuilder, UnicodeBuilder
 
 # ____________________________________________________________
 #
@@ -36,6 +37,8 @@
     if 0 <= start <= end:
         if isinstance(ctx, rsre_core.BufMatchContext):
             return space.wrap(ctx._buffer.getslice(start, end, 1, end-start))
+        if isinstance(ctx, rsre_core.StrMatchContext):
+            return space.wrap(ctx._string[start:end])
         elif isinstance(ctx, rsre_core.UnicodeMatchContext):
             return space.wrap(ctx._unicodestr[start:end])
         else:
@@ -98,8 +101,8 @@
                              space.wrap("cannot copy this pattern object"))
 
     def make_ctx(self, w_string, pos=0, endpos=sys.maxint):
-        """Make a BufMatchContext or a UnicodeMatchContext for searching
-        in the given w_string object."""
+        """Make a StrMatchContext, BufMatchContext or a UnicodeMatchContext for
+        searching in the given w_string object."""
         space = self.space
         if pos < 0:
             pos = 0
@@ -113,6 +116,14 @@
                 endpos = len(unicodestr)
             return rsre_core.UnicodeMatchContext(self.code, unicodestr,
                                                  pos, endpos, self.flags)
+        elif space.isinstance_w(w_string, space.w_str):
+            str = space.str_w(w_string)
+            if pos > len(str):
+                pos = len(str)
+            if endpos > len(str):
+                endpos = len(str)
+            return rsre_core.StrMatchContext(self.code, str,
+                                             pos, endpos, self.flags)
         else:
             buf = space.readbuf_w(w_string)
             size = buf.getlength()
@@ -216,6 +227,11 @@
 
     def subx(self, w_ptemplate, w_string, count):
         space = self.space
+        # use a (much faster) string/unicode builder if w_ptemplate and
+        # w_string are both string or both unicode objects, and if w_ptemplate
+        # is a literal
+        use_builder = False
+        filter_as_unicode = filter_as_string = None
         if space.is_true(space.callable(w_ptemplate)):
             w_filter = w_ptemplate
             filter_is_callable = True
@@ -223,6 +239,8 @@
             if space.isinstance_w(w_ptemplate, space.w_unicode):
                 filter_as_unicode = space.unicode_w(w_ptemplate)
                 literal = u'\\' not in filter_as_unicode
+                use_builder = (
+                    space.isinstance_w(w_string, space.w_unicode) and literal)
             else:
                 try:
                     filter_as_string = space.str_w(w_ptemplate)
@@ -232,6 +250,8 @@
                     literal = False
                 else:
                     literal = '\\' not in filter_as_string
+                    use_builder = (
+                        space.isinstance_w(w_string, space.w_str) and literal)
             if literal:
                 w_filter = w_ptemplate
                 filter_is_callable = False
@@ -242,19 +262,44 @@
                                              space.wrap(self), w_ptemplate)
                 filter_is_callable = space.is_true(space.callable(w_filter))
         #
+        # XXX this is a bit of a mess, but it improves performance a lot
         ctx = self.make_ctx(w_string)
-        sublist_w = []
+        sublist_w = strbuilder = unicodebuilder = None
+        if use_builder:
+            if filter_as_unicode is not None:
+                unicodebuilder = UnicodeBuilder(ctx.end)
+            else:
+                assert filter_as_string is not None
+                strbuilder = StringBuilder(ctx.end)
+        else:
+            sublist_w = []
         n = last_pos = 0
         while not count or n < count:
+            sub_jitdriver.jit_merge_point(
+                self=self,
+                use_builder=use_builder,
+                filter_is_callable=filter_is_callable,
+                filter_type=type(w_filter),
+                ctx=ctx,
+                w_filter=w_filter,
+                strbuilder=strbuilder,
+                unicodebuilder=unicodebuilder,
+                filter_as_string=filter_as_string,
+                filter_as_unicode=filter_as_unicode,
+                count=count,
+                w_string=w_string,
+                n=n, last_pos=last_pos, sublist_w=sublist_w
+                )
+            space = self.space
             if not searchcontext(space, ctx):
                 break
             if last_pos < ctx.match_start:
-                sublist_w.append(slice_w(space, ctx, last_pos,
-                                         ctx.match_start, space.w_None))
+                _sub_append_slice(
+                    ctx, space, use_builder, sublist_w,
+                    strbuilder, unicodebuilder, last_pos, ctx.match_start)
             start = ctx.match_end
             if start == ctx.match_start:
                 start += 1
-            nextctx = ctx.fresh_copy(start)
             if not (last_pos == ctx.match_start
                              == ctx.match_end and n > 0):
                 # the above ignores empty matches on latest position
@@ -262,28 +307,71 @@
                     w_match = self.getmatch(ctx, True)
                     w_piece = space.call_function(w_filter, w_match)
                     if not space.is_w(w_piece, space.w_None):
+                        assert strbuilder is None and unicodebuilder is None
+                        assert not use_builder
                         sublist_w.append(w_piece)
                 else:
-                    sublist_w.append(w_filter)
+                    if use_builder:
+                        if strbuilder is not None:
+                            assert filter_as_string is not None
+                            strbuilder.append(filter_as_string)
+                        else:
+                            assert unicodebuilder is not None
+                            assert filter_as_unicode is not None
+                            unicodebuilder.append(filter_as_unicode)
+                    else:
+                        sublist_w.append(w_filter)
                 last_pos = ctx.match_end
                 n += 1
             elif last_pos >= ctx.end:
                 break    # empty match at the end: finished
-            ctx = nextctx
+            ctx.reset(start)
 
         if last_pos < ctx.end:
-            sublist_w.append(slice_w(space, ctx, last_pos, ctx.end,
-                                     space.w_None))
+            _sub_append_slice(ctx, space, use_builder, sublist_w,
+                              strbuilder, unicodebuilder, last_pos, ctx.end)
+        if use_builder:
+            if strbuilder is not None:
+                return space.wrap(strbuilder.build()), n
+            else:
+                assert unicodebuilder is not None
+                return space.wrap(unicodebuilder.build()), n
+        else:
+            if space.isinstance_w(w_string, space.w_unicode):
+                w_emptystr = space.wrap(u'')
+            else:
+                w_emptystr = space.wrap('')
+            w_item = space.call_method(w_emptystr, 'join',
+                                       space.newlist(sublist_w))
+            return w_item, n
 
-        if space.isinstance_w(w_string, space.w_unicode):
-            w_emptystr = space.wrap(u'')
-        else:
-            w_emptystr = space.wrap('')
-        w_item = space.call_method(w_emptystr, 'join',
-                                   space.newlist(sublist_w))
-        return w_item, n
+sub_jitdriver = jit.JitDriver(
+    reds="""count n last_pos
+            ctx w_filter
+            strbuilder unicodebuilder
+            filter_as_string
+            filter_as_unicode
+            w_string sublist_w
+            self""".split(),
+    greens=["filter_is_callable", "use_builder", "filter_type", "ctx.pattern"])
 
 
+def _sub_append_slice(ctx, space, use_builder, sublist_w,
+                      strbuilder, unicodebuilder, start, end):
+    if use_builder:
+        if isinstance(ctx, rsre_core.BufMatchContext):
+            assert strbuilder is not None
+            return strbuilder.append(ctx._buffer.getslice(start, end, 1, end-start))
+        if isinstance(ctx, rsre_core.StrMatchContext):
+            assert strbuilder is not None
+            return strbuilder.append_slice(ctx._string, start, end)
+        elif isinstance(ctx, rsre_core.UnicodeMatchContext):
+            assert unicodebuilder is not None
+            return unicodebuilder.append_slice(ctx._unicodestr, start, end)
+        assert 0, "unreachable"
+    else:
+        sublist_w.append(slice_w(space, ctx, start, end, space.w_None))
+
 @unwrap_spec(flags=int, groups=int, w_groupindex=WrappedDefault(None),
              w_indexgroup=WrappedDefault(None))
 def SRE_Pattern__new__(space, w_subtype, w_pattern, flags, w_code,
@@ -482,6 +570,8 @@
         ctx = self.ctx
         if isinstance(ctx, rsre_core.BufMatchContext):
             return space.wrap(ctx._buffer.as_str())
+        elif isinstance(ctx, rsre_core.StrMatchContext):
+            return space.wrap(ctx._string)
         elif isinstance(ctx, rsre_core.UnicodeMatchContext):
             return space.wrap(ctx._unicodestr)
         else:
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -60,10 +60,10 @@
     Must be smaller than 1.0
     """
     w_modules = space.sys.get('modules')
-    if space.contains_w(w_modules, space.wrap('_continuation')):
-        space.warn(space.wrap("Using _continuation/greenlet/stacklet together "
-                              "with vmprof will crash"),
-                   space.w_RuntimeWarning)
+    #if space.contains_w(w_modules, space.wrap('_continuation')):
+    #    space.warn(space.wrap("Using _continuation/greenlet/stacklet together "
+    #                          "with vmprof will crash"),
+    #               space.w_RuntimeWarning)
     try:
         rvmprof.enable(fileno, period)
     except rvmprof.VMProfError, e:
diff --git a/pypy/module/_vmprof/test/test__vmprof.py b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmprof/test/test__vmprof.py
+++ b/pypy/module/_vmprof/test/test__vmprof.py
@@ -5,14 +5,15 @@
 class AppTestVMProf(object):
     def setup_class(cls):
         cls.space = gettestobjspace(usemodules=['_vmprof', 'struct'])
-        cls.tmpfile = udir.join('test__vmprof.1').open('wb')
-        cls.w_tmpfileno = cls.space.wrap(cls.tmpfile.fileno())
-        cls.w_tmpfilename = cls.space.wrap(cls.tmpfile.name)
-        cls.tmpfile2 = udir.join('test__vmprof.2').open('wb')
-        cls.w_tmpfileno2 = cls.space.wrap(cls.tmpfile2.fileno())
-        cls.w_tmpfilename2 = cls.space.wrap(cls.tmpfile2.name)
+        cls.w_tmpfilename = cls.space.wrap(str(udir.join('test__vmprof.1')))
+        cls.w_tmpfilename2 = cls.space.wrap(str(udir.join('test__vmprof.2')))
 
     def test_import_vmprof(self):
+        tmpfile = open(self.tmpfilename, 'wb')
+        tmpfileno = tmpfile.fileno()
+        tmpfile2 = open(self.tmpfilename2, 'wb')
+        tmpfileno2 = tmpfile2.fileno()
+
         import struct, sys
 
         WORD = struct.calcsize('l')
@@ -45,7 +46,7 @@
             return count
         
         import _vmprof
-        _vmprof.enable(self.tmpfileno, 0.01)
+        _vmprof.enable(tmpfileno, 0.01)
         _vmprof.disable()
         s = open(self.tmpfilename, 'rb').read()
         no_of_codes = count(s)
@@ -56,7 +57,7 @@
             pass
         """ in d
 
-        _vmprof.enable(self.tmpfileno2, 0.01)
+        _vmprof.enable(tmpfileno2, 0.01)
 
         exec """def foo2():
             pass
diff --git a/pypy/module/cpyext/__init__.py b/pypy/module/cpyext/__init__.py
--- a/pypy/module/cpyext/__init__.py
+++ b/pypy/module/cpyext/__init__.py
@@ -34,7 +34,7 @@
 import pypy.module.cpyext.pyerrors
 import pypy.module.cpyext.typeobject
 import pypy.module.cpyext.object
-import pypy.module.cpyext.stringobject
+import pypy.module.cpyext.bytesobject
 import pypy.module.cpyext.tupleobject
 import pypy.module.cpyext.setobject
 import pypy.module.cpyext.dictobject
diff --git a/pypy/module/cpyext/stringobject.py b/pypy/module/cpyext/bytesobject.py
rename from pypy/module/cpyext/stringobject.py
rename to pypy/module/cpyext/bytesobject.py
diff --git a/pypy/module/cpyext/include/patchlevel.h b/pypy/module/cpyext/include/patchlevel.h
--- a/pypy/module/cpyext/include/patchlevel.h
+++ b/pypy/module/cpyext/include/patchlevel.h
@@ -29,8 +29,8 @@
 #define PY_VERSION		"2.7.10"
 
 /* PyPy version as a string */
-#define PYPY_VERSION "4.1.0-alpha0"
-#define PYPY_VERSION_NUM  0x04010000
+#define PYPY_VERSION "5.1.0-alpha0"
+#define PYPY_VERSION_NUM  0x05010000
 
 /* Defined to mean a PyPy where cpyext holds more regular references
    to PyObjects, e.g. staying alive as long as the internal PyPy object
diff --git a/pypy/module/cpyext/pyobject.py b/pypy/module/cpyext/pyobject.py
--- a/pypy/module/cpyext/pyobject.py
+++ b/pypy/module/cpyext/pyobject.py
@@ -192,7 +192,7 @@
 def from_ref(space, ref):
     """
     Finds the interpreter object corresponding to the given reference.  If the
-    object is not yet realized (see stringobject.py), creates it.
+    object is not yet realized (see bytesobject.py), creates it.
     """
     assert is_pyobj(ref)
     if not ref:
diff --git a/pypy/module/cpyext/structmember.py b/pypy/module/cpyext/structmember.py
--- a/pypy/module/cpyext/structmember.py
+++ b/pypy/module/cpyext/structmember.py
@@ -6,7 +6,7 @@
 from pypy.module.cpyext.intobject import PyInt_AsLong, PyInt_AsUnsignedLong
 from pypy.module.cpyext.pyerrors import PyErr_Occurred
 from pypy.module.cpyext.pyobject import PyObject, Py_DecRef, from_ref, make_ref
-from pypy.module.cpyext.stringobject import (
+from pypy.module.cpyext.bytesobject import (
     PyString_FromString, PyString_FromStringAndSize)
 from pypy.module.cpyext.floatobject import PyFloat_AsDouble
 from pypy.module.cpyext.longobject import (
diff --git a/pypy/module/cpyext/test/test_stringobject.py b/pypy/module/cpyext/test/test_bytesobject.py
rename from pypy/module/cpyext/test/test_stringobject.py
rename to pypy/module/cpyext/test/test_bytesobject.py
--- a/pypy/module/cpyext/test/test_stringobject.py
+++ b/pypy/module/cpyext/test/test_bytesobject.py
@@ -1,7 +1,7 @@
 from rpython.rtyper.lltypesystem import rffi, lltype
 from pypy.module.cpyext.test.test_api import BaseApiTest
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
-from pypy.module.cpyext.stringobject import new_empty_str, PyStringObject
+from pypy.module.cpyext.bytesobject import new_empty_str, PyStringObject
 from pypy.module.cpyext.api import PyObjectP, PyObject, Py_ssize_tP
 from pypy.module.cpyext.pyobject import Py_DecRef, from_ref, make_ref
 from pypy.module.cpyext.typeobjectdefs import PyTypeObjectPtr
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -422,7 +422,7 @@
 @cpython_api([PyObject, Py_ssize_t, rffi.VOIDPP], lltype.Signed,
              header=None, error=-1)
 def str_getreadbuffer(space, w_str, segment, ref):
-    from pypy.module.cpyext.stringobject import PyString_AsString
+    from pypy.module.cpyext.bytesobject import PyString_AsString
     if segment != 0:
         raise OperationError(space.w_SystemError, space.wrap
                              ("accessing non-existent string segment"))
@@ -435,7 +435,7 @@
 @cpython_api([PyObject, Py_ssize_t, rffi.CCHARPP], lltype.Signed,
              header=None, error=-1)
 def str_getcharbuffer(space, w_str, segment, ref):
-    from pypy.module.cpyext.stringobject import PyString_AsString
+    from pypy.module.cpyext.bytesobject import PyString_AsString
     if segment != 0:
         raise OperationError(space.w_SystemError, space.wrap
                              ("accessing non-existent string segment"))
@@ -552,7 +552,7 @@
         w_typename = space.getattr(w_type, space.wrap('__name__'))
         heaptype = rffi.cast(PyHeapTypeObject, pto)
         heaptype.c_ht_name = make_ref(space, w_typename)
-        from pypy.module.cpyext.stringobject import PyString_AsString
+        from pypy.module.cpyext.bytesobject import PyString_AsString
         pto.c_tp_name = PyString_AsString(space, heaptype.c_ht_name)
     else:
         pto.c_tp_name = rffi.str2charp(w_type.name)
diff --git a/pypy/module/cpyext/unicodeobject.py b/pypy/module/cpyext/unicodeobject.py
--- a/pypy/module/cpyext/unicodeobject.py
+++ b/pypy/module/cpyext/unicodeobject.py
@@ -9,7 +9,7 @@
 from pypy.module.cpyext.pyobject import (
     PyObject, PyObjectP, Py_DecRef, make_ref, from_ref, track_reference,
     make_typedescr, get_typedescr, as_pyobj)
-from pypy.module.cpyext.stringobject import PyString_Check
+from pypy.module.cpyext.bytesobject import PyString_Check
 from pypy.module.sys.interp_encoding import setdefaultencoding
 from pypy.module._codecs.interp_codecs import CodecState
 from pypy.objspace.std import unicodeobject
@@ -17,7 +17,7 @@
 from rpython.tool.sourcetools import func_renamer
 import sys
 
-## See comment in stringobject.py.
+## See comment in bytesobject.py.
 
 PyUnicodeObjectStruct = lltype.ForwardReference()
 PyUnicodeObject = lltype.Ptr(PyUnicodeObjectStruct)
diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py
--- a/pypy/module/imp/importing.py
+++ b/pypy/module/imp/importing.py
@@ -85,7 +85,7 @@
     # The "imp" module does not respect this, and is allowed to find
     # lone .pyc files.
     # check the .pyc file
-    if space.config.objspace.usepycfiles and space.config.objspace.lonepycfiles:
+    if space.config.objspace.lonepycfiles:
         pycfile = filepart + ".pyc"
         if file_exists(pycfile):
             # existing .pyc file
@@ -888,17 +888,11 @@
     """
     w = space.wrap
 
-    if space.config.objspace.usepycfiles:

From pypy.commits at gmail.com  Wed Mar  9 14:32:50 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 11:32:50 -0800 (PST)
Subject: [pypy-commit] pypy default: tweak,
 removed the release version from html page titles in 181dc3529afd
Message-ID: <56e07a62.02931c0a.ba4dc.0673@mx.google.com>

Author: mattip 
Branch: 
Changeset: r82921:502d06a17d85
Date: 2016-03-09 21:32 +0200
http://bitbucket.org/pypy/pypy/changeset/502d06a17d85/

Log:	tweak, removed the release version from html page titles in
	181dc3529afd

diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst
--- a/pypy/doc/how-to-release.rst
+++ b/pypy/doc/how-to-release.rst
@@ -76,5 +76,4 @@
 
 * add a tag on the pypy/jitviewer repo that corresponds to pypy release
 * add a tag on the codespeed web site that corresponds to pypy release
-* update the version number in {rpython,pypy}/doc/conf.py.
 * revise versioning at https://readthedocs.org/projects/pypy

From pypy.commits at gmail.com  Wed Mar  9 15:32:27 2016
From: pypy.commits at gmail.com (mattip)
Date: Wed, 09 Mar 2016 12:32:27 -0800 (PST)
Subject: [pypy-commit] pypy default: update after cpyext-gc-support-2,
 cffi-embedding
Message-ID: <56e0885b.85371c0a.fc4e6.1b8f@mx.google.com>

Author: mattip 
Branch: 
Changeset: r82922:b1391819cc98
Date: 2016-03-09 22:31 +0200
http://bitbucket.org/pypy/pypy/changeset/b1391819cc98/

Log:	update after cpyext-gc-support-2, cffi-embedding

diff --git a/pypy/doc/project-ideas.rst b/pypy/doc/project-ideas.rst
--- a/pypy/doc/project-ideas.rst
+++ b/pypy/doc/project-ideas.rst
@@ -167,22 +167,13 @@
 * `hg`
 
 
-Embedding PyPy and improving CFFI
----------------------------------
-
-PyPy has some basic :doc:`embedding infrastructure `. The idea would be to improve
-upon that with cffi hacks that can automatically generate embeddable .so/.dll
-library
-
-
 Optimising cpyext (CPython C-API compatibility layer)
 -----------------------------------------------------
 
 A lot of work has gone into PyPy's implementation of CPython's C-API over
 the last years to let it reach a practical level of compatibility, so that
 C extensions for CPython work on PyPy without major rewrites. However,
-there are still many edges and corner cases where it misbehaves, and it has
-not received any substantial optimisation so far.
+there are still many edges and corner cases where it misbehaves.
 
 The objective of this project is to fix bugs in cpyext and to optimise
 several performance critical parts of it, such as the reference counting

From pypy.commits at gmail.com  Wed Mar  9 15:45:39 2016
From: pypy.commits at gmail.com (rlamy)
Date: Wed, 09 Mar 2016 12:45:39 -0800 (PST)
Subject: [pypy-commit] pypy pypy3.3-bootstrap: Do not store the absolute
 path of the source into the translated executable (breaks stuff)
Message-ID: <56e08b73.c711c30a.d2f7e.2437@mx.google.com>

Author: Ronan Lamy 
Branch: pypy3.3-bootstrap
Changeset: r82923:6a5e412892d7
Date: 2016-03-09 20:43 +0000
http://bitbucket.org/pypy/pypy/changeset/6a5e412892d7/

Log:	Do not store the absolute path of the source into the translated
	executable (breaks stuff)

diff --git a/pypy/module/sys/state.py b/pypy/module/sys/state.py
--- a/pypy/module/sys/state.py
+++ b/pypy/module/sys/state.py
@@ -14,16 +14,7 @@
         self.w_modules = space.newdict(module=True)
         self.w_warnoptions = space.newlist([])
         self.w_argv = space.newlist([])
-
-        self.setinitialpath(space)
-
-    def setinitialpath(self, space):
-        from pypy.module.sys.initpath import compute_stdlib_path
-        # Initialize the default path
-        pypydir = os.path.dirname(os.path.abspath(pypy.__file__))
-        srcdir = os.path.dirname(pypydir)
-        path = compute_stdlib_path(self, srcdir)
-        self.w_path = space.newlist([space.wrap(p) for p in path])
+        self.w_path = space.newlist([])
 
 def get(space):
     return space.fromcache(State)

From pypy.commits at gmail.com  Wed Mar  9 16:32:53 2016
From: pypy.commits at gmail.com (arigo)
Date: Wed, 09 Mar 2016 13:32:53 -0800 (PST)
Subject: [pypy-commit] pypy default: We made a vailiant effort to add the
 freebsd64 buildslave to the release
Message-ID: <56e09685.463f1c0a.4d645.2f77@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r82924:a06076d31e8d
Date: 2016-03-09 22:32 +0100
http://bitbucket.org/pypy/pypy/changeset/a06076d31e8d/

Log:	We made a vailiant effort to add the freebsd64 buildslave to the
	release script the 23-Aug-15, hoping it would stay around this time,
	but alas, it disappeared 27-Oct-15 and never showed up again

diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -9,7 +9,7 @@
 # download source, assuming a tag for the release already exists, and repackage them.
 # The script should be run in an empty directory, i.e. /tmp/release_xxx
 
-for plat in linux linux64 linux-armhf-raspbian linux-armhf-raring linux-armel osx64 freebsd64
+for plat in linux linux64 linux-armhf-raspbian linux-armhf-raring linux-armel osx64
   do
     wget http://buildbot.pypy.org/nightly/$branchname/pypy-c-jit-latest-$plat.tar.bz2
     tar -xf pypy-c-jit-latest-$plat.tar.bz2

From pypy.commits at gmail.com  Thu Mar 10 03:45:28 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 00:45:28 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: use more hypothesis and fix
 the next problem
Message-ID: <56e13428.d4e01c0a.cdf5a.ffffba23@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82925:7fef527aef0b
Date: 2016-03-10 10:44 +0200
http://bitbucket.org/pypy/pypy/changeset/7fef527aef0b/

Log:	use more hypothesis and fix the next problem

diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -47,6 +47,7 @@
     def get_size_jitcode_pc(self):
         if self.save_pos >= 0:
             self.pos = self.save_pos
+            self.save_pos = -1
         size = self._next()
         if size < 0:
             self.save_pos = self.pos
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -1581,6 +1581,7 @@
         effectinfo = descr.get_extra_info()
         if effectinfo.oopspecindex == effectinfo.OS_NOT_IN_TRACE:
             return self.metainterp.do_not_in_trace_call(allboxes, descr)
+        cut_pos = self.metainterp.history.get_trace_position()
 
         if (assembler_call or
                 effectinfo.check_forces_virtual_or_virtualizable()):
@@ -1618,8 +1619,8 @@
             self.metainterp.vrefs_after_residual_call()
             vablebox = None
             if assembler_call:
-                vablebox, resbox = self.metainterp.direct_assembler_call(
-                    assembler_call_jd)
+                vablebox, resbox = self.metainterp.direct_assembler_call(resbox,
+                    assembler_call_jd, cut_pos)
             if resbox and resbox.type != 'v':
                 self.make_result_of_lastop(resbox)
             self.metainterp.vable_after_residual_call(funcbox)
@@ -3007,11 +3008,11 @@
         newop.copy_value_from(op)
         return newop
 
-    def direct_assembler_call(self, targetjitdriver_sd):
+    def direct_assembler_call(self, op, targetjitdriver_sd, cut_pos):
         """ Generate a direct call to assembler for portal entry point,
         patching the CALL_MAY_FORCE that occurred just now.
         """
-        op = self.history.operations.pop()
+        self.history.cut(cut_pos)
         assert op.is_call_may_force()
         num_green_args = targetjitdriver_sd.num_green_args
         arglist = op.getarglist()
@@ -3021,8 +3022,9 @@
         warmrunnerstate = targetjitdriver_sd.warmstate
         token = warmrunnerstate.get_assembler_token(greenargs)
         opnum = OpHelpers.call_assembler_for_descr(op.getdescr())
-        op = op.copy_and_change(opnum, args=args, descr=token)
-        self.history.operations.append(op)
+        oldop = op
+        op = self.history.record_nospec(opnum, args, descr=token)
+        op.copy_value_from(oldop)
         if opnum == rop.CALL_ASSEMBLER_N:
             op = None
         #
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -200,14 +200,12 @@
 class NumberingState(object):
     def __init__(self, size):
         self.liveboxes = {}
-        self.current = [rffi.cast(rffi.SHORT, 0)] * (size + 2)
-        self.position = 0
+        self.current = []
         self.n = 0
         self.v = 0
 
     def append(self, item):
-        self.current[self.position] = item
-        self.position += 1
+        self.current.append(item)
 
 class ResumeDataLoopMemo(object):
 
@@ -317,15 +315,13 @@
         #self._number_boxes(topsnapshot.boxes, optimizer, state)
         #assert state.position == special_boxes_size
 
-        total = 2
         while not snapshot_iter.done():
             size, jitcode_index, pc = snapshot_iter.get_size_jitcode_pc()
-            total += 2 + size
             state.append(rffi.cast(rffi.SHORT, jitcode_index))
             state.append(rffi.cast(rffi.SHORT, pc))
             self._number_boxes(snapshot_iter, size, optimizer, state)
 
-        numb = resumecode.create_numbering(state.current, total)
+        numb = resumecode.create_numbering(state.current)
         return numb, state.liveboxes, state.v
         
     def forget_numberings(self):
diff --git a/rpython/jit/metainterp/test/strategies.py b/rpython/jit/metainterp/test/strategies.py
--- a/rpython/jit/metainterp/test/strategies.py
+++ b/rpython/jit/metainterp/test/strategies.py
@@ -12,27 +12,64 @@
 boxlists = strategies.lists(boxes, min_size=1).flatmap(
     lambda cis: strategies.lists(strategies.sampled_from(cis)))
 
+const_or_box = strategies.sampled_from(['const', 'box'])
+
+class JitCode(object):
+    def __init__(self, index):
+        self.index = index
+
+class Frame(object):
+    parent_resumedata_position = -1
+
+    def __init__(self, jitcode, pc, boxes):
+        self.jitcode = jitcode
+        self.pc = pc
+        self.boxes = boxes
+
+    def get_list_of_active_boxes(self, flag):
+        return self.boxes
+
+def get_arg(draw, all_ops, allow_const=True):
+    if allow_const:
+        tp = draw(const_or_box)
+        if tp == 'const':
+            return draw(intconsts)
+    return draw(strategies.sampled_from(all_ops))
+
+def gen_int_add(draw, all_ops, framestack):
+    arg0 = get_arg(draw, all_ops)
+    arg1 = get_arg(draw, all_ops)
+    res = ResOperation(rop.INT_ADD, [arg0, arg1])
+    all_ops.add(res)
+    return res
+
+def gen_guard_true(draw, all_ops, framestack):
+    arg = get_arg(draw, all_ops, allow_const=False)
+    res = ResOperation(rop.GUARD_TRUE, [arg])
+    if draw(strategies.booleans()):
+        s = []
+        for i in range(10):
+            s.append(get_arg(draw, all_ops, allow_const=False))
+        boxes = list(set(s))
+        framestack.append(Frame(JitCode(1), 2, boxes))
+    res.framestack = framestack[:]
+    return res
+
+resops = strategies.sampled_from([gen_int_add, gen_guard_true])
+
 @strategies.composite
 def lists_of_operations(draw, inputboxes=intboxes):
-    def get(draw, l1, l2, index):
-        if index < len(l1):
-            return l1[index]
-        index -= len(l1)
-        if index >= len(l2):
-            return draw(intconsts)
-        return l2[index]
-
     size = draw(strategies.integers(min_value=1, max_value=100))
     inputargs = []
     for i in range(size):
         inputargs.append(draw(inputboxes))
     size = draw(strategies.integers(min_value=1, max_value=100))
     ops = []
+    all_ops = set(inputargs)
+    framestack = [Frame(JitCode(1), 2, [])]
     for i in range(size):
-        s = strategies.integers(min_value=0, max_value=len(inputargs) + 2 * len(ops))
-        arg0 = get(draw, inputargs, ops, draw(s))
-        arg1 = get(draw, inputargs, ops, draw(s))
-        ops.append(ResOperation(rop.INT_ADD, [arg0, arg1], -1))
+        opgen = draw(resops)
+        ops.append(opgen(draw, all_ops, framestack))
     return inputargs, ops
 
 if __name__ == '__main__':
diff --git a/rpython/jit/metainterp/test/test_opencoder.py b/rpython/jit/metainterp/test/test_opencoder.py
--- a/rpython/jit/metainterp/test/test_opencoder.py
+++ b/rpython/jit/metainterp/test/test_opencoder.py
@@ -43,7 +43,17 @@
         iter = t.get_iter()
         l = []
         while not iter.done():
-            l.append(iter.next())
+            op = iter.next()
+            if op.is_guard():
+                op.framestack = []
+                si = iter.get_snapshot_iter(op.rd_resume_position)
+                while not si.done():
+                    size, jitcode, pc = si.get_size_jitcode_pc()
+                    boxes = []
+                    for i in range(size):
+                        boxes.append(si.next())
+                    op.framestack.append(FakeFrame(JitCode(jitcode), pc, boxes))
+            l.append(op)
         return iter.inputargs, l, iter
 
     def test_simple_iterator(self):
@@ -121,6 +131,10 @@
         t = Trace(inputargs)
         for op in ops:
             newop = t.record_op(op.getopnum(), op.getarglist())
+            newop.orig_op = op
+            if newop.is_guard():
+                resume.capture_resumedata(op.framestack,
+                    None, [], t)
             op.position = newop.position
         inpargs, l, iter = self.unpack(t)
         loop1 = TreeLoop("loop1")

From pypy.commits at gmail.com  Thu Mar 10 03:48:48 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 10 Mar 2016 00:48:48 -0800 (PST)
Subject: [pypy-commit] pypy s390x-backend: test fixes broken by merge
Message-ID: <56e134f0.6672c20a.19861.ffffc3c8@mx.google.com>

Author: Richard Plangger 
Branch: s390x-backend
Changeset: r82926:8cdcda35c815
Date: 2016-03-10 08:47 +0100
http://bitbucket.org/pypy/pypy/changeset/8cdcda35c815/

Log:	test fixes broken by merge

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
@@ -12,3 +12,8 @@
 .. branch: s390x-backend
 
 The jit compiler backend implementation for the s390x architecutre.
+
+.. branch: s390x-enhance-speedup
+
+Refactoring to only store 64-bit values in the literal pool of the assembly. Generated machine code uses less space and runs faster.
+
diff --git a/rpython/jit/backend/zarch/test/test_assembler.py b/rpython/jit/backend/zarch/test/test_assembler.py
--- a/rpython/jit/backend/zarch/test/test_assembler.py
+++ b/rpython/jit/backend/zarch/test/test_assembler.py
@@ -605,7 +605,7 @@
 
         # ensure there is just on instruction for the 'best case'
         self.pushpop_jitframe(r.MANAGED_REGS)
-        assert stored == [(r.r2, r.r11), (r.r13,)]
+        assert stored == [(r.r2, r.r11)]
         assert stored == loaded
         stored = []
         loaded = []

From pypy.commits at gmail.com  Thu Mar 10 03:48:50 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 10 Mar 2016 00:48:50 -0800 (PST)
Subject: [pypy-commit] pypy s390x-backend: added print statement to test
Message-ID: <56e134f2.04371c0a.e08b4.ffffbedf@mx.google.com>

Author: Richard Plangger 
Branch: s390x-backend
Changeset: r82927:290a4a57f4ac
Date: 2016-03-10 09:48 +0100
http://bitbucket.org/pypy/pypy/changeset/290a4a57f4ac/

Log:	added print statement to test

diff --git a/rpython/rlib/test/test_rthread.py b/rpython/rlib/test/test_rthread.py
--- a/rpython/rlib/test/test_rthread.py
+++ b/rpython/rlib/test/test_rthread.py
@@ -150,6 +150,7 @@
                 willing_to_wait_more -= 1
                 done = len(state.answers) == expected
 
+                print "waitting %d more iterations" % willing_to_wait_more
                 time.sleep(0.01)
 
             time.sleep(0.1)

From pypy.commits at gmail.com  Thu Mar 10 03:52:37 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 00:52:37 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: fix some typos and details
Message-ID: <56e135d5.0775c20a.7b5df.ffffc16e@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82928:96773552cf51
Date: 2016-03-10 10:51 +0200
http://bitbucket.org/pypy/pypy/changeset/96773552cf51/

Log:	fix some typos and details

diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -274,6 +274,15 @@
     def get_iter(self):
         return TraceIterator(self, 0, len(self._ops))
 
+    def unpack(self):
+        """ NOT_RPYTHON - really rpython, but only use for debugging
+        """
+        iter = self.get_iter()
+        ops = []
+        while not iter.done():
+            ops.append(iter.next())
+        return ops
+
     def _get_operations(self):
         """ NOT_RPYTHON
         """
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -424,7 +424,7 @@
         elif self.level == LEVEL_NONNULL:
             if other.level == LEVEL_UNKNOWN:
                 if runtime_box is not None and runtime_box.nonnull():
-                    op = ResOperation(rop.GUARD_NONNULL, [box], None)
+                    op = ResOperation(rop.GUARD_NONNULL, [box])
                     extra_guards.append(op)
                     return
                 else:
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -1387,7 +1387,7 @@
 
     @arguments()
     def opimpl_current_trace_length(self):
-        trace_length = len(self.metainterp.history.operations)
+        trace_length = self.metainterp.history.length()
         return ConstInt(trace_length)
 
     @arguments("box")
@@ -2618,6 +2618,7 @@
                 live_arg_boxes[num_green_args:])
         finally:
             self.history.cut(cut_at) # pop the jump
+            self.history.ends_with_jump = False
         if target_token is not None: # raise if it *worked* correctly
             assert isinstance(target_token, TargetToken)
             jitcell_token = target_token.targeting_jitcell_token
diff --git a/rpython/jit/metainterp/test/test_ajit.py b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -2007,7 +2007,7 @@
         res = self.meta_interp(g, [3, 14])
         assert res == g(3, 14)
 
-    def test_specialied_bridge(self):
+    def test_specialized_bridge(self):
         myjitdriver = JitDriver(greens = [], reds = ['y', 'x', 'res'])
         class A:
             def __init__(self, val):

From pypy.commits at gmail.com  Thu Mar 10 04:04:28 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 01:04:28 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: a hack to allow dance
 around handling exception and resume data before writing actual history
Message-ID: <56e1389c.a151c20a.b61d7.ffffc7eb@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82929:43e4af36f9a3
Date: 2016-03-10 11:03 +0200
http://bitbucket.org/pypy/pypy/changeset/43e4af36f9a3/

Log:	a hack to allow dance around handling exception and resume data
	before writing actual history

diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2344,22 +2344,22 @@
         if self.resumekey_original_loop_token is None:
             raise compile.giveup() # should be rare
         self.staticdata.try_to_free_some_loops()
-        self.initialize_state_from_guard_failure(key, deadframe)
+        inputargs = self.initialize_state_from_guard_failure(key, deadframe)
         try:
-            return self._handle_guard_failure(resumedescr, key, deadframe)
+            return self._handle_guard_failure(resumedescr, key, inputargs, deadframe)
         finally:
             self.resumekey_original_loop_token = None
             self.staticdata.profiler.end_tracing()
             debug_stop('jit-tracing')
 
-    def _handle_guard_failure(self, resumedescr, key, deadframe):
+    def _handle_guard_failure(self, resumedescr, key, inputargs, deadframe):
         self.current_merge_points = []
         self.resumekey = resumedescr
         self.seen_loop_header_for_jdindex = -1
         if isinstance(key, compile.ResumeAtPositionDescr):
             self.seen_loop_header_for_jdindex = self.jitdriver_sd.index
         try:
-            self.prepare_resume_from_failure(deadframe, resumedescr)
+            self.prepare_resume_from_failure(deadframe, inputargs, resumedescr)
             if self.resumekey_original_loop_token is None:   # very rare case
                 raise SwitchToBlackhole(Counters.ABORT_BRIDGE)
             self.interpret()
@@ -2502,7 +2502,7 @@
             else: assert 0
         self.jitdriver_sd.warmstate.execute_assembler(loop_token, *args)
 
-    def prepare_resume_from_failure(self, deadframe, resumedescr):
+    def prepare_resume_from_failure(self, deadframe, inputargs, resumedescr):
         exception = self.cpu.grab_exc_value(deadframe)
         if (isinstance(resumedescr, compile.ResumeGuardExcDescr) or
             isinstance(resumedescr, compile.ResumeGuardCopiedExcDescr)):
@@ -2526,13 +2526,15 @@
                     llmemory.cast_ptr_to_adr(exception_obj.typeptr))
             else:
                 exc_class = 0
-            i = len(self.history.operations)
+            assert self.history.trace is None
+            i = len(self.history._cache)
             op1 = self.history.record(rop.SAVE_EXC_CLASS, [], exc_class)
             op2 = self.history.record(rop.SAVE_EXCEPTION, [], exception)
-            assert op1 is self.history.operations[i]
-            assert op2 is self.history.operations[i + 1]
-            self.history.operations = [op1, op2] + self.history.operations[:i]
+            assert op1 is self.history._cache[i]
+            assert op2 is self.history._cache[i + 1]
+            self.history._cache = [op1, op2] + self.history._cache[:i]
             self.history.record(rop.RESTORE_EXCEPTION, [op1, op2], None)
+            self.history.set_inputargs(inputargs)
             if exception_obj:
                 self.execute_ll_raised(exception_obj)
             else:
@@ -2542,6 +2544,7 @@
             except ChangeFrame:
                 pass
         else:
+            self.history.set_inputargs(inputargs)
             assert not exception
 
     def get_procedure_token(self, greenkey, with_compiled_targets=False):
@@ -2673,7 +2676,7 @@
         sd = self.staticdata
         token = sd.loop_tokens_exit_frame_with_exception_ref[0].finishdescr
         self.history.record(rop.FINISH, [valuebox], None, descr=token)
-        target_token = compile.compile_trace(self, self.resumekey)
+        target_token = compile.compile_trace(self, self.resumekey, [valuebox])
         if target_token is not token:
             compile.giveup()
 
@@ -2715,7 +2718,7 @@
             self.history = history.History()
             inputargs_and_holes = self.rebuild_state_after_failure(resumedescr,
                                                                    deadframe)
-            self.history.set_inputargs([box for box in inputargs_and_holes if box])
+            return [box for box in inputargs_and_holes if box]
         finally:
             rstack._stack_criticalcode_stop()
 

From pypy.commits at gmail.com  Thu Mar 10 05:26:37 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 02:26:37 -0800 (PST)
Subject: [pypy-commit] pypy default: oops
Message-ID: <56e14bdd.c711c30a.d2f7e.ffffe547@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r82930:f7c9e212e5f3
Date: 2016-03-10 11:25 +0100
http://bitbucket.org/pypy/pypy/changeset/f7c9e212e5f3/

Log:	oops

diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -29,7 +29,7 @@
 # Do this after creating a tag, note the untarred directory is pypy-pypy-
 # so make sure there is not another one
 wget https://bitbucket.org/pypy/pypy/get/$tagname.tar.bz2
-tar -xf release-$maj.$min.$rev.tar.bz2
+tar -xf $tagname.tar.bz2
 mv pypy-pypy-* pypy-$maj.$min.$rev-src
 tar --owner=root --group=root --numeric-owner -cvjf pypy-$maj.$min.$rev-src.tar.bz2 pypy-$maj.$min.$rev-src
 zip -r pypy-$maj.$min.$rev-src.zip pypy-$maj.$min.$rev-src

From pypy.commits at gmail.com  Thu Mar 10 05:33:27 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 10 Mar 2016 02:33:27 -0800 (PST)
Subject: [pypy-commit] pypy s390x-backend: condition code to jmp param
 included a case it should not have! __sync_lock_test_and_set changed to do
 exactly the same as emitted by gcc
Message-ID: <56e14d77.12871c0a.4cac2.ffffec6b@mx.google.com>

Author: Richard Plangger 
Branch: s390x-backend
Changeset: r82931:87b9598ed2c7
Date: 2016-03-10 11:32 +0100
http://bitbucket.org/pypy/pypy/changeset/87b9598ed2c7/

Log:	condition code to jmp param included a case it should not have!
	__sync_lock_test_and_set changed to do exactly the same as emitted
	by gcc

diff --git a/rpython/jit/backend/zarch/callbuilder.py b/rpython/jit/backend/zarch/callbuilder.py
--- a/rpython/jit/backend/zarch/callbuilder.py
+++ b/rpython/jit/backend/zarch/callbuilder.py
@@ -216,15 +216,16 @@
 
         # Equivalent of 'r13 = __sync_lock_test_and_set(&rpy_fastgil, 1);'
         self.mc.LGHI(r.SCRATCH, l.imm(1))
+        self.mc.LG(r.r13, l.addr(0, RFASTGILPTR))
         retry_label = self.mc.currpos()
-        self.mc.LG(r.r13, l.addr(0, RFASTGILPTR))
+        self.mc.LGR(r.r14, r.r13) 
         self.mc.CSG(r.r13, r.SCRATCH, l.addr(0, RFASTGILPTR))  # try to claim lock
-        self.mc.BRC(c.NE, l.imm(retry_label - self.mc.currpos())) # retry if failed
+        self.mc.BRC(c.LT, l.imm(retry_label - self.mc.currpos())) # retry if failed
 
         # CSG performs a serialization
         # zarch is sequential consistent!
 
-        self.mc.CGHI(r.r13, l.imm0)
+        self.mc.CGHI(r.r14, l.imm0)
         b1_location = self.mc.currpos()
         # boehm: patched with a BEQ: jump if r13 is zero
         # shadowstack: patched with BNE instead
@@ -246,8 +247,8 @@
 
             # revert the rpy_fastgil acquired above, so that the
             # general 'reacqgil_addr' below can acquire it again...
-            # (here, r13 is conveniently zero)
-            self.mc.STG(r.r13, l.addr(0, RFASTGILPTR))
+            # (here, r14 is conveniently zero)
+            self.mc.STG(r.r14, l.addr(0, RFASTGILPTR))
 
             pmc = OverwritingBuilder(self.mc, bne_location, 1)
             pmc.BRCL(c.NE, l.imm(self.mc.currpos() - bne_location))

From pypy.commits at gmail.com  Thu Mar 10 05:35:06 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 02:35:06 -0800 (PST)
Subject: [pypy-commit] pypy.org extradoc: write checksums
Message-ID: <56e14dda.a3abc20a.7a71e.ffffe226@mx.google.com>

Author: Armin Rigo 
Branch: extradoc
Changeset: r716:936b6cb4040c
Date: 2016-03-10 11:34 +0100
http://bitbucket.org/pypy/pypy.org/changeset/936b6cb4040c/

Log:	write checksums

diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -417,6 +417,20 @@
     d4492e65201bb09dca5f97601113dc57  pypy-4.0.1-ppc64le.tar.bz2
     2aadbb7638153b9d7c2a832888ed3c1e  pypy-4.0.1-ppc64.tar.bz2
 
+pypy-5.0.0 md5::
+
+    bcb5c830d6380ff78b759dbe075dfc14  pypy-5.0.0-linux-armel.tar.bz2
+    5649117ba754bef14550b6abc2135eab  pypy-5.0.0-linux-armhf-raring.tar.bz2
+    949344fff9c6942713f34e1a1fcbc7aa  pypy-5.0.0-linux-armhf-raspbian.tar.bz2
+    5e005cf26a3a58552fd77f9aaae6f614  pypy-5.0.0-linux.tar.bz2
+    133530cb9957a67807b25d23bb74ac24  pypy-5.0.0-linux64.tar.bz2
+    a091398908bf525149a1fdea8bf48ec2  pypy-5.0.0-osx64.tar.bz2
+    f243ff399a55f4370b6d1dc0a3650f1d  pypy-5.0.0-ppc64.tar.bz2
+    51fb75ae0a143faa9a5b39f094965050  pypy-5.0.0-ppc64le.tar.bz2
+    6a26f735cb45a10255076fdd6cebee84  pypy-5.0.0-src.tar.bz2
+    1be14cf3ffc97da7521637f8f81abc3c  pypy-5.0.0-src.zip
+    d2c8237e8106b535850596f0e9762246  pypy-5.0.0-win32.zip
+
 pypy3-2.4.0 md5::
 
    eadbc9790823fc0ae40c943087cd7cb3  pypy3-2.4.0-linux64.tar.bz2
@@ -450,6 +464,34 @@
     e344b383e8c745cc7c26bbcb0a43958e768fdd1d29dd0799cc148e0518d8d36f  pypy-4.0.1-src.zip
     9a350a5e6f9b86fb525c6f1300b0c97c021ea8b1e37bfd32a8c4bb7a415d5329  pypy-4.0.1-win32.zip
 
+pypy-5.0.0 sha1::
+    
+    b7c82d437086660759ec18582dbdaf198b77e467  pypy-5.0.0-linux-armel.tar.bz2
+    85978b1d33b0db8b512eebb1558200c3ab76d462  pypy-5.0.0-linux-armhf-raring.tar.bz2
+    271472d0362ce02fd656024b64f0343cc8193f9d  pypy-5.0.0-linux-armhf-raspbian.tar.bz2
+    88ac71eebd65c35032325497cc450b4d184be005  pypy-5.0.0-linux.tar.bz2
+    22d32d92899a07cb8cbba4b8918a7919e34246c4  pypy-5.0.0-linux64.tar.bz2
+    f652b264ba063a8c472b753baaaacf63690be6c5  pypy-5.0.0-osx64.tar.bz2
+    5620cead511ad33f9fface224544b70d72d9e4c9  pypy-5.0.0-ppc64.tar.bz2
+    6ee6b0eb574f3d29a5eaf29fdae8745fd9fe3c38  pypy-5.0.0-ppc64le.tar.bz2
+    62ce000b887ea22f5bdddcc0f24dd571ca534f57  pypy-5.0.0-src.tar.bz2
+    6dcbde8242e0ee985ffed63c5bf204e7fd74ac2c  pypy-5.0.0-src.zip
+    62cef0e0dd8849c224c647e53b13d3c47c99807d  pypy-5.0.0-win32.zip
+
+pypy-5.0.0 sha256::
+
+    87bd85441b16ecca0d45ba6e9c0e9d26bb7bd8867afbf79d80312cf79b032dc1  pypy-5.0.0-linux-armel.tar.bz2
+    5bb52cf5db4ae8497c4e03cd8a70e49867e6b93d9f29ad335d030fcd3a375769  pypy-5.0.0-linux-armhf-raring.tar.bz2
+    8033c0cc39e9f6771688f2eda95c726595f5453b3e73e1cd5f7ebbe3dae1f685  pypy-5.0.0-linux-armhf-raspbian.tar.bz2
+    a9cc9afa94ff1cde811626a70081c477c9840e7816c0562d1903fd823d222ceb  pypy-5.0.0-linux.tar.bz2
+    b9c73be8e3c3b0835df83bdb86335712005240071cdd4dc245ac30b457063ae0  pypy-5.0.0-linux64.tar.bz2
+    45ed8bf799d0fd8eb051cbcc427173fba74dc9c2f6c309d7a3cc90f4917e6a10  pypy-5.0.0-osx64.tar.bz2
+    334a37e68cb543cf2cbcdd12379b9b770064bb70ba7fd104f1e451cfa10cdda5  pypy-5.0.0-ppc64.tar.bz2
+    e72fe5c094186f79c997000ddbaa01616def652a8d1338b75a27dfa3755eb86c  pypy-5.0.0-ppc64le.tar.bz2
+    89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab  pypy-5.0.0-src.tar.bz2
+    03e19e9bafccf5b2f4dd422699f3fe42da754c3fcc1d1fd4c8d585d7c9d1849d  pypy-5.0.0-src.zip
+    c53f0946703f5e4885484c7cde2554a0320537135bf8965e054757c214412438  pypy-5.0.0-win32.zip
+
 pypy3-2.4.0 sha1::
 
    7d715742f6929351b310a2ca3b924cab35913089  pypy3-2.4.0-linux64.tar.bz2

From pypy.commits at gmail.com  Thu Mar 10 05:41:26 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 10 Mar 2016 02:41:26 -0800 (PST)
Subject: [pypy-commit] pypy s390x-backend: added serialization point (to
 test if this is a problem for the threading issues)
Message-ID: <56e14f56.49f9c20a.dd60d.ffffe5d3@mx.google.com>

Author: Richard Plangger 
Branch: s390x-backend
Changeset: r82932:632d518f2072
Date: 2016-03-10 11:40 +0100
http://bitbucket.org/pypy/pypy/changeset/632d518f2072/

Log:	added serialization point (to test if this is a problem for the
	threading issues)

diff --git a/rpython/jit/backend/zarch/callbuilder.py b/rpython/jit/backend/zarch/callbuilder.py
--- a/rpython/jit/backend/zarch/callbuilder.py
+++ b/rpython/jit/backend/zarch/callbuilder.py
@@ -203,6 +203,7 @@
         self.mc.XGR(r.SCRATCH, r.SCRATCH)
         # zarch is sequentially consistent
         self.mc.STG(r.SCRATCH, l.addr(0, RFASTGILPTR))
+        self.mc.BCR_rr(0xe, 0x0)
 
 
     def move_real_result_and_call_reacqgil_addr(self, fastgil):

From pypy.commits at gmail.com  Thu Mar 10 05:56:43 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 02:56:43 -0800 (PST)
Subject: [pypy-commit] pypy default: also prints sha256
Message-ID: <56e152eb.49f9c20a.dd60d.ffffeb91@mx.google.com>

Author: Armin Rigo 
Branch: 
Changeset: r82933:3af1e20d2bd1
Date: 2016-03-10 11:55 +0100
http://bitbucket.org/pypy/pypy/changeset/3af1e20d2bd1/

Log:	also prints sha256

diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/release/repackage.sh
@@ -35,9 +35,10 @@
 zip -r pypy-$maj.$min.$rev-src.zip pypy-$maj.$min.$rev-src
 rm -rf pypy-$maj.$min.$rev-src
 
-# Print out the md5, sha1
+# Print out the md5, sha1, sha256
 md5sum *.bz2 *.zip
 sha1sum *.bz2 *.zip
+sha256sum *.bz2 *.zip
 
 # Now upload all the bz2 and zip
 

From pypy.commits at gmail.com  Thu Mar 10 05:57:23 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 02:57:23 -0800 (PST)
Subject: [pypy-commit] pypy s390x-backend: Fix branch name
Message-ID: <56e15313.e5ecc20a.f9fb4.fffff1a4@mx.google.com>

Author: Armin Rigo 
Branch: s390x-backend
Changeset: r82934:5eb1d600077e
Date: 2016-03-10 11:56 +0100
http://bitbucket.org/pypy/pypy/changeset/5eb1d600077e/

Log:	Fix branch name

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
@@ -13,7 +13,7 @@
 
 The jit compiler backend implementation for the s390x architecutre.
 
-.. branch: s390x-enhance-speedup
+.. branch: s390x-enhance-speed
 
 Refactoring to only store 64-bit values in the literal pool of the assembly. Generated machine code uses less space and runs faster.
 

From pypy.commits at gmail.com  Thu Mar 10 06:28:52 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 03:28:52 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: lots of random progress +
 implement virtualref and virtualizable support
Message-ID: <56e15a74.4d0d1c0a.de497.fffffb24@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82935:ca0177a1db3a
Date: 2016-03-10 13:28 +0200
http://bitbucket.org/pypy/pypy/changeset/ca0177a1db3a/

Log:	lots of random progress + implement virtualref and virtualizable
	support

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -431,13 +431,13 @@
         box = inputargs[i]
         opnum = OpHelpers.getfield_for_descr(descr)
         emit_op(extra_ops,
-                ResOperation(opnum, [vable_box], descr))
+                ResOperation(opnum, [vable_box], descr=descr))
         box.set_forwarded(extra_ops[-1])
         i += 1
     arrayindex = 0
     for descr in vinfo.array_field_descrs:
         arraylen = vinfo.get_array_length(vable, arrayindex)
-        arrayop = ResOperation(rop.GETFIELD_GC_R, [vable_box], descr)
+        arrayop = ResOperation(rop.GETFIELD_GC_R, [vable_box], descr=descr)
         emit_op(extra_ops, arrayop)
         arraydescr = vinfo.array_descrs[arrayindex]
         assert i + arraylen <= len(inputargs)
@@ -1005,7 +1005,7 @@
 
 def compile_trace(metainterp, resumekey, runtime_boxes):
     """Try to compile a new bridge leading from the beginning of the history
-    to some existing place.
+    to some existging place.
     """
 
     from rpython.jit.metainterp.optimizeopt import optimize_trace
diff --git a/rpython/jit/metainterp/logger.py b/rpython/jit/metainterp/logger.py
--- a/rpython/jit/metainterp/logger.py
+++ b/rpython/jit/metainterp/logger.py
@@ -15,11 +15,15 @@
     def log_loop_from_trace(self, trace, memo):
         if not have_debug_prints():
             return
+        inputargs, ops = self._unpack_trace(trace)
+        self.log_loop(inputargs, ops, memo=memo)
+
+    def _unpack_trace(self, trace):
         ops = []
         i = trace.get_iter()
         while not i.done():
             ops.append(i.next())
-        self.log_loop(i.inputargs, ops, memo=memo)
+        return i.inputargs, ops
 
     def log_loop(self, inputargs, operations, number=0, type=None,
                  ops_offset=None, name='', memo=None):
@@ -91,8 +95,11 @@
         debug_stop("jit-log-short-preamble")
         return logops
 
-    def log_abort_loop(self, inputargs, operations, memo=None):
+    def log_abort_loop(self, trace, memo=None):
         debug_start("jit-abort-log")
+        if not have_debug_prints():
+            return
+        inputargs, operations = self._unpack_trace(trace)
         logops = self._log_operations(inputargs, operations, ops_offset=None,
                                       memo=memo)
         debug_stop("jit-abort-log")
diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -1,5 +1,10 @@
 
 """ Storage format:
+for each operation (inputargs numbered with negative numbers)
+ [size-if-unknown-arity] [  ...] [descr] [potential snapshot]
+snapshot is as follows
+  
+  [    ...]
 """
 
 from rpython.jit.metainterp.history import ConstInt, Const
@@ -57,6 +62,13 @@
             assert size >= 0
         return size, self._next(), self._next()
 
+    def get_list_of_boxes(self):
+        size = self._next()
+        l = []
+        for i in range(size):
+            l.append(self.next())
+        return l
+
 class TraceIterator(object):
     def __init__(self, trace, start, end, force_inputargs=None):
         self.trace = trace
@@ -251,6 +263,11 @@
             self._ops.append(self._encode(box)) # not tagged, as it must be boxes
         return pos
 
+    def record_list_of_boxes(self, boxes):
+        self._ops.append(len(boxes))
+        for box in boxes:
+            self._ops.append(self._encode(box))
+
     def get_patchable_position(self):
         p = len(self._ops)
         if not we_are_translated():
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -1619,8 +1619,8 @@
             self.metainterp.vrefs_after_residual_call()
             vablebox = None
             if assembler_call:
-                vablebox, resbox = self.metainterp.direct_assembler_call(resbox,
-                    assembler_call_jd, cut_pos)
+                vablebox, resbox = self.metainterp.direct_assembler_call(
+                    self.metainterp._last_op, assembler_call_jd, cut_pos)
             if resbox and resbox.type != 'v':
                 self.make_result_of_lastop(resbox)
             self.metainterp.vable_after_residual_call(funcbox)
@@ -1893,6 +1893,7 @@
     cancel_count = 0
     exported_state = None
     last_exc_box = None
+    _last_op = None
 
     def __init__(self, staticdata, jitdriver_sd):
         self.staticdata = staticdata
@@ -1949,7 +1950,7 @@
             self.current_call_id += 1
         if greenkey is not None and self.is_main_jitcode(jitcode):
             self.portal_trace_positions.append(
-                    (jitcode.jitdriver_sd, greenkey, len(self.history.operations)))
+                    (jitcode.jitdriver_sd, greenkey, self.history.get_trace_position()))
         if len(self.free_frames_list) > 0:
             f = self.free_frames_list.pop()
         else:
@@ -1976,7 +1977,7 @@
             self.call_ids.pop()
         if frame.greenkey is not None and self.is_main_jitcode(jitcode):
             self.portal_trace_positions.append(
-                    (jitcode.jitdriver_sd, None, len(self.history.operations)))
+                    (jitcode.jitdriver_sd, None, self.history.get_trace_position()))
         # we save the freed MIFrames to avoid needing to re-create new
         # MIFrame objects all the time; they are a bit big, with their
         # 3*256 register entries.
@@ -2162,6 +2163,7 @@
         profiler.count_ops(opnum, Counters.RECORDED_OPS)
         self.heapcache.invalidate_caches(opnum, descr, argboxes)
         op = self.history.record(opnum, argboxes, resvalue, descr)
+        self._last_op = op
         self.attach_debug_info(op)
         if op.type != 'v':
             return op
@@ -2962,7 +2964,7 @@
             else:
                 jitdriver_sd, greenkey, startpos = start_stack.pop()
                 warmstate = jitdriver_sd.warmstate
-                size = pos - startpos
+                size = pos[0] - startpos[0]
                 if size > max_size:
                     if warmstate is not None:
                         r = warmstate.get_location_str(greenkey)
@@ -2982,8 +2984,7 @@
                 max_jdsd = jitdriver_sd
                 max_key = key
         if self.portal_trace_positions: # tests
-            self.staticdata.logger_ops.log_abort_loop(self.history.inputargs,
-                                       self.history.operations,
+            self.staticdata.logger_ops.log_abort_loop(self.history.trace,
                                        self.box_names_memo)
         debug_stop("jit-abort-longest-function")
         return max_jdsd, max_key
@@ -3028,9 +3029,10 @@
         opnum = OpHelpers.call_assembler_for_descr(op.getdescr())
         oldop = op
         op = self.history.record_nospec(opnum, args, descr=token)
-        op.copy_value_from(oldop)
         if opnum == rop.CALL_ASSEMBLER_N:
             op = None
+        else:
+            op.copy_value_from(oldop)
         #
         # To fix an obscure issue, make sure the vable stays alive
         # longer than the CALL_ASSEMBLER operation.  We do it by
diff --git a/rpython/jit/metainterp/resoperation.py b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -110,7 +110,7 @@
     return VecOperationNew(opnum, args, datatype, bytesize, signed, count, descr)
 
 def VecOperationNew(opnum, args, datatype, bytesize, signed, count, descr=None):
-    op = ResOperation(opnum, args, descr)
+    op = ResOperation(opnum, args, descr=descr)
     vecinfo = VectorizationInfo(None)
     vecinfo.setinfo(datatype, bytesize, signed)
     vecinfo.count = count
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -136,18 +136,15 @@
     else:
         virtualizable_boxes = []
     virtualref_boxes = virtualref_boxes[:]
+    pos = t.get_patchable_position()
+    t.record_list_of_boxes(virtualizable_boxes)
+    t.record_list_of_boxes(virtualref_boxes)
     if n >= 0:
         top = framestack[n]
-        pos = t.get_patchable_position()
         _ensure_parent_resumedata(framestack, n, t)
         t.record_snapshot(top.jitcode, top.pc,
                           top.get_list_of_active_boxes(False))
-        t.patch_position_to_current(pos)
-    else:
-        yyy
-        snapshot_storage.rd_frame_info_list = None
-        snapshot_storage.rd_snapshot = TopSnapshot(None, virtualref_boxes,
-                                                   virtualizable_boxes)
+    t.patch_position_to_current(pos)
     return result
 
 PENDINGFIELDSTRUCT = lltype.Struct('PendingField',
@@ -295,25 +292,16 @@
         snapshot_iter = trace.get_snapshot_iter(position)
         state = NumberingState(snapshot_iter.length())
 
-        state.append(rffi.cast(rffi.SHORT, 0))
-        n = 0 # len(topsnapshot.boxes)
+        virtualizable_length = snapshot_iter._next()
+
+        state.append(rffi.cast(rffi.SHORT, virtualizable_length))
+        self._number_boxes(snapshot_iter, virtualizable_length, optimizer, state)
+
+        n = snapshot_iter._next()
         assert not (n & 1)
         state.append(rffi.cast(rffi.SHORT, n >> 1))
-        #
-        # XXX ignore vables and virtualrefs for now
-        #assert isinstance(topsnapshot, TopSnapshot)
-        #special_boxes_size = (1 + len(topsnapshot.vable_boxes) +
-        #                      1 + len(topsnapshot.boxes))
-        #assert state.position == special_boxes_size
 
-        #state.position = 0
-        #state.append(rffi.cast(rffi.SHORT, len(topsnapshot.vable_boxes)))
-        #self._number_boxes(topsnapshot.vable_boxes, optimizer, state)
-        #n = len(topsnapshot.boxes)
-        #assert not (n & 1)
-        #state.append(rffi.cast(rffi.SHORT, n >> 1))
-        #self._number_boxes(topsnapshot.boxes, optimizer, state)
-        #assert state.position == special_boxes_size
+        self._number_boxes(snapshot_iter, n, optimizer, state)
 
         while not snapshot_iter.done():
             size, jitcode_index, pc = snapshot_iter.get_size_jitcode_pc()
diff --git a/rpython/jit/metainterp/test/test_compile.py b/rpython/jit/metainterp/test/test_compile.py
--- a/rpython/jit/metainterp/test/test_compile.py
+++ b/rpython/jit/metainterp/test/test_compile.py
@@ -31,6 +31,9 @@
     def log_loop(self, inputargs, operations, number=0, type=None, ops_offset=None, name='', memo=None):
         pass
 
+    def log_loop_from_trace(self, *args, **kwds):
+        pass
+
     def repr_of_resop(self, op):
         return repr(op)
 
@@ -91,11 +94,13 @@
     metainterp.staticdata = staticdata
     metainterp.cpu = cpu
     metainterp.history = History()
-    metainterp.history.operations = loop.operations[:-1]
-    metainterp.history.inputargs = loop.inputargs[:]
+    metainterp.history.set_inputargs(loop.inputargs[:])
+    for op in loop.operations:
+        newop = metainterp.history.record_nospec(op.getopnum(), op.getarglist(), op.getdescr())
+        op.position = newop.position
     #
     greenkey = 'faked'
-    target_token = compile_loop(metainterp, greenkey, 0,
+    target_token = compile_loop(metainterp, greenkey, (0, 0),
                                 loop.inputargs,
                                 loop.operations[-1].getarglist(),
                                 None)
diff --git a/rpython/jit/metainterp/test/test_history.py b/rpython/jit/metainterp/test/test_history.py
--- a/rpython/jit/metainterp/test/test_history.py
+++ b/rpython/jit/metainterp/test/test_history.py
@@ -62,17 +62,6 @@
     assert c5.nonnull()
     assert c6.nonnull()
 
-class TestHistoryEncoding(object):
-    def test_encode_basic(self):
-        history = History()
-        i0 = InputArgInt()
-        i1 = InputArgInt()
-        history.set_inputargs([i0, i1])
-        history.record(rop.INT_ADD, [i0, i1], 13)
-        rh = history.get_recorded_history()
-        op = rh.get_next_op()
-        assert op.getopnum() == rop.INT_ADD
-
 class TestZTranslated(StandaloneTests):
     def test_ztranslated_same_constant_float(self):
         def fn(args):
diff --git a/rpython/jit/metainterp/test/test_jitiface.py b/rpython/jit/metainterp/test/test_jitiface.py
--- a/rpython/jit/metainterp/test/test_jitiface.py
+++ b/rpython/jit/metainterp/test/test_jitiface.py
@@ -18,12 +18,12 @@
         reasons = []
 
         class MyJitIface(JitHookInterface):
-            def on_abort(self, reason, jitdriver, greenkey, greenkey_repr, logops, operations):
+            def on_abort(self, reason, jitdriver, greenkey, greenkey_repr, logops, trace):
                 assert jitdriver is myjitdriver
                 assert len(greenkey) == 1
                 reasons.append(reason)
                 assert greenkey_repr == 'blah'
-                assert len(operations) > 1
+                assert trace.length() > 1
 
         iface = MyJitIface()
 
diff --git a/rpython/jit/metainterp/test/test_opencoder.py b/rpython/jit/metainterp/test/test_opencoder.py
--- a/rpython/jit/metainterp/test/test_opencoder.py
+++ b/rpython/jit/metainterp/test/test_opencoder.py
@@ -6,7 +6,7 @@
 from rpython.jit.metainterp import resume
 from rpython.jit.metainterp.test.strategies import lists_of_operations
 from rpython.jit.metainterp.optimizeopt.test.test_util import BaseTest
-from rpython.jit.metainterp.history import TreeLoop
+from rpython.jit.metainterp.history import TreeLoop, AbstractDescr
 from hypothesis import given
 
 class JitCode(object):
@@ -24,19 +24,19 @@
     def get_list_of_active_boxes(self, flag):
         return self.boxes
 
-def unpack_snapshot(t, pos):
-    trace = t.trace
-    first = trace._ops[pos] # this is the size
-    pos += 1
-    boxes = []
-    while first > pos + 1:
-        snapshot_size = trace._ops[pos]
-        # 2 for jitcode and pc
-        pos += 1 + 2
-        boxes += [t._untag(trace._ops[i + pos]) for i in range(snapshot_size)]
-        pos += len(boxes)
-    return boxes
-
+def unpack_snapshot(t, op, pos):
+    op.framestack = []
+    si = t.get_snapshot_iter(op.rd_resume_position)
+    virtualizables = si.get_list_of_boxes()
+    vref_boxes = si.get_list_of_boxes()
+    while not si.done():
+        size, jitcode, pc = si.get_size_jitcode_pc()
+        boxes = []
+        for i in range(size):
+            boxes.append(si.next())
+        op.framestack.append(FakeFrame(JitCode(jitcode), pc, boxes))
+    op.virtualizables = virtualizables
+    op.vref_boxes = vref_boxes
 
 class TestOpencoder(object):
     def unpack(self, t):
@@ -45,14 +45,7 @@
         while not iter.done():
             op = iter.next()
             if op.is_guard():
-                op.framestack = []
-                si = iter.get_snapshot_iter(op.rd_resume_position)
-                while not si.done():
-                    size, jitcode, pc = si.get_size_jitcode_pc()
-                    boxes = []
-                    for i in range(size):
-                        boxes.append(si.next())
-                    op.framestack.append(FakeFrame(JitCode(jitcode), pc, boxes))
+                unpack_snapshot(iter, op, op.rd_resume_position)
             l.append(op)
         return iter.inputargs, l, iter
 
@@ -82,18 +75,17 @@
         resume.capture_resumedata(framestack, None, [], t)
         (i0, i1), l, iter = self.unpack(t)
         assert l[1].opnum == rop.GUARD_FALSE
-        boxes = unpack_snapshot(iter, l[1].rd_resume_position)
-        assert boxes == [i0, i1]
+        assert l[1].framestack[0].boxes == [i0, i1]
         t.record_op(rop.GUARD_FALSE, [add])
         resume.capture_resumedata([frame0, frame1], None, [], t)
         t.record_op(rop.INT_ADD, [add, add])
         (i0, i1), l, iter = self.unpack(t)
         assert l[1].opnum == rop.GUARD_FALSE
-        boxes = unpack_snapshot(iter, l[1].rd_resume_position)
-        assert boxes == [i0, i1]
+        assert l[1].framestack[0].boxes == [i0, i1]
         assert l[2].opnum == rop.GUARD_FALSE
-        boxes = unpack_snapshot(iter, l[2].rd_resume_position)
-        assert boxes == [i0, i1, i0, i0, l[0]]
+        fstack = l[2].framestack
+        assert fstack[0].boxes == [i0, i1]
+        assert fstack[1].boxes == [i0, i0, l[0]]
 
     def test_read_snapshot_interface(self):
         i0, i1, i2 = InputArgInt(), InputArgInt(), InputArgInt()
@@ -107,6 +99,8 @@
         (i0, i1, i2), l, iter = self.unpack(t)
         pos = l[0].rd_resume_position
         snapshot_iter = iter.get_snapshot_iter(pos)
+        assert snapshot_iter.get_list_of_boxes() == []
+        assert snapshot_iter.get_list_of_boxes() == []
         size, jc_index, pc = snapshot_iter.get_size_jitcode_pc()
         assert size == 2
         assert jc_index == 2
@@ -119,6 +113,8 @@
         assert [snapshot_iter.next() for i in range(2)] == [i2, i2]
         pos = l[1].rd_resume_position
         snapshot_iter = iter.get_snapshot_iter(pos)
+        assert snapshot_iter.get_list_of_boxes() == []
+        assert snapshot_iter.get_list_of_boxes() == []
         size, jc_index, pc = snapshot_iter.get_size_jitcode_pc()
         assert size == 2
         assert jc_index == 2
@@ -158,4 +154,18 @@
         t2 = t.cut_trace_from(cut_point, [add1, i1])
         (i0, i1), l, iter = self.unpack(t2)
         assert len(l) == 3
-        assert l[0].getarglist() == [i0, i1]
\ No newline at end of file
+        assert l[0].getarglist() == [i0, i1]
+
+    def test_virtualizable_virtualref(self):
+        class SomeDescr(AbstractDescr):
+            pass
+
+        i0, i1, i2 = InputArgInt(), InputArgInt(), InputArgInt()
+        t = Trace([i0, i1, i2])
+        p0 = t.record_op(rop.NEW_WITH_VTABLE, [], descr=SomeDescr())
+        t.record_op(rop.GUARD_TRUE, [i0])
+        resume.capture_resumedata([], [i1, i2, p0], [p0, i1], t)
+        (i0, i1, i2), l, iter = self.unpack(t)
+        assert not l[1].framestack
+        assert l[1].virtualizables == [l[0], i1, i2]
+        assert l[1].vref_boxes == [l[0], i1]
\ No newline at end of file
diff --git a/rpython/jit/metainterp/test/test_pyjitpl.py b/rpython/jit/metainterp/test/test_pyjitpl.py
--- a/rpython/jit/metainterp/test/test_pyjitpl.py
+++ b/rpython/jit/metainterp/test/test_pyjitpl.py
@@ -87,6 +87,7 @@
     c3 = ConstInt(3)
     boxes = [b1, b2, b1, c3]
     dup = {}
+    metainterp.history.set_inputargs([b1, b2])
     metainterp.remove_consts_and_duplicates(boxes, 4, dup)
     assert boxes[0] is b1
     assert boxes[1] is b2

From pypy.commits at gmail.com  Thu Mar 10 08:01:08 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 05:01:08 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: fix what we pass to runtime
 boxes
Message-ID: <56e17014.03dd1c0a.3a902.23d9@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82936:b62dddb64712
Date: 2016-03-10 15:00 +0200
http://bitbucket.org/pypy/pypy/changeset/b62dddb64712/

Log:	fix what we pass to runtime boxes

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -261,7 +261,7 @@
         return compile_simple_loop(metainterp, greenkey, trace,
                                    enable_opts)
     call_pure_results = metainterp.call_pure_results
-    preamble_data = LoopCompileData(trace, inputargs,
+    preamble_data = LoopCompileData(trace, jumpargs,
                                     call_pure_results=call_pure_results,
                                     enable_opts=enable_opts)
     try:

From pypy.commits at gmail.com  Thu Mar 10 08:59:56 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 05:59:56 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: fix fix fix fix
Message-ID: <56e17ddc.857ac20a.8280b.33c4@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82937:829e272ed683
Date: 2016-03-10 15:59 +0200
http://bitbucket.org/pypy/pypy/changeset/829e272ed683/

Log:	fix fix fix fix

diff --git a/rpython/jit/backend/llsupport/assembler.py b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -331,7 +331,7 @@
         counter = self._register_counter(tp, number, token)
         c_adr = ConstInt(rffi.cast(lltype.Signed, counter))
         operations.append(
-            ResOperation(rop.INCREMENT_DEBUG_COUNTER, [c_adr], None))
+            ResOperation(rop.INCREMENT_DEBUG_COUNTER, [c_adr]))
 
     def _register_counter(self, tp, number, token):
         # YYY very minor leak -- we need the counters to stay alive
diff --git a/rpython/jit/backend/llsupport/rewrite.py b/rpython/jit/backend/llsupport/rewrite.py
--- a/rpython/jit/backend/llsupport/rewrite.py
+++ b/rpython/jit/backend/llsupport/rewrite.py
@@ -361,8 +361,8 @@
         # return True in cases where the operation and the following guard
         # should likely remain together.  Simplified version of
         # can_merge_with_next_guard() in llsupport/regalloc.py.
-        if not op.is_comparison():
-            return op.is_ovf()    # int_xxx_ovf() / guard_no_overflow()
+        if not rop.is_comparison(op.opnum):
+            return rop.is_ovf(op.opnum)    # int_xxx_ovf() / guard_no_overflow()
         if i + 1 >= len(operations):
             return False
         next_op = operations[i + 1]
@@ -614,8 +614,7 @@
             args = [frame, arglist[jd.index_of_virtualizable]]
         else:
             args = [frame]
-        call_asm = ResOperation(op.getopnum(), args,
-                                op.getdescr())
+        call_asm = ResOperation(op.getopnum(), args, descr=op.getdescr())
         self.replace_op_with(self.get_box_replacement(op), call_asm)
         self.emit_op(call_asm)
 
@@ -673,7 +672,7 @@
     def _gen_call_malloc_gc(self, args, v_result, descr):
         """Generate a CALL_MALLOC_GC with the given args."""
         self.emitting_an_operation_that_can_collect()
-        op = ResOperation(rop.CALL_MALLOC_GC, args, descr)
+        op = ResOperation(rop.CALL_MALLOC_GC, args, descr=descr)
         self.replace_op_with(v_result, op)
         self.emit_op(op)
         # In general, don't add v_result to write_barrier_applied:
diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -351,6 +351,7 @@
                                              metainterp.box_names_memo)
     except InvalidLoop:
         # Fall back on jumping directly to preamble
+        raise InvalidLoop
         xxxx
         jump_op = ResOperation(rop.JUMP, inputargs[:], descr=loop_jitcell_token)
         loop_data = UnrolledLoopData(end_label, jump_op, [jump_op], start_state,
diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -9,7 +9,7 @@
 
 from rpython.jit.metainterp.history import ConstInt, Const
 from rpython.jit.metainterp.resoperation import AbstractResOp, AbstractInputArg,\
-    ResOperation, oparity, rop, opwithdescr
+    ResOperation, oparity, rop, opwithdescr, GuardResOp
 from rpython.rlib.rarithmetic import intmask
 from rpython.rlib.objectmodel import we_are_translated
 
@@ -21,6 +21,9 @@
 class Sentinel(object):
     pass
 
+class BaseTrace(object):
+    pass
+
 class SnapshotIterator(object):
     def __init__(self, main_iter, pos, end_pos):
         self.trace = main_iter.trace
@@ -69,7 +72,7 @@
             l.append(self.next())
         return l
 
-class TraceIterator(object):
+class TraceIterator(BaseTrace):
     def __init__(self, trace, start, end, force_inputargs=None):
         self.trace = trace
         self._cache = [None] * trace._count
@@ -78,10 +81,10 @@
                               arg in force_inputargs]
             self._inputargs = [None] * len(trace.inputargs)
             for i, arg in enumerate(force_inputargs):
-                if arg.position >= 0:
-                    self._cache[arg.position] = self.inputargs[i]
+                if arg.get_position() >= 0:
+                    self._cache[arg.get_position()] = self.inputargs[i]
                 else:
-                    self._inputargs[-arg.position-1] = self.inputargs[i]
+                    self._inputargs[-arg.get_position()-1] = self.inputargs[i]
         else:
             self.inputargs = [rop.inputarg_from_tp(arg.type) for
                               arg in self.trace.inputargs]
@@ -115,7 +118,7 @@
         elif tag == TAGCONST:
             return self.trace._consts[v]
         else:
-            yyyy
+            assert False
 
     def skip_resume_data(self):
         pos = self.pos
@@ -145,14 +148,12 @@
             descr = None
         res = ResOperation(opnum, args, -1, descr=descr)
         if rop.is_guard(opnum):
+            assert isinstance(res, GuardResOp)
             res.rd_resume_position = self.skip_resume_data()
         self._cache[self._count] = res
         self._count += 1
         return res
 
-class BaseTrace(object):
-    pass
-
 class CutTrace(BaseTrace):
     def __init__(self, trace, start, count, inputargs):
         self.trace = trace
@@ -172,6 +173,7 @@
         self._descrs = [None]
         self._consts = [None]
         for i, inparg in enumerate(inputargs):
+            assert isinstance(inparg, AbstractInputArg)
             inparg.position = -i - 1
         self._count = 0
         self.inputargs = inputargs
@@ -199,9 +201,9 @@
                 self._consts.append(box)
                 return tag(TAGCONST, len(self._consts) - 1)
         elif isinstance(box, AbstractResOp):
-            return tag(TAGBOX, box.position)
+            return tag(TAGBOX, box.get_position())
         elif isinstance(box, AbstractInputArg):
-            return tag(TAGBOX, box.position)
+            return tag(TAGBOX, box.get_position())
         else:
             assert False, "unreachable code"
 
diff --git a/rpython/jit/metainterp/optimizeopt/heap.py b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/optimizeopt/heap.py
+++ b/rpython/jit/metainterp/optimizeopt/heap.py
@@ -348,7 +348,7 @@
             opnum == rop.COPYUNICODECONTENT):    # no effect on GC struct/array
             return
         if op.is_call():
-            if op.is_call_assembler():
+            if rop.is_call_assembler(op.getopnum()):
                 self._seen_guard_not_invalidated = False
             else:
                 effectinfo = op.getdescr().get_extra_info()
diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -553,7 +553,7 @@
 
     @specialize.argtype(0)
     def _emit_operation(self, op):
-        assert not op.is_call_pure()
+        assert not rop.is_call_pure(op.getopnum())
         orig_op = op
         op = self.get_box_replacement(op)
         if op.is_constant():
@@ -660,7 +660,7 @@
         return self._really_emitted_operation
 
     def is_call_pure_pure_canraise(self, op):
-        if not op.is_call_pure():
+        if not rop.is_call_pure(op.getopnum()):
             return False
         effectinfo = op.getdescr().get_extra_info()
         if effectinfo.check_can_raise(ignore_memoryerror=True):
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -1616,7 +1616,7 @@
                     resbox = None
                 else:
                     assert False
-            self.metainterp.vrefs_after_residual_call()
+            self.metainterp.vrefs_after_residual_call(self.metainterp._last_op, cut_pos)
             vablebox = None
             if assembler_call:
                 vablebox, resbox = self.metainterp.direct_assembler_call(
@@ -1907,7 +1907,7 @@
         self.last_exc_value = lltype.nullptr(rclass.OBJECT)
         self.forced_virtualizable = None
         self.partial_trace = None
-        self.retracing_from = -1
+        self.retracing_from = (-1, -1)
         self.call_pure_results = args_dict()
         self.heapcache = HeapCache()
 
@@ -2770,7 +2770,7 @@
                                                   force_token],
                                 None, descr=vinfo.vable_token_descr)
 
-    def vrefs_after_residual_call(self):
+    def vrefs_after_residual_call(self, op, cut_pos):
         vrefinfo = self.staticdata.virtualref_info
         for i in range(0, len(self.virtualref_boxes), 2):
             vrefbox = self.virtualref_boxes[i+1]
@@ -2780,7 +2780,7 @@
                 # during this CALL_MAY_FORCE.  Mark this fact by
                 # generating a VIRTUAL_REF_FINISH on it and replacing
                 # it by ConstPtr(NULL).
-                self.stop_tracking_virtualref(i)
+                self.stop_tracking_virtualref(i, op, cut_pos)
 
     def vable_after_residual_call(self, funcbox):
         vinfo = self.jitdriver_sd.virtualizable_info
@@ -2804,15 +2804,17 @@
                 # have the eventual exception raised (this is normally done
                 # after the call to vable_after_residual_call()).
 
-    def stop_tracking_virtualref(self, i):
+    def stop_tracking_virtualref(self, i, op, cut_pos):
         virtualbox = self.virtualref_boxes[i]
         vrefbox = self.virtualref_boxes[i+1]
         # record VIRTUAL_REF_FINISH just before the current CALL_MAY_FORCE
-        call_may_force_op = self.history.operations.pop()
-        assert call_may_force_op.is_call_may_force()
-        self.history.record(rop.VIRTUAL_REF_FINISH,
+        self.history.cut(cut_pos) # pop the CALL
+        assert rop.is_call_may_force(op.getopnum())
+        self.history.record_nospec(rop.VIRTUAL_REF_FINISH,
                             [vrefbox, virtualbox], None)
-        self.history.operations.append(call_may_force_op)
+        newop = self.history.record_nospec(op.getopnum(), op.getarglist(),
+                                           op.getdescr())
+        op.position = newop.position
         # mark by replacing it with ConstPtr(NULL)
         self.virtualref_boxes[i+1] = self.cpu.ts.CONST_NULL
 
@@ -3018,7 +3020,7 @@
         patching the CALL_MAY_FORCE that occurred just now.
         """
         self.history.cut(cut_pos)
-        assert op.is_call_may_force()
+        assert rop.is_call_may_force(op.getopnum())
         num_green_args = targetjitdriver_sd.num_green_args
         arglist = op.getarglist()
         greenargs = arglist[1:num_green_args+1]
diff --git a/rpython/jit/metainterp/resoperation.py b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -232,12 +232,15 @@
 
 
 class AbstractResOpOrInputArg(AbstractValue):
-    _attrs_ = ('_forwarded',)
+    _attrs_ = ('_forwarded', 'position')
     _forwarded = None # either another resop or OptInfo
 
     def get_forwarded(self):
         return self._forwarded
 
+    def get_position(self):
+        return self.position
+
     def set_forwarded(self, forwarded_to):
         assert forwarded_to is not self
         self._forwarded = forwarded_to
@@ -405,12 +408,11 @@
     def can_raise(self):
         return rop.can_raise(self.getopnum())
 
-    # XXX fix
-
     def is_foldable_guard(self):
-        return rop._GUARD_FOLDABLE_FIRST <= self.getopnum() <= rop._GUARD_FOLDABLE_LAST
+        return rop.is_foldable_guard(self.getopnun())
 
     def is_guard_exception(self):
+        return rop.is_guard_
         return (self.getopnum() == rop.GUARD_EXCEPTION or
                 self.getopnum() == rop.GUARD_NO_EXCEPTION)
 
@@ -451,41 +453,6 @@
                               rop.GETARRAYITEM_GC_PURE_F,
                               rop.GETARRAYITEM_GC_PURE_R)
 
-    @staticmethod
-    def is_real_call(opnum):
-        return (opnum == rop.CALL_I or
-                opnum == rop.CALL_R or
-                opnum == rop.CALL_F or
-                opnum == rop.CALL_N)
-
-    def is_call_assembler(self):
-        opnum = self.opnum
-        return (opnum == rop.CALL_ASSEMBLER_I or
-                opnum == rop.CALL_ASSEMBLER_R or
-                opnum == rop.CALL_ASSEMBLER_N or
-                opnum == rop.CALL_ASSEMBLER_F)
-
-    def is_call_may_force(self):
-        opnum = self.opnum
-        return (opnum == rop.CALL_MAY_FORCE_I or
-                opnum == rop.CALL_MAY_FORCE_R or
-                opnum == rop.CALL_MAY_FORCE_N or
-                opnum == rop.CALL_MAY_FORCE_F)
-
-    def is_call_pure(self):
-        opnum = self.opnum
-        return (opnum == rop.CALL_PURE_I or
-                opnum == rop.CALL_PURE_R or
-                opnum == rop.CALL_PURE_N or
-                opnum == rop.CALL_PURE_F)
-
-    def is_call_release_gil(self):
-        opnum = self.opnum
-        # no R returning call_release_gil
-        return (opnum == rop.CALL_RELEASE_GIL_I or
-                opnum == rop.CALL_RELEASE_GIL_F or
-                opnum == rop.CALL_RELEASE_GIL_N)
-
     def is_vector_arithmetic(self):
         return rop._VEC_ARITHMETIC_FIRST <= self.getopnum() <= rop._VEC_ARITHMETIC_LAST
 
@@ -1492,8 +1459,8 @@
                 opnum == rop.CALL_F or
                 opnum == rop.CALL_N)
 
-    def is_call_assembler(self):
-        opnum = self.opnum
+    @staticmethod
+    def is_call_assembler(opnum):
         return (opnum == rop.CALL_ASSEMBLER_I or
                 opnum == rop.CALL_ASSEMBLER_R or
                 opnum == rop.CALL_ASSEMBLER_N or
@@ -1513,8 +1480,8 @@
                 opnum == rop.CALL_PURE_N or
                 opnum == rop.CALL_PURE_F)
 
-    def is_call_release_gil(self):
-        opnum = self.opnum
+    @staticmethod
+    def is_call_release_gil(opnum):
         # no R returning call_release_gil
         return (opnum == rop.CALL_RELEASE_GIL_I or
                 opnum == rop.CALL_RELEASE_GIL_F or
@@ -1580,6 +1547,26 @@
                 opnum == rop.CALL_LOOPINVARIANT_N)
 
     @staticmethod
+    def get_gc_load(tp):
+        if tp == 'i':
+            return rop.GC_LOAD_I
+        elif tp == 'f':
+            return rop.GC_LOAD_F
+        else:
+            assert tp == 'r'
+        return rop.GC_LOAD_R
+
+    @staticmethod
+    def get_gc_load_indexed(tp):
+        if tp == 'i':
+            return rop.GC_LOAD_INDEXED_I
+        elif tp == 'f':
+            return rop.GC_LOAD_INDEXED_F
+        else:
+            assert tp == 'r'
+            return rop.GC_LOAD_INDEXED_R
+
+    @staticmethod
     def inputarg_from_tp(tp):
         if tp == 'i':
             return InputArgInt()

From pypy.commits at gmail.com  Thu Mar 10 09:37:17 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 06:37:17 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: rename MAXINT, fix its value,
 add a few extra checks
Message-ID: <56e1869d.a3f6c20a.c5d46.3f7d@mx.google.com>

Author: Armin Rigo 
Branch: jit-leaner-frontend
Changeset: r82938:2e4ec6776425
Date: 2016-03-10 15:36 +0100
http://bitbucket.org/pypy/pypy/changeset/2e4ec6776425/

Log:	rename MAXINT, fix its value, add a few extra checks

diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -16,7 +16,7 @@
 TAGINT, TAGCONST, TAGBOX = range(3)
 TAGMASK = 0x3
 TAGSHIFT = 2
-MAXINT = 65536
+NUM_SMALL_INTS = 2 ** (16 - TAGSHIFT)
 
 class Sentinel(object):
     pass
@@ -195,7 +195,7 @@
         if isinstance(box, Const):
             if (isinstance(box, ConstInt) and
                 isinstance(box.getint(), int) and # symbolics
-                0 <= box.getint() < MAXINT):
+                0 <= box.getint() < NUM_SMALL_INTS):
                 return tag(TAGINT, box.getint())
             else:
                 self._consts.append(box)
@@ -211,8 +211,11 @@
         operations = self._ops
         pos = self._count
         operations.append(opnum)
-        if oparity[opnum] == -1:
+        expected_arity = oparity[opnum]
+        if expected_arity == -1:
             operations.append(len(argboxes))
+        else:
+            assert len(argboxes) == expected_arity
         operations.extend([self._encode(box) for box in argboxes])
         if opwithdescr[opnum]:
             if descr is None:
@@ -226,8 +229,11 @@
         operations = self._ops
         pos = self._count
         operations.append(opnum)
-        if oparity[opnum] == -1:
+        expected_arity = oparity[opnum]
+        if expected_arity == -1:
             operations.append(len(tagged_args))
+        else:
+            assert len(argboxes) == expected_arity
         operations.extend(tagged_args)
         if tagged_descr != -1:
             operations.append(tagged_descr)

From pypy.commits at gmail.com  Thu Mar 10 09:41:58 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 06:41:58 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: some rpythonization
Message-ID: <56e187b6.418f1c0a.96723.4338@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82939:7d0317450958
Date: 2016-03-10 16:41 +0200
http://bitbucket.org/pypy/pypy/changeset/7d0317450958/

Log:	some rpythonization

diff --git a/pypy/module/pypyjit/interp_resop.py b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -249,7 +249,7 @@
                 ofs = debug_info.asminfo.ops_offset
             else:
                 ofs = {}
-            ops = debug_info.operations
+            _, ops = debug_info.trace.unpack()
             self.w_ops = space.newlist(wrap_oplist(space, logops, ops, ofs))
         else:
             self.w_ops = space.w_None
diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -287,6 +287,7 @@
         return None
 
     if ((warmstate.vec and jitdriver_sd.vec) or warmstate.vec_all):
+        assert False, "vectorization disabled"
         from rpython.jit.metainterp.optimizeopt.vector import optimize_vector
         loop_info, loop_ops = optimize_vector(metainterp_sd,
                                               jitdriver_sd, warmstate,
diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -300,8 +300,6 @@
         return TraceIterator(self, 0, len(self._ops))
 
     def unpack(self):
-        """ NOT_RPYTHON - really rpython, but only use for debugging
-        """
         iter = self.get_iter()
         ops = []
         while not iter.done():
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2977,7 +2977,7 @@
         if start_stack:
             jitdriver_sd, key, pos = start_stack[0]
             warmstate = jitdriver_sd.warmstate
-            size = len(self.history.operations) - pos
+            size = self.history.get_trace_position()[0] - pos[0]
             if size > max_size:
                 if warmstate is not None:
                     r = warmstate.get_location_str(key)

From pypy.commits at gmail.com  Thu Mar 10 09:42:10 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 06:42:10 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: These two methods are not
 used and not tested
Message-ID: <56e187c2.6672c20a.19861.49e5@mx.google.com>

Author: Armin Rigo 
Branch: jit-leaner-frontend
Changeset: r82940:d8fb92d44ac9
Date: 2016-03-10 15:41 +0100
http://bitbucket.org/pypy/pypy/changeset/d8fb92d44ac9/

Log:	These two methods are not used and not tested

diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -226,6 +226,7 @@
         return pos
 
     def _record_raw(self, opnum, tagged_args, tagged_descr=-1):
+        NOT_USED
         operations = self._ops
         pos = self._count
         operations.append(opnum)
@@ -260,6 +261,7 @@
         return ResOperation(opnum, argboxes, pos, descr)
 
     def record_op_tag(self, opnum, tagged_args, descr=None):
+        NOT_USED
         return tag(TAGBOX, self._record_raw(opnum, tagged_args, descr))
 
     def record_snapshot(self, jitcode, pc, active_boxes):

From pypy.commits at gmail.com  Thu Mar 10 09:43:20 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 10 Mar 2016 06:43:20 -0800 (PST)
Subject: [pypy-commit] pypy default: merge the new s390x backend
Message-ID: <56e18808.838d1c0a.6e01f.42d7@mx.google.com>

Author: Richard Plangger 
Branch: 
Changeset: r82941:308a29538cda
Date: 2016-03-10 15:40 +0100
http://bitbucket.org/pypy/pypy/changeset/308a29538cda/

Log:	merge the new s390x backend

diff too long, truncating to 2000 out of 11876 lines

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -74,5 +74,6 @@
 ^rpython/doc/_build/.*$
 ^compiled
 ^.git/
+^.hypothesis/
 ^release/
 ^rpython/_cache$
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
@@ -5,3 +5,15 @@
 .. this is a revision shortly after release-5.0
 .. startrev: b238b48f9138
 
+.. branch: memop-simplify3
+
+Simplification of zero_array. Start and end index are scaled using res ops (or cpu scaling) rather than doing it manually.
+
+.. branch: s390x-backend
+
+The jit compiler backend implementation for the s390x architecutre.
+
+.. branch: s390x-enhance-speed
+
+Refactoring to only store 64-bit values in the literal pool of the assembly. Generated machine code uses less space and runs faster.
+
diff --git a/pypy/module/__pypy__/test/test_signal.py b/pypy/module/__pypy__/test/test_signal.py
--- a/pypy/module/__pypy__/test/test_signal.py
+++ b/pypy/module/__pypy__/test/test_signal.py
@@ -2,7 +2,6 @@
 
 from pypy.module.thread.test.support import GenericTestThread
 
-
 class AppTestMinimal:
     spaceconfig = dict(usemodules=['__pypy__'])
 
diff --git a/pypy/module/_file/test/test_file_extra.py b/pypy/module/_file/test/test_file_extra.py
--- a/pypy/module/_file/test/test_file_extra.py
+++ b/pypy/module/_file/test/test_file_extra.py
@@ -389,6 +389,7 @@
 
     def test_writelines(self):
         import array
+        import sys
         fn = self.temptestfile
         with file(fn, 'w') as f:
             f.writelines(['abc'])
@@ -406,7 +407,10 @@
             exc = raises(TypeError, f.writelines, [memoryview('jkl')])
             assert str(exc.value) == "writelines() argument must be a sequence of strings"
         out = open(fn, 'rb').readlines()[0]
-        assert out[0:5] == 'abcd\x00'
+        if sys.byteorder == 'big':
+            assert out[0:7] == 'abc\x00\x00\x00d'
+        else:
+            assert out[0:5] == 'abcd\x00'
         assert out[-3:] == 'ghi'
 
         with file(fn, 'wb') as f:
diff --git a/pypy/module/_rawffi/callback.py b/pypy/module/_rawffi/callback.py
--- a/pypy/module/_rawffi/callback.py
+++ b/pypy/module/_rawffi/callback.py
@@ -1,17 +1,23 @@
-
+import sys
 from pypy.interpreter.gateway import interp2app, unwrap_spec
 from pypy.interpreter.typedef import TypeDef, GetSetProperty
 from rpython.rtyper.lltypesystem import lltype, rffi
 from pypy.module._rawffi.interp_rawffi import write_ptr
 from pypy.module._rawffi.structure import W_Structure
 from pypy.module._rawffi.interp_rawffi import (W_DataInstance, letter2tp,
-     unwrap_value, unpack_argshapes, got_libffi_error)
+     unwrap_value, unpack_argshapes, got_libffi_error, is_narrow_integer_type,
+     LL_TYPEMAP, NARROW_INTEGER_TYPES)
 from rpython.rlib.clibffi import USERDATA_P, CallbackFuncPtr, FUNCFLAG_CDECL
 from rpython.rlib.clibffi import ffi_type_void, LibFFIError
 from rpython.rlib import rweakref
 from pypy.module._rawffi.tracker import tracker
 from pypy.interpreter.error import OperationError
 from pypy.interpreter import gateway
+from rpython.rlib.unroll import unrolling_iterable
+
+BIGENDIAN = sys.byteorder == 'big'
+
+unroll_narrow_integer_types = unrolling_iterable(NARROW_INTEGER_TYPES)
 
 app = gateway.applevel('''
     def tbprint(tb, err):
@@ -42,8 +48,17 @@
                 args_w[i] = space.wrap(rffi.cast(rffi.ULONG, ll_args[i]))
         w_res = space.call(w_callable, space.newtuple(args_w))
         if callback_ptr.result is not None: # don't return void
-            unwrap_value(space, write_ptr, ll_res, 0,
-                         callback_ptr.result, w_res)
+            ptr = ll_res
+            letter = callback_ptr.result
+            if BIGENDIAN:
+                # take care of narrow integers!
+                for int_type in unroll_narrow_integer_types:
+                    if int_type == letter:
+                        T = LL_TYPEMAP[int_type]
+                        n = rffi.sizeof(lltype.Signed) - rffi.sizeof(T)
+                        ptr = rffi.ptradd(ptr, n)
+                        break
+            unwrap_value(space, write_ptr, ptr, 0, letter, w_res)
     except OperationError, e:
         tbprint(space, space.wrap(e.get_traceback()),
                 space.wrap(e.errorstr(space)))
diff --git a/pypy/module/_rawffi/interp_rawffi.py b/pypy/module/_rawffi/interp_rawffi.py
--- a/pypy/module/_rawffi/interp_rawffi.py
+++ b/pypy/module/_rawffi/interp_rawffi.py
@@ -1,3 +1,4 @@
+import sys
 from pypy.interpreter.baseobjspace import W_Root
 from pypy.interpreter.error import OperationError, oefmt, wrap_oserror
 from pypy.interpreter.gateway import interp2app, unwrap_spec
@@ -19,6 +20,8 @@
 from pypy.module._rawffi.buffer import RawFFIBuffer
 from pypy.module._rawffi.tracker import tracker
 
+BIGENDIAN = sys.byteorder == 'big'
+
 TYPEMAP = {
     # XXX A mess with unsigned/signed/normal chars :-/
     'c' : ffi_type_uchar,
@@ -331,10 +334,14 @@
             if tracker.DO_TRACING:
                 ll_buf = rffi.cast(lltype.Signed, self.ll_buffer)
                 tracker.trace_allocation(ll_buf, self)
+        self._ll_buffer = self.ll_buffer
 
     def getbuffer(self, space):
         return space.wrap(rffi.cast(lltype.Unsigned, self.ll_buffer))
 
+    def buffer_advance(self, n):
+        self.ll_buffer = rffi.ptradd(self.ll_buffer, n)
+
     def byptr(self, space):
         from pypy.module._rawffi.array import ARRAY_OF_PTRS
         array = ARRAY_OF_PTRS.allocate(space, 1)
@@ -342,16 +349,17 @@
         return space.wrap(array)
 
     def free(self, space):
-        if not self.ll_buffer:
+        if not self._ll_buffer:
             raise segfault_exception(space, "freeing NULL pointer")
         self._free()
 
     def _free(self):
         if tracker.DO_TRACING:
-            ll_buf = rffi.cast(lltype.Signed, self.ll_buffer)
+            ll_buf = rffi.cast(lltype.Signed, self._ll_buffer)
             tracker.trace_free(ll_buf)
-        lltype.free(self.ll_buffer, flavor='raw')
+        lltype.free(self._ll_buffer, flavor='raw')
         self.ll_buffer = lltype.nullptr(rffi.VOIDP.TO)
+        self._ll_buffer = self.ll_buffer
 
     def buffer_w(self, space, flags):
         return RawFFIBuffer(self)
@@ -432,12 +440,19 @@
                          space.wrap("cannot directly read value"))
 wrap_value._annspecialcase_ = 'specialize:arg(1)'
 
+NARROW_INTEGER_TYPES = 'cbhiBIH?'
+
+def is_narrow_integer_type(letter):
+    return letter in NARROW_INTEGER_TYPES
 
 class W_FuncPtr(W_Root):
     def __init__(self, space, ptr, argshapes, resshape):
         self.ptr = ptr
         self.argshapes = argshapes
         self.resshape = resshape
+        self.narrow_integer = False
+        if resshape is not None:
+            self.narrow_integer = is_narrow_integer_type(resshape.itemcode.lower())
 
     def getbuffer(self, space):
         return space.wrap(rffi.cast(lltype.Unsigned, self.ptr.funcsym))
@@ -497,6 +512,10 @@
                 result = self.resshape.allocate(space, 1, autofree=True)
                 # adjust_return_size() was used here on result.ll_buffer
                 self.ptr.call(args_ll, result.ll_buffer)
+                if BIGENDIAN and self.narrow_integer:
+                    # we get a 8 byte value in big endian
+                    n = rffi.sizeof(lltype.Signed) - result.shape.size
+                    result.buffer_advance(n)
                 return space.wrap(result)
             else:
                 self.ptr.call(args_ll, lltype.nullptr(rffi.VOIDP.TO))
diff --git a/pypy/module/_rawffi/structure.py b/pypy/module/_rawffi/structure.py
--- a/pypy/module/_rawffi/structure.py
+++ b/pypy/module/_rawffi/structure.py
@@ -18,6 +18,9 @@
 from rpython.rlib.rarithmetic import intmask, signedtype, r_uint, \
     r_ulonglong
 from rpython.rtyper.lltypesystem import lltype, rffi
+import sys
+
+IS_BIG_ENDIAN = sys.byteorder == 'big'
 
 
 
@@ -114,20 +117,32 @@
                 size += intmask(fieldsize)
                 bitsizes.append(fieldsize)
             elif field_type == NEW_BITFIELD:
-                bitsizes.append((bitsize << 16) + bitoffset)
+                if IS_BIG_ENDIAN:
+                    off = last_size - bitoffset - bitsize
+                else:
+                    off = bitoffset
+                bitsizes.append((bitsize << 16) + off)
                 bitoffset = bitsize
                 size = round_up(size, fieldalignment)
                 pos.append(size)
                 size += fieldsize
             elif field_type == CONT_BITFIELD:
-                bitsizes.append((bitsize << 16) + bitoffset)
+                if IS_BIG_ENDIAN:
+                    off = last_size - bitoffset - bitsize
+                else:
+                    off = bitoffset
+                bitsizes.append((bitsize << 16) + off)
                 bitoffset += bitsize
                 # offset is already updated for the NEXT field
                 pos.append(size - fieldsize)
             elif field_type == EXPAND_BITFIELD:
                 size += fieldsize - last_size / 8
                 last_size = fieldsize * 8
-                bitsizes.append((bitsize << 16) + bitoffset)
+                if IS_BIG_ENDIAN:
+                    off = last_size - bitoffset - bitsize
+                else:
+                    off = bitoffset
+                bitsizes.append((bitsize << 16) + off)
                 bitoffset += bitsize
                 # offset is already updated for the NEXT field
                 pos.append(size - fieldsize)
diff --git a/pypy/module/_rawffi/test/test__rawffi.py b/pypy/module/_rawffi/test/test__rawffi.py
--- a/pypy/module/_rawffi/test/test__rawffi.py
+++ b/pypy/module/_rawffi/test/test__rawffi.py
@@ -704,7 +704,6 @@
         def compare(a, b):
             a1 = _rawffi.Array('i').fromaddress(_rawffi.Array('P').fromaddress(a, 1)[0], 1)
             a2 = _rawffi.Array('i').fromaddress(_rawffi.Array('P').fromaddress(b, 1)[0], 1)
-            print "comparing", a1[0], "with", a2[0]
             if a1[0] not in [1,2,3,4] or a2[0] not in [1,2,3,4]:
                 bogus_args.append((a1[0], a2[0]))
             if a1[0] > a2[0]:
@@ -715,7 +714,7 @@
         a2[0] = len(ll_to_sort)
         a3 = _rawffi.Array('l')(1)
         a3[0] = struct.calcsize('i')
-        cb = _rawffi.CallbackPtr(compare, ['P', 'P'], 'i')
+        cb = _rawffi.CallbackPtr(compare, ['P', 'P'], 'l')
         a4 = cb.byptr()
         qsort(a1, a2, a3, a4)
         res = [ll_to_sort[i] for i in range(len(ll_to_sort))]
@@ -896,11 +895,21 @@
         b = _rawffi.Array('c').fromaddress(a.buffer, 38)
         if sys.maxunicode > 65535:
             # UCS4 build
-            assert b[0] == 'x'
-            assert b[1] == '\x00'
-            assert b[2] == '\x00'
-            assert b[3] == '\x00'
-            assert b[4] == 'y'
+            if sys.byteorder == 'big':
+                assert b[0] == '\x00'
+                assert b[1] == '\x00'
+                assert b[2] == '\x00'
+                assert b[3] == 'x'
+                assert b[4] == '\x00'
+                assert b[5] == '\x00'
+                assert b[6] == '\x00'
+                assert b[7] == 'y'
+            else:
+                assert b[0] == 'x'
+                assert b[1] == '\x00'
+                assert b[2] == '\x00'
+                assert b[3] == '\x00'
+                assert b[4] == 'y'
         else:
             # UCS2 build
             assert b[0] == 'x'
diff --git a/pypy/module/_rawffi/test/test_struct.py b/pypy/module/_rawffi/test/test_struct.py
--- a/pypy/module/_rawffi/test/test_struct.py
+++ b/pypy/module/_rawffi/test/test_struct.py
@@ -1,4 +1,4 @@
-
+import sys
 from pypy.module._rawffi.structure import size_alignment_pos
 from pypy.module._rawffi.interp_rawffi import TYPEMAP, letter2tp
 
@@ -63,4 +63,7 @@
          for (name, t, size) in fields])
     assert size == 8
     assert pos == [0, 0, 0]
-    assert bitsizes == [0x10000, 0x3e0001, 0x1003f]
+    if sys.byteorder == 'little':
+        assert bitsizes == [0x10000, 0x3e0001, 0x1003f]
+    else:
+        assert bitsizes == [0x1003f, 0x3e0001, 0x10000]
diff --git a/pypy/module/_vmprof/conftest.py b/pypy/module/_vmprof/conftest.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/_vmprof/conftest.py
@@ -0,0 +1,6 @@
+import py, os
+
+def pytest_collect_directory(path, parent):
+    if os.uname()[4] == 's390x':
+        py.test.skip("zarch tests skipped")
+pytest_collect_file = pytest_collect_directory
diff --git a/pypy/module/cppyy/src/dummy_backend.cxx b/pypy/module/cppyy/src/dummy_backend.cxx
--- a/pypy/module/cppyy/src/dummy_backend.cxx
+++ b/pypy/module/cppyy/src/dummy_backend.cxx
@@ -390,7 +390,7 @@
         ((dummy::cppyy_test_data*)self)->destroy_arrays();
     } else if (idx == s_methods["cppyy_test_data::set_bool"]) {
         assert(self && nargs == 1);
-        ((dummy::cppyy_test_data*)self)->set_bool((bool)((CPPYY_G__value*)args)[0].obj.in);
+        ((dummy::cppyy_test_data*)self)->set_bool((bool)((CPPYY_G__value*)args)[0].obj.i);
     } else if (idx == s_methods["cppyy_test_data::set_char"]) {
         assert(self && nargs == 1);
         ((dummy::cppyy_test_data*)self)->set_char(((CPPYY_G__value*)args)[0].obj.ch);
diff --git a/pypy/module/cpyext/test/test_arraymodule.py b/pypy/module/cpyext/test/test_arraymodule.py
--- a/pypy/module/cpyext/test/test_arraymodule.py
+++ b/pypy/module/cpyext/test/test_arraymodule.py
@@ -51,13 +51,19 @@
         assert arr.tolist() == [1, 23, 4]
 
     def test_buffer(self):
+        import sys
         module = self.import_module(name='array')
         arr = module.array('i', [1,2,3,4])
         buf = buffer(arr)
         exc = raises(TypeError, "buf[1] = '1'")
         assert str(exc.value) == "buffer is read-only"
-        # XXX big-endian
-        assert str(buf) == ('\x01\0\0\0'
-                            '\x02\0\0\0'
-                            '\x03\0\0\0'
-                            '\x04\0\0\0')
+        if sys.byteorder == 'big':
+            assert str(buf) == ('\0\0\0\x01'
+                                '\0\0\0\x02'
+                                '\0\0\0\x03'
+                                '\0\0\0\x04')
+        else:
+            assert str(buf) == ('\x01\0\0\0'
+                                '\x02\0\0\0'
+                                '\x03\0\0\0'
+                                '\x04\0\0\0')
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -606,7 +606,7 @@
                 long intval;
                 PyObject *name;
 
-                if (!PyArg_ParseTuple(args, "i", &intval))
+                if (!PyArg_ParseTuple(args, "l", &intval))
                     return NULL;
 
                 IntLike_Type.tp_as_number = &intlike_as_number;
diff --git a/pypy/module/cpyext/test/test_unicodeobject.py b/pypy/module/cpyext/test/test_unicodeobject.py
--- a/pypy/module/cpyext/test/test_unicodeobject.py
+++ b/pypy/module/cpyext/test/test_unicodeobject.py
@@ -386,11 +386,11 @@
                 lltype.free(pendian, flavor='raw')
 
         test("\x61\x00\x62\x00\x63\x00\x64\x00", -1)
-
-        test("\x61\x00\x62\x00\x63\x00\x64\x00", None)
-
+        if sys.byteorder == 'big':
+            test("\x00\x61\x00\x62\x00\x63\x00\x64", None)
+        else:
+            test("\x61\x00\x62\x00\x63\x00\x64\x00", None)
         test("\x00\x61\x00\x62\x00\x63\x00\x64", 1)
-
         test("\xFE\xFF\x00\x61\x00\x62\x00\x63\x00\x64", 0, 1)
         test("\xFF\xFE\x61\x00\x62\x00\x63\x00\x64\x00", 0, -1)
 
@@ -423,7 +423,10 @@
 
         test("\x61\x00\x00\x00\x62\x00\x00\x00", -1)
 
-        test("\x61\x00\x00\x00\x62\x00\x00\x00", None)
+        if sys.byteorder == 'big':
+            test("\x00\x00\x00\x61\x00\x00\x00\x62", None)
+        else:
+            test("\x61\x00\x00\x00\x62\x00\x00\x00", None)
 
         test("\x00\x00\x00\x61\x00\x00\x00\x62", 1)
 
diff --git a/pypy/module/marshal/test/test_marshalimpl.py b/pypy/module/marshal/test/test_marshalimpl.py
--- a/pypy/module/marshal/test/test_marshalimpl.py
+++ b/pypy/module/marshal/test/test_marshalimpl.py
@@ -64,14 +64,17 @@
     import marshal, struct
 
     class FakeM:
+        # NOTE: marshal is platform independent, running this test must assume
+        # that self.seen gets values from the endianess of the marshal module.
+        # (which is little endian!)
         def __init__(self):
             self.seen = []
         def start(self, code):
             self.seen.append(code)
         def put_int(self, value):
-            self.seen.append(struct.pack("i", value))
+            self.seen.append(struct.pack("i4'), ('y', '>f4')]" in repr(a)
+        else:
+            assert "[('x', 'i4"
+        E = '<' if sys.byteorder == 'little' else '>'
+        b = np.dtype((xyz, [("col1", E+"i4"), ("col2", E+"i4"), ("col3", E+"i4")]))
         data = [(1, 2,3), (4, 5, 6)]
         a = np.array(data, dtype=b)
         x = pickle.loads(pickle.dumps(a))
@@ -423,18 +429,20 @@
         assert hash(t5) != hash(t6)
 
     def test_pickle(self):
+        import sys
         import numpy as np
         from numpy import array, dtype
         from cPickle import loads, dumps
         a = array([1,2,3])
+        E = '<' if sys.byteorder == 'little' else '>'
         if self.ptr_size == 8:
-            assert a.dtype.__reduce__() == (dtype, ('i8', 0, 1), (3, '<', None, None, None, -1, -1, 0))
+            assert a.dtype.__reduce__() == (dtype, ('i8', 0, 1), (3, E, None, None, None, -1, -1, 0))
         else:
-            assert a.dtype.__reduce__() == (dtype, ('i4', 0, 1), (3, '<', None, None, None, -1, -1, 0))
+            assert a.dtype.__reduce__() == (dtype, ('i4', 0, 1), (3, E, None, None, None, -1, -1, 0))
         assert loads(dumps(a.dtype)) == a.dtype
         assert np.dtype('bool').__reduce__() == (dtype, ('b1', 0, 1), (3, '|', None, None, None, -1, -1, 0))
         assert np.dtype('|V16').__reduce__() == (dtype, ('V16', 0, 1), (3, '|', None, None, None, 16, 1, 0))
-        assert np.dtype(('')+'U7'
         assert dtype([('', 'f8')]).str == "|V8"
         assert dtype(('f8', 2)).str == "|V16"
 
@@ -968,8 +978,12 @@
 
     def test_isnative(self):
         from numpy import dtype
+        import sys
         assert dtype('i4').isnative == True
-        assert dtype('>i8').isnative == False
+        if sys.byteorder == 'big':
+            assert dtype('i8').isnative == False
 
     def test_any_all_nonzero(self):
         import numpy
@@ -1185,6 +1199,7 @@
     def test_setstate(self):
         import numpy as np
         import sys
+        E = '<' if sys.byteorder == 'little' else '>'
         d = np.dtype('f8')
         d.__setstate__((3, '|', (np.dtype('float64'), (2,)), None, None, 20, 1, 0))
         assert d.str == ('<' if sys.byteorder == 'little' else '>') + 'f8'
@@ -1201,7 +1216,7 @@
         assert d.shape == (2,)
         assert d.itemsize == 8
         assert d.subdtype is not None
-        assert repr(d) == "dtype((''
+        assert str(dt) == "{'names':['f0','f1'], 'formats':['%si4','u1'], 'offsets':[0,4], 'itemsize':8, 'aligned':True}" % E
         dt = np.dtype([('f1', 'u1'), ('f0', 'i4')], align=True)
-        assert str(dt) == "{'names':['f1','f0'], 'formats':['u1',' 2 ** 31 - 1:
-            assert (u == [1]).all()
+            if sys.byteorder == 'big':
+                assert (u == [0x0100000000000000]).all()
+            else:
+                assert (u == [1]).all()
         else:
-            assert (u == [1, 0]).all()
+            if sys.byteorder == 'big':
+                assert (u == [0x01000000, 0]).all()
+            else:
+                assert (u == [1, 0]).all()
         v = fromstring("abcd", dtype="|S2")
         assert v[0] == "ab"
         assert v[1] == "cd"
@@ -3668,9 +3718,15 @@
         k = fromstring(self.float16val, dtype='float16')
         assert k[0] == dtype('float16').type(5.)
         dt =  array([5], dtype='longfloat').dtype
+        print(dt.itemsize)
         if dt.itemsize == 8:
-            m = fromstring('\x00\x00\x00\x00\x00\x00\x14@',
-                           dtype='float64')
+            import sys
+            if sys.byteorder == 'big':
+                m = fromstring('@\x14\x00\x00\x00\x00\x00\x00',
+                               dtype='float64')
+            else:
+                m = fromstring('\x00\x00\x00\x00\x00\x00\x14@',
+                               dtype='float64')
         elif dt.itemsize == 12:
             m = fromstring('\x00\x00\x00\x00\x00\x00\x00\xa0\x01@\x00\x00',
                            dtype='float96')
@@ -3692,8 +3748,13 @@
 
     def test_tostring(self):
         from numpy import array
-        assert array([1, 2, 3], 'i2').tostring() == '\x01\x00\x02\x00\x03\x00'
-        assert array([1, 2, 3], 'i2')[::2].tostring() == '\x01\x00\x03\x00'
+        import sys
+        if sys.byteorder == 'big':
+            assert array([1, 2, 3], 'i2').tostring() == '\x00\x01\x00\x02\x00\x03'
+            assert array([1, 2, 3], 'i2')[::2].tostring() == '\x00\x01\x00\x03'
+        else:
+            assert array([1, 2, 3], 'i2').tostring() == '\x01\x00\x02\x00\x03\x00'
+            assert array([1, 2, 3], 'i2')[::2].tostring() == '\x01\x00\x03\x00'
         assert array([1, 2, 3], 'i2')[::2].tostring() == '\x00\x01\x00\x03'
         assert array(0, dtype='i2').tostring() == '\x00\x00'
@@ -4189,7 +4250,11 @@
         v = a.view(('float32', 4))
         assert v.dtype == np.dtype('float32')
         assert v.shape == (10, 4)
-        assert v[0][-1] == 2.53125
+        import sys
+        if sys.byteorder == 'big':
+            assert v[0][-2] == 2.53125
+        else:
+            assert v[0][-1] == 2.53125
         exc = raises(ValueError, "a.view(('float32', 2))")
         assert exc.value[0] == 'new type not compatible with array.'
 
diff --git a/pypy/module/micronumpy/test/test_scalar.py b/pypy/module/micronumpy/test/test_scalar.py
--- a/pypy/module/micronumpy/test/test_scalar.py
+++ b/pypy/module/micronumpy/test/test_scalar.py
@@ -109,6 +109,7 @@
 
     def test_pickle(self):
         from numpy import dtype, zeros
+        import sys
         try:
             from numpy.core.multiarray import scalar
         except ImportError:
@@ -119,9 +120,11 @@
         f = dtype('float64').type(13.37)
         c = dtype('complex128').type(13 + 37.j)
 
-        assert i.__reduce__() == (scalar, (dtype('int32'), '9\x05\x00\x00'))
-        assert f.__reduce__() == (scalar, (dtype('float64'), '=\n\xd7\xa3p\xbd*@'))
-        assert c.__reduce__() == (scalar, (dtype('complex128'), '\x00\x00\x00\x00\x00\x00*@\x00\x00\x00\x00\x00\x80B@'))
+        swap = lambda s: (''.join(reversed(s))) if sys.byteorder == 'big' else s
+        assert i.__reduce__() == (scalar, (dtype('int32'), swap('9\x05\x00\x00')))
+        assert f.__reduce__() == (scalar, (dtype('float64'), swap('=\n\xd7\xa3p\xbd*@')))
+        assert c.__reduce__() == (scalar, (dtype('complex128'), swap('\x00\x00\x00\x00\x00\x00*@') + \
+                                                                swap('\x00\x00\x00\x00\x00\x80B@')))
 
         assert loads(dumps(i)) == i
         assert loads(dumps(f)) == f
@@ -256,13 +259,20 @@
         assert t < 7e-323
         t = s.view('complex64')
         assert type(t) is np.complex64
-        assert 0 < t.real < 1
-        assert t.imag == 0
+        if sys.byteorder == 'big':
+            assert 0 < t.imag < 1
+            assert t.real == 0
+        else:
+            assert 0 < t.real < 1
+            assert t.imag == 0
         exc = raises(TypeError, s.view, 'string')
         assert exc.value[0] == "data-type must not be 0-sized"
         t = s.view('S8')
         assert type(t) is np.string_
-        assert t == '\x0c'
+        if sys.byteorder == 'big':
+            assert t == '\x00' * 7 + '\x0c'
+        else:
+            assert t == '\x0c'
         s = np.dtype('string').type('abc1')
         assert s.view('S4') == 'abc1'
         if '__pypy__' in sys.builtin_module_names:
diff --git a/pypy/module/micronumpy/test/test_selection.py b/pypy/module/micronumpy/test/test_selection.py
--- a/pypy/module/micronumpy/test/test_selection.py
+++ b/pypy/module/micronumpy/test/test_selection.py
@@ -327,10 +327,15 @@
 # tests from numpy/core/tests/test_regression.py
     def test_sort_bigendian(self):
         from numpy import array, dtype
-        a = array(range(11), dtype='float64')
-        c = a.astype(dtype(''
         D.__module__ = 'mod'
         mod = new.module('mod')
         mod.D = D
@@ -510,7 +511,7 @@
             tp9
             Rp10
             (I3
-            S'<'
+            S'{E}'
             p11
             NNNI-1
             I-1
@@ -520,7 +521,7 @@
             S'\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00@'
             p13
             tp14
-            b.'''.replace('            ','')
+            b.'''.replace('            ','').format(E=E)
         for ss,sn in zip(s.split('\n')[1:],s_from_numpy.split('\n')[1:]):
             if len(ss)>10:
                 # ignore binary data, it will be checked later
diff --git a/pypy/module/pypyjit/test_pypy_c/test_buffers.py b/pypy/module/pypyjit/test_pypy_c/test_buffers.py
--- a/pypy/module/pypyjit/test_pypy_c/test_buffers.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_buffers.py
@@ -34,7 +34,7 @@
             i = 0
             while i < n:
                 i += 1
-                struct.unpack('i', a)  # ID: unpack
+                struct.unpack('')
+        else:
+            bit = ord('<')
         assert loop.match("""
             guard_class(p1, #, descr=...)
             p4 = getfield_gc_r(p1, descr=)
@@ -109,7 +113,7 @@
             i9 = getfield_gc_i(p4, descr=)
             i10 = getfield_gc_i(p6, descr=)
             i12 = int_eq(i10, 61)
-            i14 = int_eq(i10, 60)
+            i14 = int_eq(i10, %d)
             i15 = int_or(i12, i14)
             f16 = raw_load_f(i9, i5, descr=)
             guard_true(i15, descr=...)
@@ -142,7 +146,7 @@
             setfield_gc(p34, i30, descr=)
             }}}
             jump(..., descr=...)
-        """)
+        """ % (bit,))
 
     def test_reduce_logical_and(self):
         def main():
diff --git a/pypy/module/pypyjit/test_pypy_c/test_struct.py b/pypy/module/pypyjit/test_pypy_c/test_struct.py
--- a/pypy/module/pypyjit/test_pypy_c/test_struct.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_struct.py
@@ -19,8 +19,8 @@
             import struct
             i = 1
             while i < n:
-                buf = struct.pack("i", i)       # ID: pack
-                x = struct.unpack("i", buf)[0]  # ID: unpack
+                buf = struct.pack(" 3.0.+).
+CPython should be version 2.7.+.
diff --git a/rpython/jit/backend/arm/locations.py b/rpython/jit/backend/arm/locations.py
--- a/rpython/jit/backend/arm/locations.py
+++ b/rpython/jit/backend/arm/locations.py
@@ -1,7 +1,6 @@
 from rpython.jit.metainterp.history import INT, FLOAT
 from rpython.jit.backend.arm.arch import WORD, DOUBLE_WORD, JITFRAME_FIXED_SIZE
 
-
 class AssemblerLocation(object):
     _immutable_ = True
     type = INT
diff --git a/rpython/jit/backend/arm/opassembler.py b/rpython/jit/backend/arm/opassembler.py
--- a/rpython/jit/backend/arm/opassembler.py
+++ b/rpython/jit/backend/arm/opassembler.py
@@ -1143,35 +1143,42 @@
     def emit_op_zero_array(self, op, arglocs, regalloc, fcond):
         from rpython.jit.backend.llsupport.descr import unpack_arraydescr
         assert len(arglocs) == 0
-        length_box = op.getarg(2)
-        if isinstance(length_box, ConstInt) and length_box.getint() == 0:
+        size_box = op.getarg(2)
+        if isinstance(size_box, ConstInt) and size_box.getint() == 0:
             return fcond     # nothing to do
         itemsize, baseofs, _ = unpack_arraydescr(op.getdescr())
         args = op.getarglist()
+        #
+        # ZERO_ARRAY(base_loc, start, size, 1, 1)
+        # 'start' and 'size' are both expressed in bytes,
+        # and the two scaling arguments should always be ConstInt(1) on ARM.
+        assert args[3].getint() == 1
+        assert args[4].getint() == 1
+        #
         base_loc = regalloc.rm.make_sure_var_in_reg(args[0], args)
-        sibox = args[1]
-        if isinstance(sibox, ConstInt):
-            startindex_loc = None
-            startindex = sibox.getint()
-            assert startindex >= 0
+        startbyte_box = args[1]
+        if isinstance(startbyte_box, ConstInt):
+            startbyte_loc = None
+            startbyte = startbyte_box.getint()
+            assert startbyte >= 0
         else:
-            startindex_loc = regalloc.rm.make_sure_var_in_reg(sibox, args)
-            startindex = -1
+            startbyte_loc = regalloc.rm.make_sure_var_in_reg(startbyte_box,
+                                                             args)
+            startbyte = -1
 
-        # base_loc and startindex_loc are in two regs here (or they are
-        # immediates).  Compute the dstaddr_loc, which is the raw
+        # base_loc and startbyte_loc are in two regs here (or startbyte_loc
+        # is an immediate).  Compute the dstaddr_loc, which is the raw
         # address that we will pass as first argument to memset().
         # It can be in the same register as either one, but not in
         # args[2], because we're still needing the latter.
         dstaddr_box = TempVar()
         dstaddr_loc = regalloc.rm.force_allocate_reg(dstaddr_box, [args[2]])
-        if startindex >= 0:    # a constant
-            ofs = baseofs + startindex * itemsize
+        if startbyte >= 0:    # a constant
+            ofs = baseofs + startbyte
             reg = base_loc.value
         else:
-            self.mc.gen_load_int(r.ip.value, itemsize)
-            self.mc.MLA(dstaddr_loc.value, r.ip.value,
-                        startindex_loc.value, base_loc.value)
+            self.mc.ADD_rr(dstaddr_loc.value,
+                           base_loc.value, startbyte_loc.value)
             ofs = baseofs
             reg = dstaddr_loc.value
         if check_imm_arg(ofs):
@@ -1180,20 +1187,27 @@
             self.mc.gen_load_int(r.ip.value, ofs)
             self.mc.ADD_rr(dstaddr_loc.value, reg, r.ip.value)
 
-        if (isinstance(length_box, ConstInt) and
-                length_box.getint() <= 14 and     # same limit as GCC
-                itemsize in (4, 2, 1)):
+        # We use STRB, STRH or STR based on whether we know the array
+        # item size is a multiple of 1, 2 or 4.
+        if   itemsize & 1: itemsize = 1
+        elif itemsize & 2: itemsize = 2
+        else:              itemsize = 4
+        limit = itemsize
+        next_group = -1
+        if itemsize < 4 and startbyte >= 0:
+            # we optimize STRB/STRH into STR, but this needs care:
+            # it only works if startindex_loc is a constant, otherwise
+            # we'd be doing unaligned accesses.
+            next_group = (-startbyte) & 3
+            limit = 4
+
+        if (isinstance(size_box, ConstInt) and
+                size_box.getint() <= 14 * limit):     # same limit as GCC
             # Inline a series of STR operations, starting at 'dstaddr_loc'.
-            next_group = -1
-            if itemsize < 4 and startindex >= 0:
-                # we optimize STRB/STRH into STR, but this needs care:
-                # it only works if startindex_loc is a constant, otherwise
-                # we'd be doing unaligned accesses.
-                next_group = (-startindex * itemsize) & 3
             #
             self.mc.gen_load_int(r.ip.value, 0)
             i = 0
-            total_size = length_box.getint() * itemsize
+            total_size = size_box.getint()
             while i < total_size:
                 sz = itemsize
                 if i == next_group:
@@ -1209,29 +1223,18 @@
                 i += sz
 
         else:
-            if isinstance(length_box, ConstInt):
-                length_loc = imm(length_box.getint() * itemsize)
+            if isinstance(size_box, ConstInt):
+                size_loc = imm(size_box.getint())
             else:
-                # load length_loc in a register different than dstaddr_loc
-                length_loc = regalloc.rm.make_sure_var_in_reg(length_box,
-                                                              [dstaddr_box])
-                if itemsize > 1:
-                    # we need a register that is different from dstaddr_loc,
-                    # but which can be identical to length_loc (as usual,
-                    # only if the length_box is not used by future operations)
-                    bytes_box = TempVar()
-                    bytes_loc = regalloc.rm.force_allocate_reg(bytes_box,
-                                                               [dstaddr_box])
-                    self.mc.gen_load_int(r.ip.value, itemsize)
-                    self.mc.MUL(bytes_loc.value, r.ip.value, length_loc.value)
-                    length_box = bytes_box
-                    length_loc = bytes_loc
+                # load size_loc in a register different than dstaddr_loc
+                size_loc = regalloc.rm.make_sure_var_in_reg(size_box,
+                                                            [dstaddr_box])
             #
             # call memset()
             regalloc.before_call()
             self.simple_call_no_collect(imm(self.memset_addr),
-                                        [dstaddr_loc, imm(0), length_loc])
-            regalloc.rm.possibly_free_var(length_box)
+                                        [dstaddr_loc, imm(0), size_loc])
+            regalloc.rm.possibly_free_var(size_box)
         regalloc.rm.possibly_free_var(dstaddr_box)
         return fcond
 
diff --git a/rpython/jit/backend/detect_cpu.py b/rpython/jit/backend/detect_cpu.py
--- a/rpython/jit/backend/detect_cpu.py
+++ b/rpython/jit/backend/detect_cpu.py
@@ -16,6 +16,7 @@
 MODEL_X86_64_SSE4 = 'x86-64-sse4'
 MODEL_ARM         = 'arm'
 MODEL_PPC_64      = 'ppc-64'
+MODEL_S390_64     = 's390x'
 # don't use '_' in the model strings; they are replaced by '-'
 
 
@@ -27,6 +28,7 @@
         MODEL_ARM:    ['__arm__', '__thumb__','_M_ARM_EP'],
         MODEL_X86:    ['i386', '__i386', '__i386__', '__i686__','_M_IX86'],
         MODEL_PPC_64: ['__powerpc64__'],
+        MODEL_S390_64:['__s390x__'],
     }
     for k, v in mapping.iteritems():
         for macro in v:
@@ -67,6 +69,7 @@
             'armv7l': MODEL_ARM,
             'armv6l': MODEL_ARM,
             'arm': MODEL_ARM,      # freebsd
+            's390x': MODEL_S390_64
             }.get(mach)
 
     if result is None:
@@ -88,7 +91,6 @@
             if feature.detect_x32_mode():
                 raise ProcessorAutodetectError(
                     'JITting in x32 mode is not implemented')
-
     #
     if result.startswith('arm'):
         from rpython.jit.backend.arm.detect import detect_float
@@ -122,6 +124,8 @@
         return "rpython.jit.backend.arm.runner", "CPU_ARM"
     elif backend_name == MODEL_PPC_64:
         return "rpython.jit.backend.ppc.runner", "PPC_CPU"
+    elif backend_name == MODEL_S390_64:
+        return "rpython.jit.backend.zarch.runner", "CPU_S390_64"
     else:
         raise ProcessorAutodetectError, (
             "we have no JIT backend for this cpu: '%s'" % backend_name)
@@ -142,6 +146,7 @@
         MODEL_X86_64_SSE4: ['floats', 'singlefloats'],
         MODEL_ARM: ['floats', 'singlefloats', 'longlong'],
         MODEL_PPC_64: [], # we don't even have PPC directory, so no
+        MODEL_S390_64: ['floats'],
     }[backend_name]
 
 if __name__ == '__main__':
diff --git a/rpython/jit/backend/llsupport/gc.py b/rpython/jit/backend/llsupport/gc.py
--- a/rpython/jit/backend/llsupport/gc.py
+++ b/rpython/jit/backend/llsupport/gc.py
@@ -164,13 +164,11 @@
             array_index = moving_obj_tracker.get_array_index(v)
 
             size, offset, _ = unpack_arraydescr(moving_obj_tracker.ptr_array_descr)
-            scale = size
+            array_index = array_index * size + offset
             args = [moving_obj_tracker.const_ptr_gcref_array,
                     ConstInt(array_index),
-                    ConstInt(scale),
-                    ConstInt(offset),
                     ConstInt(size)]
-            load_op = ResOperation(rop.GC_LOAD_INDEXED_R, args)
+            load_op = ResOperation(rop.GC_LOAD_R, args)
             newops.append(load_op)
             op.setarg(arg_i, load_op)
         #
diff --git a/rpython/jit/backend/llsupport/jump.py b/rpython/jit/backend/llsupport/jump.py
new file mode 100644
--- /dev/null
+++ b/rpython/jit/backend/llsupport/jump.py
@@ -0,0 +1,107 @@
+def remap_frame_layout(assembler, src_locations, dst_locations, tmpreg):
+    pending_dests = len(dst_locations)
+    srccount = {}    # maps dst_locations to how many times the same
+                     # location appears in src_locations
+    for dst in dst_locations:
+        key = dst.as_key()
+        assert key not in srccount, "duplicate value in dst_locations!"
+        srccount[key] = 0
+    for i in range(len(dst_locations)):
+        src = src_locations[i]
+        if src.is_imm():
+            continue
+        key = src.as_key()
+        if key in srccount:
+            if key == dst_locations[i].as_key():
+                # ignore a move "x = x"
+                # setting any "large enough" negative value is ok, but
+                # be careful of overflows, don't use -sys.maxint
+                srccount[key] = -len(dst_locations) - 1
+                pending_dests -= 1
+            else:
+                srccount[key] += 1
+
+    while pending_dests > 0:
+        progress = False
+        for i in range(len(dst_locations)):
+            dst = dst_locations[i]
+            key = dst.as_key()
+            if srccount[key] == 0:
+                srccount[key] = -1       # means "it's done"
+                pending_dests -= 1
+                src = src_locations[i]
+                if not src.is_imm():
+                    key = src.as_key()
+                    if key in srccount:
+                        srccount[key] -= 1
+                _move(assembler, src, dst, tmpreg)
+                progress = True
+        if not progress:
+            # we are left with only pure disjoint cycles
+            sources = {}     # maps dst_locations to src_locations
+            for i in range(len(dst_locations)):
+                src = src_locations[i]
+                dst = dst_locations[i]
+                sources[dst.as_key()] = src
+            #
+            for i in range(len(dst_locations)):
+                dst = dst_locations[i]
+                originalkey = dst.as_key()
+                if srccount[originalkey] >= 0:
+                    assembler.regalloc_push(dst, 0)
+                    while True:
+                        key = dst.as_key()
+                        assert srccount[key] == 1
+                        # ^^^ because we are in a simple cycle
+                        srccount[key] = -1
+                        pending_dests -= 1
+                        src = sources[key]
+                        if src.as_key() == originalkey:
+                            break
+                        _move(assembler, src, dst, tmpreg)
+                        dst = src
+                    assembler.regalloc_pop(dst, 0)
+            assert pending_dests == 0
+
+def _move(assembler, src, dst, tmpreg):
+    # some assembler cannot handle memory to memory moves without
+    # a tmp register, thus prepare src according to the ISA capabilities
+    src = assembler.regalloc_prepare_move(src, dst, tmpreg)
+    assembler.regalloc_mov(src, dst)
+
+def remap_frame_layout_mixed(assembler,
+                             src_locations1, dst_locations1, tmpreg1,
+                             src_locations2, dst_locations2, tmpreg2, WORD):
+    # find and push the fp stack locations from src_locations2 that
+    # are going to be overwritten by dst_locations1
+    extrapushes = []
+    dst_keys = {}
+    for loc in dst_locations1:
+        dst_keys[loc.as_key()] = None
+    src_locations2red = []
+    dst_locations2red = []
+    for i in range(len(src_locations2)):
+        loc    = src_locations2[i]
+        dstloc = dst_locations2[i]
+        if loc.is_stack():
+            key = loc.as_key()
+            if (key in dst_keys or (loc.width > WORD and
+                                    (key + 1) in dst_keys)):
+                assembler.regalloc_push(loc, len(extrapushes))
+                extrapushes.append(dstloc)
+                continue
+        src_locations2red.append(loc)
+        dst_locations2red.append(dstloc)
+    src_locations2 = src_locations2red
+    dst_locations2 = dst_locations2red
+    #
+    # remap the integer and pointer registers and stack locations
+    remap_frame_layout(assembler, src_locations1, dst_locations1, tmpreg1)
+    #
+    # remap the fp registers and stack locations
+    remap_frame_layout(assembler, src_locations2, dst_locations2, tmpreg2)
+    #
+    # finally, pop the extra fp stack locations
+    while len(extrapushes) > 0:
+        loc = extrapushes.pop()
+        assembler.regalloc_pop(loc, len(extrapushes))
diff --git a/rpython/jit/backend/llsupport/rewrite.py b/rpython/jit/backend/llsupport/rewrite.py
--- a/rpython/jit/backend/llsupport/rewrite.py
+++ b/rpython/jit/backend/llsupport/rewrite.py
@@ -203,38 +203,47 @@
     def transform_to_gc_load(self, op):
         NOT_SIGNED = 0
         CINT_ZERO = ConstInt(0)
+        opnum = op.getopnum()
+        #if opnum == rop.CALL_MALLOC_NURSERY_VARSIZE:
+        #    v_length = op.getarg(2)
+        #    scale = op.getarg(1).getint()
+        #    if scale not in self.cpu.load_supported_factors:
+        #        scale, offset, v_length = \
+        #                self._emit_mul_if_factor_offset_not_supported(v_length, scale, 0)
+        #        op.setarg(1, ConstInt(scale))
+        #        op.setarg(2, v_length)
         if op.is_getarrayitem() or \
-           op.getopnum() in (rop.GETARRAYITEM_RAW_I,
-                             rop.GETARRAYITEM_RAW_F):
+           opnum in (rop.GETARRAYITEM_RAW_I,
+                     rop.GETARRAYITEM_RAW_F):
             self.handle_getarrayitem(op)
-        elif op.getopnum() in (rop.SETARRAYITEM_GC, rop.SETARRAYITEM_RAW):
+        elif opnum in (rop.SETARRAYITEM_GC, rop.SETARRAYITEM_RAW):
             self.handle_setarrayitem(op)
-        elif op.getopnum() == rop.RAW_STORE:
+        elif opnum == rop.RAW_STORE:
             itemsize, ofs, _ = unpack_arraydescr(op.getdescr())
             ptr_box = op.getarg(0)
             index_box = op.getarg(1)
             value_box = op.getarg(2)
             self.emit_gc_store_or_indexed(op, ptr_box, index_box, value_box, itemsize, 1, ofs)
-        elif op.getopnum() in (rop.RAW_LOAD_I, rop.RAW_LOAD_F):
+        elif opnum in (rop.RAW_LOAD_I, rop.RAW_LOAD_F):
             itemsize, ofs, sign = unpack_arraydescr(op.getdescr())
             ptr_box = op.getarg(0)
             index_box = op.getarg(1)
             self.emit_gc_load_or_indexed(op, ptr_box, index_box, itemsize, 1, ofs, sign)
-        elif op.getopnum() in (rop.GETINTERIORFIELD_GC_I, rop.GETINTERIORFIELD_GC_R,
-                               rop.GETINTERIORFIELD_GC_F):
+        elif opnum in (rop.GETINTERIORFIELD_GC_I, rop.GETINTERIORFIELD_GC_R,
+                       rop.GETINTERIORFIELD_GC_F):
             ofs, itemsize, fieldsize, sign = unpack_interiorfielddescr(op.getdescr())
             ptr_box = op.getarg(0)
             index_box = op.getarg(1)
             self.emit_gc_load_or_indexed(op, ptr_box, index_box, fieldsize, itemsize, ofs, sign)
-        elif op.getopnum() in (rop.SETINTERIORFIELD_RAW, rop.SETINTERIORFIELD_GC):
+        elif opnum in (rop.SETINTERIORFIELD_RAW, rop.SETINTERIORFIELD_GC):
             ofs, itemsize, fieldsize, sign = unpack_interiorfielddescr(op.getdescr())
             ptr_box = op.getarg(0)
             index_box = op.getarg(1)
             value_box = op.getarg(2)
             self.emit_gc_store_or_indexed(op, ptr_box, index_box, value_box,
                                           fieldsize, itemsize, ofs)
-        elif op.getopnum() in (rop.GETFIELD_GC_I, rop.GETFIELD_GC_F, rop.GETFIELD_GC_R,
-                               rop.GETFIELD_RAW_I, rop.GETFIELD_RAW_F, rop.GETFIELD_RAW_R):
+        elif opnum in (rop.GETFIELD_GC_I, rop.GETFIELD_GC_F, rop.GETFIELD_GC_R,
+                       rop.GETFIELD_RAW_I, rop.GETFIELD_RAW_F, rop.GETFIELD_RAW_R):
             ofs, itemsize, sign = unpack_fielddescr(op.getdescr())
             ptr_box = op.getarg(0)
             if op.getopnum() in (rop.GETFIELD_GC_F, rop.GETFIELD_GC_I, rop.GETFIELD_GC_R):
@@ -249,45 +258,45 @@
                 self.emit_op(op)
                 return True
             self.emit_gc_load_or_indexed(op, ptr_box, ConstInt(0), itemsize, 1, ofs, sign)
-        elif op.getopnum() in (rop.SETFIELD_GC, rop.SETFIELD_RAW):
+        elif opnum in (rop.SETFIELD_GC, rop.SETFIELD_RAW):
             ofs, itemsize, sign = unpack_fielddescr(op.getdescr())
             ptr_box = op.getarg(0)
             value_box = op.getarg(1)
             self.emit_gc_store_or_indexed(op, ptr_box, ConstInt(0), value_box, itemsize, 1, ofs)
-        elif op.getopnum() == rop.ARRAYLEN_GC:
+        elif opnum == rop.ARRAYLEN_GC:
             descr = op.getdescr()
             assert isinstance(descr, ArrayDescr)
             ofs = descr.lendescr.offset
             self.emit_gc_load_or_indexed(op, op.getarg(0), ConstInt(0),
                                          WORD, 1, ofs, NOT_SIGNED)
-        elif op.getopnum() == rop.STRLEN:
+        elif opnum == rop.STRLEN:
             basesize, itemsize, ofs_length = get_array_token(rstr.STR,
                                                  self.cpu.translate_support_code)
             self.emit_gc_load_or_indexed(op, op.getarg(0), ConstInt(0),
                                          WORD, 1, ofs_length, NOT_SIGNED)
-        elif op.getopnum() == rop.UNICODELEN:
+        elif opnum == rop.UNICODELEN:
             basesize, itemsize, ofs_length = get_array_token(rstr.UNICODE,
                                                  self.cpu.translate_support_code)
             self.emit_gc_load_or_indexed(op, op.getarg(0), ConstInt(0),
                                          WORD, 1, ofs_length, NOT_SIGNED)
-        elif op.getopnum() == rop.STRGETITEM:
+        elif opnum == rop.STRGETITEM:
             basesize, itemsize, ofs_length = get_array_token(rstr.STR,
                                                  self.cpu.translate_support_code)
             assert itemsize == 1
             self.emit_gc_load_or_indexed(op, op.getarg(0), op.getarg(1),
                                          itemsize, itemsize, basesize, NOT_SIGNED)
-        elif op.getopnum() == rop.UNICODEGETITEM:
+        elif opnum == rop.UNICODEGETITEM:
             basesize, itemsize, ofs_length = get_array_token(rstr.UNICODE,
                                                  self.cpu.translate_support_code)
             self.emit_gc_load_or_indexed(op, op.getarg(0), op.getarg(1),
                                          itemsize, itemsize, basesize, NOT_SIGNED)
-        elif op.getopnum() == rop.STRSETITEM:
+        elif opnum == rop.STRSETITEM:
             basesize, itemsize, ofs_length = get_array_token(rstr.STR,
                                                  self.cpu.translate_support_code)
             assert itemsize == 1
             self.emit_gc_store_or_indexed(op, op.getarg(0), op.getarg(1), op.getarg(2),
                                          itemsize, itemsize, basesize)
-        elif op.getopnum() == rop.UNICODESETITEM:
+        elif opnum == rop.UNICODESETITEM:
             basesize, itemsize, ofs_length = get_array_token(rstr.UNICODE,
                                                  self.cpu.translate_support_code)
             self.emit_gc_store_or_indexed(op, op.getarg(0), op.getarg(1), op.getarg(2),
@@ -488,7 +497,7 @@
             total_size = arraydescr.basesize
         elif (self.gc_ll_descr.can_use_nursery_malloc(1) and
               self.gen_malloc_nursery_varsize(arraydescr.itemsize,
-              v_length, op, arraydescr, kind=kind)):
+                  v_length, op, arraydescr, kind=kind)):
             # note that we cannot initialize tid here, because the array
             # might end up being allocated by malloc_external or some
             # stuff that initializes GC header fields differently
@@ -524,8 +533,18 @@
         # See emit_pending_zeros().  (This optimization is done by
         # hacking the object 'o' in-place: e.g., o.getarg(1) may be
         # replaced with another constant greater than 0.)
-        o = ResOperation(rop.ZERO_ARRAY, [v_arr, self.c_zero, v_length],
-                         descr=arraydescr)
+        assert isinstance(arraydescr, ArrayDescr)
+        scale = arraydescr.itemsize
+        v_length_scaled = v_length
+        if not isinstance(v_length, ConstInt):
+            scale, offset, v_length_scaled = \
+                    self._emit_mul_if_factor_offset_not_supported(v_length, scale, 0)
+        v_scale = ConstInt(scale)
+        # there is probably no point in doing _emit_mul_if.. for c_zero!
+        # NOTE that the scale might be != 1 for e.g. v_length_scaled if it is a constant
+        # it is later applied in emit_pending_zeros
+        args = [v_arr, self.c_zero, v_length_scaled, ConstInt(scale), v_scale]
+        o = ResOperation(rop.ZERO_ARRAY, args, descr=arraydescr)
         self.emit_op(o)
         if isinstance(v_length, ConstInt):
             self.last_zero_arrays.append(self._newops[-1])
@@ -643,22 +662,38 @@
         # are also already in 'newops', which is the point.
         for op in self.last_zero_arrays:
             assert op.getopnum() == rop.ZERO_ARRAY
+            descr = op.getdescr()
+            assert isinstance(descr, ArrayDescr)
+            scale = descr.itemsize
             box = op.getarg(0)
             try:
                 intset = self.setarrayitems_occurred(box)
             except KeyError:
+                start_box = op.getarg(1)
+                length_box = op.getarg(2)
+                if isinstance(start_box, ConstInt):
+                    start = start_box.getint()
+                    op.setarg(1, ConstInt(start * scale))
+                    op.setarg(3, ConstInt(1))
+                if isinstance(length_box, ConstInt):
+                    stop = length_box.getint()
+                    scaled_len = stop * scale
+                    op.setarg(2, ConstInt(scaled_len))
+                    op.setarg(4, ConstInt(1))
                 continue
             assert op.getarg(1).getint() == 0   # always 'start=0' initially
             start = 0
             while start in intset:
                 start += 1
-            op.setarg(1, ConstInt(start))
+            op.setarg(1, ConstInt(start * scale))
             stop = op.getarg(2).getint()
             assert start <= stop
             while stop > start and (stop - 1) in intset:
                 stop -= 1
-            op.setarg(2, ConstInt(stop - start))
+            op.setarg(2, ConstInt((stop - start) * scale))
             # ^^ may be ConstInt(0); then the operation becomes a no-op
+            op.setarg(3, ConstInt(1)) # set scale to 1
+            op.setarg(4, ConstInt(1)) # set scale to 1
         del self.last_zero_arrays[:]
         self._setarrayitems_occurred.clear()
         #
@@ -759,6 +794,10 @@
              arraydescr.lendescr.offset != gc_descr.standard_array_length_ofs)):
             return False
         self.emitting_an_operation_that_can_collect()
+        #scale = itemsize
+        #if scale not in self.cpu.load_supported_factors:
+        #    scale, offset, v_length = \
+        #            self._emit_mul_if_factor_offset_not_supported(v_length, scale, 0)
         op = ResOperation(rop.CALL_MALLOC_NURSERY_VARSIZE,
                           [ConstInt(kind), ConstInt(itemsize), v_length],
                           descr=arraydescr)
diff --git a/rpython/jit/backend/llsupport/test/test_gc_integration.py b/rpython/jit/backend/llsupport/test/test_gc_integration.py
--- a/rpython/jit/backend/llsupport/test/test_gc_integration.py
+++ b/rpython/jit/backend/llsupport/test/test_gc_integration.py
@@ -91,6 +91,8 @@
             assert nos == [0, 1, 47]
         elif self.cpu.backend_name.startswith('ppc64'):
             assert nos == [0, 1, 33]
+        elif self.cpu.backend_name.startswith('zarch'):
+            assert nos == [0, 1, 29]
         else:
             raise Exception("write the data here")
         assert frame.jf_frame[nos[0]]
@@ -313,7 +315,9 @@
                                   'strdescr': arraydescr})
         # check the returned pointers
         gc_ll_descr = self.cpu.gc_ll_descr
-        assert gc_ll_descr.calls == [(8, 15, 10), (5, 15, 3), ('str', 3)]
+        assert gc_ll_descr.calls == [(8, 15, 10),
+                                     (5, 15, 3),
+                                     ('str', 3)]
         # one fit, one was too large, one was not fitting
 
     def test_malloc_slowpath(self):
@@ -641,11 +645,13 @@
             gcmap = unpack_gcmap(frame)
             if self.cpu.backend_name.startswith('ppc64'):
                 assert gcmap == [30, 31, 32]
+            elif self.cpu.backend_name.startswith('zarch'):
+                # 10 gpr, 14 fpr -> 25 is the first slot
+                assert gcmap == [26, 27, 28]
             elif self.cpu.IS_64_BIT:
                 assert gcmap == [28, 29, 30]
             elif self.cpu.backend_name.startswith('arm'):
                 assert gcmap == [44, 45, 46]
-                pass
             else:
                 assert gcmap == [22, 23, 24]
             for item, s in zip(gcmap, new_items):
diff --git a/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py b/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
--- a/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
+++ b/rpython/jit/backend/llsupport/test/test_pinned_object_rewrite.py
@@ -127,7 +127,7 @@
             i0 = getfield_gc_i(ConstPtr(pinned_obj_gcref), descr=pinned_obj_my_int_descr)
             """, """
             []
-            p1 = gc_load_indexed_r(ConstPtr(ptr_array_gcref), 0, %(ptr_array_descr.itemsize)s, 1, %(ptr_array_descr.itemsize)s)
+            p1 = gc_load_r(ConstPtr(ptr_array_gcref), %(0 * ptr_array_descr.itemsize + 1)s, %(ptr_array_descr.itemsize)s)
             i0 = gc_load_i(p1, 0, -%(pinned_obj_my_int_descr.field_size)s)
             """)
         assert len(self.gc_ll_descr.last_moving_obj_tracker._indexes) == 1
@@ -140,10 +140,10 @@
             i2 = getfield_gc_i(ConstPtr(pinned_obj_gcref), descr=pinned_obj_my_int_descr)
             """, """
             []
-            p1 = gc_load_indexed_r(ConstPtr(ptr_array_gcref), 0, %(ptr_array_descr.itemsize)s, 1, %(ptr_array_descr.itemsize)s)
+            p1 = gc_load_r(ConstPtr(ptr_array_gcref), %(0 * ptr_array_descr.itemsize + 1)s, %(ptr_array_descr.itemsize)s)
             i0 = gc_load_i(p1, 0, -%(pinned_obj_my_int_descr.field_size)s)
             i1 = gc_load_i(ConstPtr(notpinned_obj_gcref), 0, -%(notpinned_obj_my_int_descr.field_size)s)
-            p2 = gc_load_indexed_r(ConstPtr(ptr_array_gcref), 1, %(ptr_array_descr.itemsize)s, 1, %(ptr_array_descr.itemsize)s)
+            p2 = gc_load_r(ConstPtr(ptr_array_gcref), %(1 * ptr_array_descr.itemsize + 1)s, %(ptr_array_descr.itemsize)s)
             i2 = gc_load_i(p2, 0, -%(pinned_obj_my_int_descr.field_size)s)
             """)
         assert len(self.gc_ll_descr.last_moving_obj_tracker._indexes) == 2
diff --git a/rpython/jit/backend/llsupport/test/test_rewrite.py b/rpython/jit/backend/llsupport/test/test_rewrite.py
--- a/rpython/jit/backend/llsupport/test/test_rewrite.py
+++ b/rpython/jit/backend/llsupport/test/test_rewrite.py
@@ -36,6 +36,21 @@
             assert not isinstance(descr, (str, int))
             return 'gc_store(%s, %d, %s, %d)' % (baseptr, descr.offset,
                                                  newvalue, descr.field_size)
+        def zero_array(baseptr, start, length, descr_name, descr):
+            assert isinstance(baseptr, str)
+            assert isinstance(start, (str, int))
+            assert isinstance(length, (str, int))
+            assert isinstance(descr_name, str)
+            assert not isinstance(descr, (str,int))
+            itemsize = descr.itemsize
+            start = start * itemsize
+            length_scale = 1
+            if isinstance(length, str):
+                length_scale = itemsize
+            else:
+                length = length * itemsize
+            return 'zero_array(%s, %s, %s, 1, %d, descr=%s)' % \
+                      (baseptr, start, length, length_scale, descr_name)
         def setarrayitem(baseptr, index, newvalue, descr):
             assert isinstance(baseptr, str)
             assert isinstance(index, (str, int))
@@ -681,7 +696,7 @@
                                 %(cdescr.basesize + 129 * cdescr.itemsize)d)
             gc_store(p1, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p1, 0,  129, %(clendescr.field_size)s)
-            zero_array(p1, 0, 129, descr=cdescr)
+            %(zero_array('p1', 0, 129, 'cdescr', cdescr))s
             call_n(123456)
             cond_call_gc_wb(p1, descr=wbdescr)
             %(setarrayitem('p1', 'i2', 'p3', cdescr))s
@@ -703,7 +718,7 @@
                                 %(cdescr.basesize + 130 * cdescr.itemsize)d)
             gc_store(p1, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p1, 0,  130, %(clendescr.field_size)s)
-            zero_array(p1, 0, 130, descr=cdescr)
+            %(zero_array('p1', 0, 130, 'cdescr', cdescr))s
             call_n(123456)
             cond_call_gc_wb_array(p1, i2, descr=wbdescr)
             %(setarrayitem('p1', 'i2', 'p3', cdescr))s
@@ -735,7 +750,7 @@
                                 %(cdescr.basesize + 5 * cdescr.itemsize)d)
             gc_store(p1, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p1, 0,  5, %(clendescr.field_size)s)
-            zero_array(p1, 0, 5, descr=cdescr)
+            %(zero_array('p1', 0, 5, 'cdescr', cdescr))s
             label(p1, i2, p3)
             cond_call_gc_wb_array(p1, i2, descr=wbdescr)
             %(setarrayitem('p1', 'i2', 'p3', cdescr))s
@@ -810,7 +825,7 @@
                                 %(cdescr.basesize + 5 * cdescr.itemsize)d)
             gc_store(p0, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p0, 0,  5, %(clendescr.field_size)s)
-            zero_array(p0, 0, 5, descr=cdescr)
+            %(zero_array('p0', 0, 5, 'cdescr', cdescr))s
             %(setarrayitem('p0', 'i2', 'p1', cdescr))s
             jump()
         """)
@@ -828,7 +843,7 @@
                                 %(cdescr.basesize + 5 * cdescr.itemsize)d)
             gc_store(p0, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p0, 0,  5, %(clendescr.field_size)s)
-            zero_array(p0, 2, 3, descr=cdescr)
+            %(zero_array('p0', 2, 3, 'cdescr', cdescr))s
             %(setarrayitem('p0', 1, 'p1', cdescr))s
             %(setarrayitem('p0', 0, 'p2', cdescr))s
             jump()
@@ -847,7 +862,7 @@
                                 %(cdescr.basesize + 5 * cdescr.itemsize)d)
             gc_store(p0, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p0, 0,  5, %(clendescr.field_size)s)
-            zero_array(p0, 0, 3, descr=cdescr)
+            %(zero_array('p0', 0, 3, 'cdescr', cdescr))s
             %(setarrayitem('p0', 3, 'p1', cdescr))s
             %(setarrayitem('p0', 4, 'p2', cdescr))s
             jump()
@@ -867,7 +882,7 @@
                                 %(cdescr.basesize + 5 * cdescr.itemsize)d)
             gc_store(p0, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p0, 0,  5, %(clendescr.field_size)s)
-            zero_array(p0, 0, 5, descr=cdescr)
+            %(zero_array('p0', 0, 5, 'cdescr', cdescr))s
             %(setarrayitem('p0', 3, 'p1', cdescr))s
             %(setarrayitem('p0', 2, 'p2', cdescr))s
             %(setarrayitem('p0', 1, 'p2', cdescr))s
@@ -890,7 +905,7 @@
                                 %(cdescr.basesize + 5 * cdescr.itemsize)d)
             gc_store(p0, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p0, 0,  5, %(clendescr.field_size)s)
-            zero_array(p0, 5, 0, descr=cdescr)
+            %(zero_array('p0', 5, 0, 'cdescr', cdescr))s
             %(setarrayitem('p0', 3, 'p1', cdescr))s
             %(setarrayitem('p0', 4, 'p2', cdescr))s
             %(setarrayitem('p0', 0, 'p1', cdescr))s
@@ -913,7 +928,7 @@
                                 %(cdescr.basesize + 5 * cdescr.itemsize)d)
             gc_store(p0, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p0, 0,  5, %(clendescr.field_size)s)
-            zero_array(p0, 1, 4, descr=cdescr)
+            %(zero_array('p0', 1, 4, 'cdescr', cdescr))s
             %(setarrayitem('p0', 0, 'p1', cdescr))s
             call_n(321321)
             cond_call_gc_wb(p0, descr=wbdescr)
@@ -935,7 +950,7 @@
                                 %(cdescr.basesize + 5 * cdescr.itemsize)d)
             gc_store(p0, 0,  8111, %(tiddescr.field_size)s)
             gc_store(p0, 0,  5, %(clendescr.field_size)s)
-            zero_array(p0, 1, 4, descr=cdescr)
+            %(zero_array('p0', 1, 4, 'cdescr', cdescr))s
             %(setarrayitem('p0', 0, 'p1', cdescr))s
             label(p0, p2)
             cond_call_gc_wb_array(p0, 1, descr=wbdescr)
@@ -952,7 +967,7 @@
             [p1, p2, i3]
             p0 = call_malloc_nursery_varsize(0, 1, i3, descr=bdescr)
             gc_store(p0, 0,  i3, %(blendescr.field_size)s)
-            zero_array(p0, 0, i3, descr=bdescr)
+            %(zero_array('p0', 0, 'i3', 'bdescr', bdescr))s
             jump()
         """)
 
@@ -966,7 +981,7 @@
             [p1, p2, i3]
             p0 = call_malloc_nursery_varsize(0, 1, i3, descr=bdescr)
             gc_store(p0, 0,  i3, %(blendescr.field_size)s)
-            zero_array(p0, 0, i3, descr=bdescr)
+            %(zero_array('p0', 0, 'i3', 'bdescr', bdescr))s
             cond_call_gc_wb_array(p0, 0, descr=wbdescr)
             %(setarrayitem('p0', 0, 'p1', bdescr))s
             jump()
diff --git a/rpython/jit/backend/ppc/callbuilder.py b/rpython/jit/backend/ppc/callbuilder.py
--- a/rpython/jit/backend/ppc/callbuilder.py
+++ b/rpython/jit/backend/ppc/callbuilder.py
@@ -98,7 +98,7 @@
 
         # We must also copy fnloc into FNREG
         non_float_locs.append(self.fnloc)
-        non_float_regs.append(self.mc.RAW_CALL_REG)     # r2 or r12
+        non_float_regs.append(self.mc.RAW_CALL_REG)
 
         if float_locs:
             assert len(float_locs) <= len(self.FPR_ARGS)
diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
--- a/rpython/jit/backend/ppc/opassembler.py
+++ b/rpython/jit/backend/ppc/opassembler.py
@@ -851,40 +851,6 @@
             self.mc.sldi(scratch_loc.value, loc.value, scale)
         return scratch_loc
 
-    def _apply_scale(self, ofs, index_loc, itemsize):
-        # XXX should die now that getarrayitem and getinteriorfield are gone
-        # but can't because of emit_zero_array() at the moment
-
-        # For arrayitem and interiorfield reads and writes: this returns an
-        # offset suitable for use in ld/ldx or similar instructions.
-        # The result will be either the register r2 or a 16-bit immediate.
-        # The arguments stand for "ofs + index_loc * itemsize",
-        # with the following constrains:
-        assert ofs.is_imm()                # must be an immediate...
-        assert _check_imm_arg(ofs.getint())   # ...that fits 16 bits
-        assert index_loc is not r.SCRATCH2 # can be a reg or imm (any size)
-        assert itemsize.is_imm()           # must be an immediate (any size)
-
-        multiply_by = itemsize.value
-        offset = ofs.getint()
-        if index_loc.is_imm():
-            offset += index_loc.getint() * multiply_by
-            if _check_imm_arg(offset):
-                return imm(offset)
-            else:
-                self.mc.load_imm(r.SCRATCH2, offset)
-                return r.SCRATCH2
-        else:
-            index_loc = self._multiply_by_constant(index_loc, multiply_by,
-                                                   r.SCRATCH2)
-            # here, the new index_loc contains 'index_loc * itemsize'.
-            # If offset != 0 then we have to add it here.  Note that
-            # mc.addi() would not be valid with operand r0.
-            if offset != 0:
-                self.mc.addi(r.SCRATCH2.value, index_loc.value, offset)
-                index_loc = r.SCRATCH2
-            return index_loc
-
     def _copy_in_scratch2(self, loc):
         if loc.is_imm():
             self.mc.li(r.SCRATCH2.value, loc.value)
@@ -903,86 +869,94 @@
         elif itemsize & 2:                self.mc.sthu(a, b, c)

From pypy.commits at gmail.com  Thu Mar 10 09:45:45 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 10 Mar 2016 06:45:45 -0800 (PST)
Subject: [pypy-commit] pypy s390x-enhance-speed: close branch
Message-ID: <56e18899.0f941c0a.e504b.ffff9003@mx.google.com>

Author: Richard Plangger 
Branch: s390x-enhance-speed
Changeset: r82943:a0123b0e67f5
Date: 2016-03-10 15:44 +0100
http://bitbucket.org/pypy/pypy/changeset/a0123b0e67f5/

Log:	close branch


From pypy.commits at gmail.com  Thu Mar 10 09:45:43 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 10 Mar 2016 06:45:43 -0800 (PST)
Subject: [pypy-commit] pypy s390x-backend: close branch
Message-ID: <56e18897.10921c0a.9b57c.4b06@mx.google.com>

Author: Richard Plangger 
Branch: s390x-backend
Changeset: r82942:9a366b997dcc
Date: 2016-03-10 15:44 +0100
http://bitbucket.org/pypy/pypy/changeset/9a366b997dcc/

Log:	close branch


From pypy.commits at gmail.com  Thu Mar 10 10:01:11 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 07:01:11 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: minor fixes
Message-ID: <56e18c37.857ac20a.8280b.4cbe@mx.google.com>

Author: Armin Rigo 
Branch: jit-leaner-frontend
Changeset: r82944:a8445a6ab102
Date: 2016-03-10 16:00 +0100
http://bitbucket.org/pypy/pypy/changeset/a8445a6ab102/

Log:	minor fixes

diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -16,7 +16,8 @@
 TAGINT, TAGCONST, TAGBOX = range(3)
 TAGMASK = 0x3
 TAGSHIFT = 2
-NUM_SMALL_INTS = 2 ** (16 - TAGSHIFT)
+SMALL_INT_STOP  = 2 ** (15 - TAGSHIFT)
+SMALL_INT_START = -SMALL_INT_STOP
 
 class Sentinel(object):
     pass
@@ -195,7 +196,7 @@
         if isinstance(box, Const):
             if (isinstance(box, ConstInt) and
                 isinstance(box.getint(), int) and # symbolics
-                0 <= box.getint() < NUM_SMALL_INTS):
+                SMALL_INT_START <= box.getint() < SMALL_INT_STOP):
                 return tag(TAGINT, box.getint())
             else:
                 self._consts.append(box)
@@ -310,16 +311,9 @@
             ops.append(iter.next())
         return ops
 
-    def _get_operations(self):
-        """ NOT_RPYTHON
-        """
-        l = []
-        i = self.get_iter()
-        while not i.done():
-            l.append(i.next())
-        return l
-
 def tag(kind, pos):
+    #if not SMALL_INT_START <= pos < SMALL_INT_STOP:
+    #    raise some error
     return (pos << TAGSHIFT) | kind
 
 def untag(tagged):

From pypy.commits at gmail.com  Thu Mar 10 10:04:32 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 07:04:32 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: merge heads
Message-ID: <56e18d00.080a1c0a.1fc8e.4ea9@mx.google.com>

Author: Armin Rigo 
Branch: jit-leaner-frontend
Changeset: r82945:6ab28e9da460
Date: 2016-03-10 16:03 +0100
http://bitbucket.org/pypy/pypy/changeset/6ab28e9da460/

Log:	merge heads

diff --git a/pypy/module/pypyjit/interp_resop.py b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -249,7 +249,7 @@
                 ofs = debug_info.asminfo.ops_offset
             else:
                 ofs = {}
-            ops = debug_info.operations
+            _, ops = debug_info.trace.unpack()
             self.w_ops = space.newlist(wrap_oplist(space, logops, ops, ofs))
         else:
             self.w_ops = space.w_None
diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -287,6 +287,7 @@
         return None
 
     if ((warmstate.vec and jitdriver_sd.vec) or warmstate.vec_all):
+        assert False, "vectorization disabled"
         from rpython.jit.metainterp.optimizeopt.vector import optimize_vector
         loop_info, loop_ops = optimize_vector(metainterp_sd,
                                               jitdriver_sd, warmstate,
diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -303,8 +303,6 @@
         return TraceIterator(self, 0, len(self._ops))
 
     def unpack(self):
-        """ NOT_RPYTHON - really rpython, but only use for debugging
-        """
         iter = self.get_iter()
         ops = []
         while not iter.done():
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2977,7 +2977,7 @@
         if start_stack:
             jitdriver_sd, key, pos = start_stack[0]
             warmstate = jitdriver_sd.warmstate
-            size = len(self.history.operations) - pos
+            size = self.history.get_trace_position()[0] - pos[0]
             if size > max_size:
                 if warmstate is not None:
                     r = warmstate.get_location_str(key)

From pypy.commits at gmail.com  Thu Mar 10 10:13:01 2016
From: pypy.commits at gmail.com (plan_rich)
Date: Thu, 10 Mar 2016 07:13:01 -0800 (PST)
Subject: [pypy-commit] buildbot default: s390x buildbot now nightly builds
 default
Message-ID: <56e18efd.82561c0a.996ee.510b@mx.google.com>

Author: Richard Plangger 
Branch: 
Changeset: r992:c21ef5322a5a
Date: 2016-03-10 16:12 +0100
http://bitbucket.org/pypy/buildbot/changeset/c21ef5322a5a/

Log:	s390x buildbot now nightly builds default

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -308,9 +308,9 @@
             ], branch="py3.3", hour=3, minute=0),
 
         # S390X vm (ibm-research)
-        Nightly("nightly-4-00", [LINUX_S390X], branch='s390x-backend', hour=0, minute=0),
-        Nightly("nightly-4-01", [JITLINUX_S390X], branch='s390x-backend', hour=2, minute=0),
-        Nightly("nightly-4-02", [APPLVLLINUX_S390X], branch='s390x-backend', hour=5, minute=0),
+        Nightly("nightly-4-00", [LINUX_S390X], branch='default', hour=0, minute=0),
+        Nightly("nightly-4-01", [JITLINUX_S390X], branch='default', hour=2, minute=0),
+        Nightly("nightly-4-02", [APPLVLLINUX_S390X], branch='default', hour=5, minute=0),
 
         # this one has faithfully run every night even though the latest
         # change to that branch was in January 2013.  Re-enable one day.

From pypy.commits at gmail.com  Thu Mar 10 10:33:22 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 07:33:22 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: disable jit hooks
Message-ID: <56e193c2.552f1c0a.98222.587c@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82946:8e821f827b97
Date: 2016-03-10 17:32 +0200
http://bitbucket.org/pypy/pypy/changeset/8e821f827b97/

Log:	disable jit hooks

diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -336,7 +336,7 @@
     def jitpolicy(self, driver):
         from pypy.module.pypyjit.policy import PyPyJitPolicy
         from pypy.module.pypyjit.hooks import pypy_hooks
-        return PyPyJitPolicy(pypy_hooks)
+        return PyPyJitPolicy() #pypy_hooks)
 
     def get_entry_point(self, config):
         from pypy.tool.lib_pypy import import_from_lib_pypy
diff --git a/pypy/module/pypyjit/__init__.py b/pypy/module/pypyjit/__init__.py
--- a/pypy/module/pypyjit/__init__.py
+++ b/pypy/module/pypyjit/__init__.py
@@ -12,9 +12,9 @@
         'dont_trace_here': 'interp_jit.dont_trace_here',
         'trace_next_iteration': 'interp_jit.trace_next_iteration',
         'trace_next_iteration_hash': 'interp_jit.trace_next_iteration_hash',
-        'set_compile_hook': 'interp_resop.set_compile_hook',
-        'set_abort_hook': 'interp_resop.set_abort_hook',
-        'set_trace_too_long_hook': 'interp_resop.set_trace_too_long_hook',
+        #'set_compile_hook': 'interp_resop.set_compile_hook',
+        #'set_abort_hook': 'interp_resop.set_abort_hook',
+        #'set_trace_too_long_hook': 'interp_resop.set_trace_too_long_hook',
         'get_stats_snapshot': 'interp_resop.get_stats_snapshot',
         'get_stats_asmmemmgr': 'interp_resop.get_stats_asmmemmgr',
         # those things are disabled because they have bugs, but if
@@ -23,10 +23,10 @@
         # correct loop_runs if PYPYLOG is correct
         #'enable_debug': 'interp_resop.enable_debug',
         #'disable_debug': 'interp_resop.disable_debug',
-        'ResOperation': 'interp_resop.WrappedOp',
-        'GuardOp': 'interp_resop.GuardOp',
-        'DebugMergePoint': 'interp_resop.DebugMergePoint',
-        'JitLoopInfo': 'interp_resop.W_JitLoopInfo',
+        #'ResOperation': 'interp_resop.WrappedOp',
+        #'GuardOp': 'interp_resop.GuardOp',
+        #'DebugMergePoint': 'interp_resop.DebugMergePoint',
+        #'JitLoopInfo': 'interp_resop.W_JitLoopInfo',
         'PARAMETER_DOCS': 'space.wrap(rpython.rlib.jit.PARAMETER_DOCS)',
     }
 

From pypy.commits at gmail.com  Thu Mar 10 11:39:52 2016
From: pypy.commits at gmail.com (mattip)
Date: Thu, 10 Mar 2016 08:39:52 -0800 (PST)
Subject: [pypy-commit] pypy.org extradoc: release 5.0 update
Message-ID: <56e1a358.05de1c0a.5f6cb.734d@mx.google.com>

Author: mattip 
Branch: extradoc
Changeset: r717:983d67d97553
Date: 2016-03-10 18:38 +0200
http://bitbucket.org/pypy/pypy.org/changeset/983d67d97553/

Log:	release 5.0 update

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -74,7 +74,7 @@
 performance improvements.
 We provide binaries for x86 and ARM Linux, Mac OS/X and Windows for:
 
-the Python2.7 compatible release — PyPy 4.0.1 — (what's new in PyPy 4.0.1?)
+the Python2.7 compatible release — PyPy 5.0 — (what's new in PyPy 5.0?)
 the Python3.2.5 compatible release — PyPy3 2.4.0 — (what's new in PyPy3 2.4.0?).
 the Python2.7 Software Transactional Memory special release — PyPy-STM 2.5.1 (Linux x86-64 only)
 
@@ -113,21 +113,21 @@
 degrees of being up-to-date.
 
 
-
-Python2.7 compatible PyPy 4.0.1
+
+Python2.7 compatible PyPy 5.0
 
-Linux x86 binary (32bit, tar.bz2 built on Ubuntu 12.04 - 14.04) (see [1] below)
-Linux x86-64 binary (64bit, tar.bz2 built on Ubuntu 12.04 - 14.04) (see [1] below)
-ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Raspbian) (see [1] below)
-ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Ubuntu Raring) (see [1] below)
-ARM Softfloat Linux binary (ARMEL/gnueabi, tar.bz2,  Ubuntu Precise) (see [1] below)
-Mac OS/X binary (64bit)
+Linux x86 binary (32bit, tar.bz2 built on Ubuntu 12.04 - 14.04) (see [1] below)
+Linux x86-64 binary (64bit, tar.bz2 built on Ubuntu 12.04 - 14.04) (see [1] below)
+ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Raspbian) (see [1] below)
+ARM Hardfloat Linux binary (ARMHF/gnueabihf, tar.bz2, Ubuntu Raring) (see [1] below)
+ARM Softfloat Linux binary (ARMEL/gnueabi, tar.bz2,  Ubuntu Precise) (see [1] below)
+Mac OS/X binary (64bit)
 FreeBSD 9.2 x86 64 bit (hopefully availabe soon) (see [1] below)
-Windows binary (32bit) (you might need the VS 2008 runtime library
+
Windows binary (32bit) (you might need the VS 2008 runtime library
 installer vcredist_x86.exe.)
-PowerPC64 Linux binary (64bit big-endian, Fedora 20) (see [1] below)
-PowerPC64le Linux binary (64bit little-endian, Fedora 21) (see [1] below)
-Source (tar.bz2); Source (zip).  See below for more about the sources.
+PowerPC64 Linux binary (64bit big-endian, Fedora 20) (see [1] below)
+PowerPC64le Linux binary (64bit little-endian, Fedora 21) (see [1] below)
+Source (tar.bz2); Source (zip).  See below for more about the sources.
 All our downloads, including previous versions.  We also have a
 mirror, but please use only if you have troubles accessing the links above
 
@@ -196,7 +196,7 @@
 uncompressed, they run in-place.  For now you can uncompress them
 either somewhere in your home directory or, say, in /opt, and
 if you want, put a symlink from somewhere like
-/usr/local/bin/pypy to /path/to/pypy-4.0.1/bin/pypy.  Do
+/usr/local/bin/pypy to /path/to/pypy-5.0.0/bin/pypy.  Do
 not move or copy the executable pypy outside the tree – put
 a symlink to it, otherwise it will not find its libraries.
 
@@ -217,7 +217,7 @@
 If you have pip:
  pypy -m pip install git+https://bitbucket.org/pypy/numpy.git
-pypy -m pip install git+https://bitbucket.org/pypy/numpy.git@pypy-4.0.1
+pypy -m pip install git+https://bitbucket.org/pypy/numpy.git@pypy-5.0
 
 (the second version selects a particular tag, which may be needed if your
 pypy is not the latest development version.)
@@ -241,7 +241,7 @@
 Get the source code.  The following packages contain the source at
 the same revision as the above binaries:
 
-pypy-4.0.1-src.tar.bz2 (sources)
+pypy-5.0.0-src.tar.bz2 (sources)
 
 Or you can checkout the current trunk using Mercurial (the trunk
 usually works and is of course more up-to-date):
@@ -369,19 +369,19 @@
 
 Checksums
 Here are the checksums for each of the downloads
-pypy-4.0.1 md5:
+pypy-5.0.0 md5:
 -f6721e62f4ba1cdc4cc5ad719369e359  pypy-4.0.1-linux64.tar.bz2
-fe8106ac3919c7b4be2766944326a624  pypy-4.0.1-linux-armel.tar.bz2
-823b8a457f4c48ebdb8e1ee607b0a893  pypy-4.0.1-linux-armhf-raring.tar.bz2
-e45728d413aa88963d4462ebcfaff6ea  pypy-4.0.1-linux-armhf-raspbian.tar.bz2
-d1d03aa44df354a3f589473a51406795  pypy-4.0.1-linux.tar.bz2
-67ac82d88aaaef8c3074e68d700f3968  pypy-4.0.1-osx64.tar.bz2
-f5b35ebedee2fa4fdfee82733be59996  pypy-4.0.1-src.tar.bz2
-6b81d79886b215a877fee7624883ee94  pypy-4.0.1-src.zip
-dc6573828ee5c82df18f9035f3b19edb  pypy-4.0.1-win32.zip
-d4492e65201bb09dca5f97601113dc57  pypy-4.0.1-ppc64le.tar.bz2
-2aadbb7638153b9d7c2a832888ed3c1e  pypy-4.0.1-ppc64.tar.bz2
+bcb5c830d6380ff78b759dbe075dfc14  pypy-5.0.0-linux-armel.tar.bz2
+5649117ba754bef14550b6abc2135eab  pypy-5.0.0-linux-armhf-raring.tar.bz2
+949344fff9c6942713f34e1a1fcbc7aa  pypy-5.0.0-linux-armhf-raspbian.tar.bz2
+5e005cf26a3a58552fd77f9aaae6f614  pypy-5.0.0-linux.tar.bz2
+133530cb9957a67807b25d23bb74ac24  pypy-5.0.0-linux64.tar.bz2
+a091398908bf525149a1fdea8bf48ec2  pypy-5.0.0-osx64.tar.bz2
+f243ff399a55f4370b6d1dc0a3650f1d  pypy-5.0.0-ppc64.tar.bz2
+51fb75ae0a143faa9a5b39f094965050  pypy-5.0.0-ppc64le.tar.bz2
+6a26f735cb45a10255076fdd6cebee84  pypy-5.0.0-src.tar.bz2
+1be14cf3ffc97da7521637f8f81abc3c  pypy-5.0.0-src.zip
+d2c8237e8106b535850596f0e9762246  pypy-5.0.0-win32.zip
 
 pypy3-2.4.0 md5:
 @@ -400,19 +400,33 @@
 2c9f0054f3b93a6473f10be35277825a  pypy-1.8-sandbox-linux64.tar.bz2
 009c970b5fa75754ae4c32a5d108a8d4  pypy-1.8-sandbox-linux.tar.bz2
 
-pypy-4.0.1 sha256:
+pypy-5.0.0 sha1:
 -0d6090cee59f4b9bab91ddbea76580d0c232b78dae65aaa9e8fa8d4449ba25b4  pypy-4.0.1-linux64.tar.bz2
-d1acdd45ebd34580dd632c63c95211f6bae5e9a8f7a46ffa6f0443286ff9f61b  pypy-4.0.1-linux-armel.tar.bz2
-e67278ce7423aa7bf99a95fd271cb76763eae3106930f4b7de1fba6a70a3f383  pypy-4.0.1-linux-armhf-raring.tar.bz2
-52eef495f560af59a787b9935367cb5f8c83b48e32a80ec3e7060bffac011ecc  pypy-4.0.1-linux-armhf-raspbian.tar.bz2
-721920fcbb6aefc9a98e868e32b7f4ea5fd68b7f9305d08d0a2595327c9c0611  pypy-4.0.1-linux.tar.bz2
-06be1299691f7ea558bf8e3bdf3d20debb8ba03cd7cadf04f2d6cbd5fd084430  pypy-4.0.1-osx64.tar.bz2
-43be0b04bcbde1e24d5f39875c0471cdc7bdb44549e5618d32e49bccaa778111  pypy-4.0.1-ppc64le.tar.bz2
-63c0a1614ffc94f94a64790df5ad193193b378f2cf8729213db06fbd64052911  pypy-4.0.1-ppc64.tar.bz2
-29f5aa6ba17b34fd980e85172dfeb4086fdc373ad392b1feff2677d2d8aea23c  pypy-4.0.1-src.tar.bz2
-e344b383e8c745cc7c26bbcb0a43958e768fdd1d29dd0799cc148e0518d8d36f  pypy-4.0.1-src.zip
-9a350a5e6f9b86fb525c6f1300b0c97c021ea8b1e37bfd32a8c4bb7a415d5329  pypy-4.0.1-win32.zip
+b7c82d437086660759ec18582dbdaf198b77e467  pypy-5.0.0-linux-armel.tar.bz2
+85978b1d33b0db8b512eebb1558200c3ab76d462  pypy-5.0.0-linux-armhf-raring.tar.bz2
+271472d0362ce02fd656024b64f0343cc8193f9d  pypy-5.0.0-linux-armhf-raspbian.tar.bz2
+88ac71eebd65c35032325497cc450b4d184be005  pypy-5.0.0-linux.tar.bz2
+22d32d92899a07cb8cbba4b8918a7919e34246c4  pypy-5.0.0-linux64.tar.bz2
+f652b264ba063a8c472b753baaaacf63690be6c5  pypy-5.0.0-osx64.tar.bz2
+5620cead511ad33f9fface224544b70d72d9e4c9  pypy-5.0.0-ppc64.tar.bz2
+6ee6b0eb574f3d29a5eaf29fdae8745fd9fe3c38  pypy-5.0.0-ppc64le.tar.bz2
+62ce000b887ea22f5bdddcc0f24dd571ca534f57  pypy-5.0.0-src.tar.bz2
+6dcbde8242e0ee985ffed63c5bf204e7fd74ac2c  pypy-5.0.0-src.zip
+62cef0e0dd8849c224c647e53b13d3c47c99807d  pypy-5.0.0-win32.zip
+
+pypy-5.0.0 sha256:
++87bd85441b16ecca0d45ba6e9c0e9d26bb7bd8867afbf79d80312cf79b032dc1  pypy-5.0.0-linux-armel.tar.bz2
+5bb52cf5db4ae8497c4e03cd8a70e49867e6b93d9f29ad335d030fcd3a375769  pypy-5.0.0-linux-armhf-raring.tar.bz2
+8033c0cc39e9f6771688f2eda95c726595f5453b3e73e1cd5f7ebbe3dae1f685  pypy-5.0.0-linux-armhf-raspbian.tar.bz2
+a9cc9afa94ff1cde811626a70081c477c9840e7816c0562d1903fd823d222ceb  pypy-5.0.0-linux.tar.bz2
+b9c73be8e3c3b0835df83bdb86335712005240071cdd4dc245ac30b457063ae0  pypy-5.0.0-linux64.tar.bz2
+45ed8bf799d0fd8eb051cbcc427173fba74dc9c2f6c309d7a3cc90f4917e6a10  pypy-5.0.0-osx64.tar.bz2
+334a37e68cb543cf2cbcdd12379b9b770064bb70ba7fd104f1e451cfa10cdda5  pypy-5.0.0-ppc64.tar.bz2
+e72fe5c094186f79c997000ddbaa01616def652a8d1338b75a27dfa3755eb86c  pypy-5.0.0-ppc64le.tar.bz2
+89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab  pypy-5.0.0-src.tar.bz2
+03e19e9bafccf5b2f4dd422699f3fe42da754c3fcc1d1fd4c8d585d7c9d1849d  pypy-5.0.0-src.zip
+c53f0946703f5e4885484c7cde2554a0320537135bf8965e054757c214412438  pypy-5.0.0-win32.zip
 
 pypy3-2.4.0 sha1:
 diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -14,12 +14,12 @@
 
 We provide binaries for x86 and ARM Linux, Mac OS/X and Windows for:
 
-* the Python2.7 compatible release — **PyPy 4.0.1** — (`what's new in PyPy 4.0.1?`_)
+* the Python2.7 compatible release — **PyPy 5.0** — (`what's new in PyPy 5.0?`_)
 * the Python3.2.5 compatible release — **PyPy3 2.4.0** — (`what's new in PyPy3 2.4.0?`_).
 
 * the Python2.7 Software Transactional Memory special release — **PyPy-STM 2.5.1** (Linux x86-64 only)
 
-.. _what's new in PyPy 4.0.1?: http://doc.pypy.org/en/latest/release-4.0.1.html
+.. _what's new in PyPy 5.0?: http://doc.pypy.org/en/latest/release-5.0.0.html
 .. _what's new in PyPy3 2.4.0?: http://doc.pypy.org/en/latest/release-pypy3-2.4.0.html
 
 
@@ -73,7 +73,7 @@
 .. _`portable Linux binaries`: https://github.com/squeaky-pl/portable-pypy#portable-pypy-distribution-for-linux
 
 
-Python2.7 compatible PyPy 4.0.1
+Python2.7 compatible PyPy 5.0
 -----------------------------------
 
 * `Linux x86 binary (32bit, tar.bz2 built on Ubuntu 12.04 - 14.04)`__ (see ``[1]`` below)
@@ -91,17 +91,17 @@
 * `All our downloads,`__ including previous versions.  We also have a
   mirror_, but please use only if you have troubles accessing the links above
 
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-linux.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-linux64.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-linux-armhf-raspbian.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-linux-armhf-raring.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-linux-armel.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-osx64.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-win32.zip
-.. __: http://cobra.cs.uni-duesseldorf.de/~buildmaster/mirror/pypy-4.0.1-ppc64.tar.bz2
-.. __: http://cobra.cs.uni-duesseldorf.de/~buildmaster/mirror/pypy-4.0.1-ppc64le.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-src.tar.bz2
-.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-src.zip
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux64.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux-armhf-raspbian.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux-armhf-raring.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux-armel.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-osx64.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-win32.zip
+.. __: http://cobra.cs.uni-duesseldorf.de/~buildmaster/mirror/pypy-5.0.0-ppc64.tar.bz2
+.. __: http://cobra.cs.uni-duesseldorf.de/~buildmaster/mirror/pypy-5.0.0-ppc64le.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-src.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-src.zip
 .. _`vcredist_x86.exe`: http://www.microsoft.com/en-us/download/details.aspx?id=5582
 .. __: https://bitbucket.org/pypy/pypy/downloads
 .. _mirror: http://cobra.cs.uni-duesseldorf.de/~buildmaster/mirror/
@@ -201,7 +201,7 @@
 uncompressed, they run in-place.  For now you can uncompress them
 either somewhere in your home directory or, say, in ``/opt``, and
 if you want, put a symlink from somewhere like
-``/usr/local/bin/pypy`` to ``/path/to/pypy-4.0.1/bin/pypy``.  Do
+``/usr/local/bin/pypy`` to ``/path/to/pypy-5.0.0/bin/pypy``.  Do
 not move or copy the executable ``pypy`` outside the tree --- put
 a symlink to it, otherwise it will not find its libraries.
 
@@ -231,7 +231,7 @@
 If you have pip::
 
     pypy -m pip install git+https://bitbucket.org/pypy/numpy.git
-    pypy -m pip install git+https://bitbucket.org/pypy/numpy.git at pypy-4.0.1
+    pypy -m pip install git+https://bitbucket.org/pypy/numpy.git at pypy-5.0
 
 (the second version selects a particular tag, which may be needed if your
 pypy is not the latest development version.)
@@ -261,9 +261,9 @@
 1. Get the source code.  The following packages contain the source at
    the same revision as the above binaries:
 
-   * `pypy-4.0.1-src.tar.bz2`__ (sources)
+   * `pypy-5.0.0-src.tar.bz2`__ (sources)
 
-   .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-src.tar.bz2
+   .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-src.tar.bz2
 
    Or you can checkout the current trunk using Mercurial_ (the trunk
    usually works and is of course more up-to-date)::
@@ -403,20 +403,6 @@
 
 Here are the checksums for each of the downloads
 
-pypy-4.0.1 md5::
-
-    f6721e62f4ba1cdc4cc5ad719369e359  pypy-4.0.1-linux64.tar.bz2
-    fe8106ac3919c7b4be2766944326a624  pypy-4.0.1-linux-armel.tar.bz2
-    823b8a457f4c48ebdb8e1ee607b0a893  pypy-4.0.1-linux-armhf-raring.tar.bz2
-    e45728d413aa88963d4462ebcfaff6ea  pypy-4.0.1-linux-armhf-raspbian.tar.bz2
-    d1d03aa44df354a3f589473a51406795  pypy-4.0.1-linux.tar.bz2
-    67ac82d88aaaef8c3074e68d700f3968  pypy-4.0.1-osx64.tar.bz2
-    f5b35ebedee2fa4fdfee82733be59996  pypy-4.0.1-src.tar.bz2
-    6b81d79886b215a877fee7624883ee94  pypy-4.0.1-src.zip
-    dc6573828ee5c82df18f9035f3b19edb  pypy-4.0.1-win32.zip
-    d4492e65201bb09dca5f97601113dc57  pypy-4.0.1-ppc64le.tar.bz2
-    2aadbb7638153b9d7c2a832888ed3c1e  pypy-4.0.1-ppc64.tar.bz2
-
 pypy-5.0.0 md5::
 
     bcb5c830d6380ff78b759dbe075dfc14  pypy-5.0.0-linux-armel.tar.bz2
@@ -450,20 +436,6 @@
    009c970b5fa75754ae4c32a5d108a8d4  pypy-1.8-sandbox-linux.tar.bz2
 
 
-pypy-4.0.1 sha256::
-
-    0d6090cee59f4b9bab91ddbea76580d0c232b78dae65aaa9e8fa8d4449ba25b4  pypy-4.0.1-linux64.tar.bz2
-    d1acdd45ebd34580dd632c63c95211f6bae5e9a8f7a46ffa6f0443286ff9f61b  pypy-4.0.1-linux-armel.tar.bz2
-    e67278ce7423aa7bf99a95fd271cb76763eae3106930f4b7de1fba6a70a3f383  pypy-4.0.1-linux-armhf-raring.tar.bz2
-    52eef495f560af59a787b9935367cb5f8c83b48e32a80ec3e7060bffac011ecc  pypy-4.0.1-linux-armhf-raspbian.tar.bz2
-    721920fcbb6aefc9a98e868e32b7f4ea5fd68b7f9305d08d0a2595327c9c0611  pypy-4.0.1-linux.tar.bz2
-    06be1299691f7ea558bf8e3bdf3d20debb8ba03cd7cadf04f2d6cbd5fd084430  pypy-4.0.1-osx64.tar.bz2
-    43be0b04bcbde1e24d5f39875c0471cdc7bdb44549e5618d32e49bccaa778111  pypy-4.0.1-ppc64le.tar.bz2
-    63c0a1614ffc94f94a64790df5ad193193b378f2cf8729213db06fbd64052911  pypy-4.0.1-ppc64.tar.bz2
-    29f5aa6ba17b34fd980e85172dfeb4086fdc373ad392b1feff2677d2d8aea23c  pypy-4.0.1-src.tar.bz2
-    e344b383e8c745cc7c26bbcb0a43958e768fdd1d29dd0799cc148e0518d8d36f  pypy-4.0.1-src.zip
-    9a350a5e6f9b86fb525c6f1300b0c97c021ea8b1e37bfd32a8c4bb7a415d5329  pypy-4.0.1-win32.zip
-
 pypy-5.0.0 sha1::
     
     b7c82d437086660759ec18582dbdaf198b77e467  pypy-5.0.0-linux-armel.tar.bz2

From pypy.commits at gmail.com  Thu Mar 10 11:45:31 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 08:45:31 -0800 (PST)
Subject: [pypy-commit] pypy.org extradoc: update
Message-ID: <56e1a4ab.4577c20a.bd04d.7990@mx.google.com>

Author: Armin Rigo 
Branch: extradoc
Changeset: r718:23e34f63d9d4
Date: 2016-03-10 17:45 +0100
http://bitbucket.org/pypy/pypy.org/changeset/23e34f63d9d4/

Log:	update

diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -98,8 +98,8 @@
 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux-armel.tar.bz2
 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-osx64.tar.bz2
 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-win32.zip
-.. __: http://cobra.cs.uni-duesseldorf.de/~buildmaster/mirror/pypy-5.0.0-ppc64.tar.bz2
-.. __: http://cobra.cs.uni-duesseldorf.de/~buildmaster/mirror/pypy-5.0.0-ppc64le.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-ppc64.tar.bz2
+.. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-ppc64le.tar.bz2
 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-src.tar.bz2
 .. __: https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-src.zip
 .. _`vcredist_x86.exe`: http://www.microsoft.com/en-us/download/details.aspx?id=5582

From pypy.commits at gmail.com  Thu Mar 10 11:49:22 2016
From: pypy.commits at gmail.com (mattip)
Date: Thu, 10 Mar 2016 08:49:22 -0800 (PST)
Subject: [pypy-commit] pypy.org extradoc: update html
Message-ID: <56e1a592.034cc20a.ad485.774c@mx.google.com>

Author: mattip 
Branch: extradoc
Changeset: r719:736bf9456283
Date: 2016-03-10 18:49 +0200
http://bitbucket.org/pypy/pypy.org/changeset/736bf9456283/

Log:	update html

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -125,8 +125,8 @@
 FreeBSD 9.2 x86 64 bit (hopefully availabe soon) (see [1] below)
 Windows binary (32bit) (you might need the VS 2008 runtime library
 installer vcredist_x86.exe.)
-PowerPC64 Linux binary (64bit big-endian, Fedora 20) (see [1] below)
-PowerPC64le Linux binary (64bit little-endian, Fedora 21) (see [1] below)
+PowerPC64 Linux binary (64bit big-endian, Fedora 20) (see [1] below)
+PowerPC64le Linux binary (64bit little-endian, Fedora 21) (see [1] below)
 Source (tar.bz2); Source (zip).  See below for more about the sources.
 All our downloads, including previous versions.  We also have a
 mirror, but please use only if you have troubles accessing the links above

From pypy.commits at gmail.com  Thu Mar 10 12:01:47 2016
From: pypy.commits at gmail.com (mattip)
Date: Thu, 10 Mar 2016 09:01:47 -0800 (PST)
Subject: [pypy-commit] pypy.org extradoc: mention PPC
Message-ID: <56e1a87b.e853c20a.2952d.7ae6@mx.google.com>

Author: mattip 
Branch: extradoc
Changeset: r720:cb470d7e673f
Date: 2016-03-10 19:01 +0200
http://bitbucket.org/pypy/pypy.org/changeset/cb470d7e673f/

Log:	mention PPC

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -72,7 +72,7 @@
 There are nightly binary builds available. Those builds are not always
 as stable as the release, but they contain numerous bugfixes and
 performance improvements.
-We provide binaries for x86 and ARM Linux, Mac OS/X and Windows for:
+We provide binaries for x86, ARM, and PPC Linux, Mac OS/X and Windows for:
 
 the Python2.7 compatible release — PyPy 5.0 — (what's new in PyPy 5.0?)
 the Python3.2.5 compatible release — PyPy3 2.4.0 — (what's new in PyPy3 2.4.0?).
diff --git a/source/download.txt b/source/download.txt
--- a/source/download.txt
+++ b/source/download.txt
@@ -12,7 +12,7 @@
   as stable as the release, but they contain numerous bugfixes and
   performance improvements. 
 
-We provide binaries for x86 and ARM Linux, Mac OS/X and Windows for:
+We provide binaries for x86, ARM, and PPC Linux, Mac OS/X and Windows for:
 
 * the Python2.7 compatible release — **PyPy 5.0** — (`what's new in PyPy 5.0?`_)
 * the Python3.2.5 compatible release — **PyPy3 2.4.0** — (`what's new in PyPy3 2.4.0?`_).

From pypy.commits at gmail.com  Thu Mar 10 13:13:34 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 10:13:34 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: make the list use constant
 size (a bit hardcoded for now) and shorts
Message-ID: <56e1b94e.8ee61c0a.47531.ffff952a@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82947:073167872e79
Date: 2016-03-10 20:12 +0200
http://bitbucket.org/pypy/pypy/changeset/073167872e79/

Log:	make the list use constant size (a bit hardcoded for now) and shorts

diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -12,6 +12,7 @@
     ResOperation, oparity, rop, opwithdescr, GuardResOp
 from rpython.rlib.rarithmetic import intmask
 from rpython.rlib.objectmodel import we_are_translated
+from rpython.rtyper.lltypesystem import rffi, lltype
 
 TAGINT, TAGCONST, TAGBOX = range(3)
 TAGMASK = 0x3
@@ -19,9 +20,6 @@
 SMALL_INT_STOP  = 2 ** (15 - TAGSHIFT)
 SMALL_INT_START = -SMALL_INT_STOP
 
-class Sentinel(object):
-    pass
-
 class BaseTrace(object):
     pass
 
@@ -41,7 +39,7 @@
         return self.pos >= self.end
 
     def _next(self):
-        res = self.trace._ops[self.pos]
+        res = rffi.cast(lltype.Signed, self.trace._ops[self.pos])
         self.pos += 1
         return res
 
@@ -106,7 +104,7 @@
         return self.pos >= self.end
 
     def _next(self):
-        res = self.trace._ops[self.pos]
+        res = rffi.cast(lltype.Signed, self.trace._ops[self.pos])
         self.pos += 1
         return res
 
@@ -127,7 +125,7 @@
         return pos
 
     def get_snapshot_iter(self, pos):
-        end = self.trace._ops[pos]
+        end = rffi.cast(lltype.Signed, self.trace._ops[pos])
         return SnapshotIterator(self, pos + 1, end)
 
     def next(self):
@@ -163,14 +161,15 @@
         self.count = count
 
     def get_iter(self):
-        iter = TraceIterator(self.trace, self.start, len(self.trace._ops),
+        iter = TraceIterator(self.trace, self.start, self.trace._pos,
                              self.inputargs)
         iter._count = self.count
         return iter
 
 class Trace(BaseTrace):
     def __init__(self, inputargs):
-        self._ops = []
+        self._ops = [rffi.cast(rffi.SHORT, -15)] * 30000
+        self._pos = 0
         self._descrs = [None]
         self._consts = [None]
         for i, inparg in enumerate(inputargs):
@@ -179,14 +178,18 @@
         self._count = 0
         self.inputargs = inputargs
 
+    def append(self, v):
+        self._ops[self._pos] = rffi.cast(rffi.SHORT, v)
+        self._pos += 1
+
     def length(self):
-        return len(self._ops)
+        return self._pos
 
     def cut_point(self):
-        return len(self._ops), self._count
+        return self._pos, self._count
 
     def cut_at(self, end):
-        self._ops = self._ops[:end[0]]
+        self._pos = end[0]
         self._count = end[1]
 
     def cut_trace_from(self, (start, count), inputargs):
@@ -209,20 +212,20 @@
             assert False, "unreachable code"
 
     def _record_op(self, opnum, argboxes, descr=None):
-        operations = self._ops
         pos = self._count
-        operations.append(opnum)
+        self.append(opnum)
         expected_arity = oparity[opnum]
         if expected_arity == -1:
-            operations.append(len(argboxes))
+            self.append(len(argboxes))
         else:
             assert len(argboxes) == expected_arity
-        operations.extend([self._encode(box) for box in argboxes])
+        for box in argboxes:
+            self.append(self._encode(box))
         if opwithdescr[opnum]:
             if descr is None:
-                operations.append(-1)
+                self.append(-1)
             else:
-                operations.append(self._encode_descr(descr))
+                self.append(self._encode_descr(descr))
         self._count += 1
         return pos
 
@@ -253,7 +256,7 @@
 #        self._ops[index] = -newtag - 1
 
     def record_snapshot_link(self, pos):
-        self._ops.append(-pos - 1)
+        self.append(-pos - 1)
 
     def record_op(self, opnum, argboxes, descr=None):
         # return an ResOperation instance, ideally die in hell
@@ -266,41 +269,36 @@
         return tag(TAGBOX, self._record_raw(opnum, tagged_args, descr))
 
     def record_snapshot(self, jitcode, pc, active_boxes):
-        pos = len(self._ops)
-        self._ops.append(len(active_boxes)) # unnecessary, can be read from
-        self._ops.append(jitcode.index)
-        self._ops.append(pc)
+        pos = self._pos
+        self.append(len(active_boxes)) # unnecessary, can be read from
+        self.append(jitcode.index)
+        self.append(pc)
         for box in active_boxes:
-            self._ops.append(self._encode(box)) # not tagged, as it must be boxes
+            self.append(self._encode(box)) # not tagged, as it must be boxes
         return pos
 
     def record_list_of_boxes(self, boxes):
-        self._ops.append(len(boxes))
+        self.append(len(boxes))
         for box in boxes:
-            self._ops.append(self._encode(box))
+            self.append(self._encode(box))
 
     def get_patchable_position(self):
-        p = len(self._ops)
-        if not we_are_translated():
-            self._ops.append(Sentinel())
-        else:
-            self._ops.append(-1)
+        p = self._pos
+        self.append(-1)
         return p
 
     def patch_position_to_current(self, p):
         prev = self._ops[p]
-        if we_are_translated():
-            assert prev == -1
-        else:
-            assert isinstance(prev, Sentinel)
-        self._ops[p] = len(self._ops)
+        assert prev == rffi.cast(rffi.SHORT, -1)
+        self._ops[p] = rffi.cast(rffi.SHORT, self._pos)
 
     def check_snapshot_jitcode_pc(self, jitcode, pc, resumedata_pos):
-        assert self._ops[resumedata_pos + 1] == jitcode.index
-        assert self._ops[resumedata_pos + 2] == pc
+        # XXX expensive?
+        assert self._ops[resumedata_pos + 1] == rffi.cast(rffi.SHORT, jitcode.index)
+        assert self._ops[resumedata_pos + 2] == rffi.cast(rffi.SHORT, pc)
 
     def get_iter(self):
-        return TraceIterator(self, 0, len(self._ops))
+        return TraceIterator(self, 0, self._pos)
 
     def unpack(self):
         iter = self.get_iter()
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -119,8 +119,9 @@
     target = framestack[n]
     back = framestack[n - 1]
     if target.parent_resumedata_position != -1:
-        t.check_snapshot_jitcode_pc(back.jitcode, back.pc,
-            target.parent_resumedata_position)
+        if not we_are_translated():
+            t.check_snapshot_jitcode_pc(back.jitcode, back.pc,
+                target.parent_resumedata_position)
         t.record_snapshot_link(target.parent_resumedata_position)
         return
     pos = t.record_snapshot(back.jitcode, back.pc,

From pypy.commits at gmail.com  Thu Mar 10 13:54:23 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 10:54:23 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: fix the arithmetics
Message-ID: <56e1c2df.030f1c0a.90c18.ffffa6e2@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82948:8b0309662ba1
Date: 2016-03-10 20:53 +0200
http://bitbucket.org/pypy/pypy/changeset/8b0309662ba1/

Log:	fix the arithmetics

diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -289,7 +289,7 @@
 
     def patch_position_to_current(self, p):
         prev = self._ops[p]
-        assert prev == rffi.cast(rffi.SHORT, -1)
+        assert rffi.cast(lltype.Signed, prev) == -1
         self._ops[p] = rffi.cast(rffi.SHORT, self._pos)
 
     def check_snapshot_jitcode_pc(self, jitcode, pc, resumedata_pos):

From pypy.commits at gmail.com  Thu Mar 10 14:02:55 2016
From: pypy.commits at gmail.com (rlamy)
Date: Thu, 10 Mar 2016 11:02:55 -0800 (PST)
Subject: [pypy-commit] pypy py3.3-bootstrap-hack: Initialise the filesystem
 encoding only after imports have been bootstrapped.
Message-ID: <56e1c4df.465ec20a.25769.ffffa5cd@mx.google.com>

Author: Ronan Lamy 
Branch: py3.3-bootstrap-hack
Changeset: r82949:eb02742ce71d
Date: 2016-03-10 19:01 +0000
http://bitbucket.org/pypy/pypy/changeset/eb02742ce71d/

Log:	Initialise the filesystem encoding only after imports have been
	bootstrapped.

	Creating it requires importing the 'encodings' module from the
	stdlib, so the stdlib path needs to have been computed first.

diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpreter/app_main.py
@@ -769,6 +769,7 @@
     # import os, which is used a bit everywhere in app_main, but only imported
     # *after* setup_bootstrap_path
     setup_bootstrap_path(executable)
+    sys.pypy_initfsencoding()
     try:
         cmdline = parse_command_line(argv)
     except CommandLineError as e:
@@ -862,7 +863,7 @@
     sys.pypy_find_stdlib = pypy_find_stdlib
     sys.pypy_resolvedirof = pypy_resolvedirof
     sys.cpython_path = sys.path[:]
-    
+
     try:
         sys.exit(int(entry_point(sys.argv[0], sys.argv[1:])))
     finally:
diff --git a/pypy/module/sys/__init__.py b/pypy/module/sys/__init__.py
--- a/pypy/module/sys/__init__.py
+++ b/pypy/module/sys/__init__.py
@@ -40,6 +40,7 @@
         'pypy_find_stdlib'      : 'initpath.pypy_find_stdlib',
         'pypy_find_executable'  : 'initpath.pypy_find_executable',
         'pypy_resolvedirof'     : 'initpath.pypy_resolvedirof',
+        'pypy_initfsencoding'   : 'initpath.pypy_initfsencoding',
 
         '_getframe'             : 'vm._getframe',
         '_current_frames'       : 'currentframes._current_frames',
@@ -97,12 +98,7 @@
 
     def startup(self, space):
         if space.config.translating:
-            if not we_are_translated():
-                # don't get the filesystemencoding at translation time
-                assert self.filesystemencoding is None
-            else:
-                from pypy.module.sys.interp_encoding import _getfilesystemencoding
-                self.filesystemencoding = _getfilesystemencoding(space)
+            assert self.filesystemencoding is None
 
         if not space.config.translating or we_are_translated():
             from pypy.module.sys import version
diff --git a/pypy/module/sys/initpath.py b/pypy/module/sys/initpath.py
--- a/pypy/module/sys/initpath.py
+++ b/pypy/module/sys/initpath.py
@@ -12,6 +12,7 @@
 
 from pypy.interpreter.gateway import unwrap_spec
 from pypy.module.sys.state import get as get_state
+from pypy.module.sys.interp_encoding import _getfilesystemencoding
 
 PLATFORM = sys.platform
 _MACOSX = sys.platform == 'darwin'
@@ -166,7 +167,9 @@
     space.setitem(space.sys.w_dict, space.wrap('base_exec_prefix'), w_prefix)
     return space.newlist([_w_fsdecode(space, p) for p in path])
 
+def pypy_initfsencoding(space):
+    space.sys.filesystemencoding = _getfilesystemencoding(space)
+
 
 def _w_fsdecode(space, b):
     return space.fsdecode(space.wrapbytes(b))
-

From pypy.commits at gmail.com  Thu Mar 10 14:58:17 2016
From: pypy.commits at gmail.com (fijal)
Date: Thu, 10 Mar 2016 11:58:17 -0800 (PST)
Subject: [pypy-commit] pypy jit-leaner-frontend: fix
Message-ID: <56e1d1d9.6718c20a.b2f2.ffffc570@mx.google.com>

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82950:fe32c26b09b0
Date: 2016-03-10 21:57 +0200
http://bitbucket.org/pypy/pypy/changeset/fe32c26b09b0/

Log:	fix

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -200,7 +200,7 @@
 # ____________________________________________________________
 
 
-def compile_simple_loop(metainterp, greenkey, trace, enable_opts):
+def compile_simple_loop(metainterp, greenkey, trace, runtime_args, enable_opts):
     from rpython.jit.metainterp.optimizeopt import optimize_trace
 
     jitdriver_sd = metainterp.jitdriver_sd
@@ -229,7 +229,7 @@
         loop.check_consistency()
     jitcell_token.target_tokens = [target_token]
     send_loop_to_backend(greenkey, jitdriver_sd, metainterp_sd, loop, "loop",
-                         loop_info.inputargs, metainterp.box_names_memo)
+                         runtime_args, metainterp.box_names_memo)
     record_loop_or_bridge(metainterp_sd, loop)
     return target_token
 
@@ -258,7 +258,7 @@
     if start != (0, 0):
         trace = trace.cut_trace_from(start, inputargs)
     if 'unroll' not in enable_opts or not metainterp.cpu.supports_guard_gc_type:
-        return compile_simple_loop(metainterp, greenkey, trace,
+        return compile_simple_loop(metainterp, greenkey, trace, jumpargs,
                                    enable_opts)
     call_pure_results = metainterp.call_pure_results
     preamble_data = LoopCompileData(trace, jumpargs,

From pypy.commits at gmail.com  Thu Mar 10 16:44:22 2016
From: pypy.commits at gmail.com (arigo)
Date: Thu, 10 Mar 2016 13:44:22 -0800 (PST)
Subject: [pypy-commit] pypy.org extradoc: update the mirror's location,
 fix baroquesoftware to provide it, add
Message-ID: <56e1eab6.4412c30a.6f1b7.ffffe3eb@mx.google.com>

Author: Armin Rigo 
Branch: extradoc
Changeset: r721:f693e341f922
Date: 2016-03-10 22:44 +0100
http://bitbucket.org/pypy/pypy.org/changeset/f693e341f922/

Log:	update the mirror's location, fix baroquesoftware to provide it, add
	pypy-5.0.0 to it

diff --git a/download.html b/download.html
--- a/download.html
+++ b/download.html
@@ -129,7 +129,7 @@
 PowerPC64le Linux binary (64bit little-endian, Fedora 21) (see [1] below)
 Source (tar.bz2); Source (zip).  See below for more about the sources.
 All our downloads, including previous versions.  We also have a
-mirror, but please use only if you have troubles accessing the links above
+mirror, but please use only if you have troubles accessing the links above
 
 
 
@@ -149,7 +149,7 @@
 
Source (tar.bz2)
 Source (zip)
 All our downloads, including previous versions.  We also have a
-mirror, but please use only if you have troubles accessing the links above
+mirror, but please use only if you have troubles accessing the links above
Python2.7 compatible PyPy 4.0.1

Python2.7 compatible PyPy 5.0

Checksums

Checksums

Python2.7 compatible PyPy 5.0

Python2.7 compatible PyPy 5.0.1
