Author: Armin Rigo <[email protected]>
Branch:
Changeset: r66858:e86991796de2
Date: 2013-09-09 11:17 +0200
http://bitbucket.org/pypy/pypy/changeset/e86991796de2/
Log: This argument is always -1. Kill the (broken) support for different
values.
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -621,7 +621,7 @@
for ofs in self.frame_depth_to_patch:
self._patch_frame_depth(ofs + rawstart, framedepth)
- def _check_frame_depth(self, mc, gcmap, expected_size=-1):
+ def _check_frame_depth(self, mc, gcmap):
""" check if the frame is of enough depth to follow this bridge.
Otherwise reallocate the frame in a helper.
There are other potential solutions
@@ -629,17 +629,11 @@
"""
descrs = self.cpu.gc_ll_descr.getframedescrs(self.cpu)
ofs = self.cpu.unpack_fielddescr(descrs.arraydescr.lendescr)
- if expected_size == -1:
- mc.CMP_bi(ofs, 0xffffff)
- else:
- mc.CMP_bi(ofs, expected_size)
+ mc.CMP_bi(ofs, 0xffffff) # force writing 32 bit
stack_check_cmp_ofs = mc.get_relative_pos() - 4
mc.J_il8(rx86.Conditions['GE'], 0)
jg_location = mc.get_relative_pos()
- if expected_size == -1:
- mc.MOV_si(WORD, 0xffffff)
- else:
- mc.MOV_si(WORD, expected_size)
+ mc.MOV_si(WORD, 0xffffff) # force writing 32 bit
ofs2 = mc.get_relative_pos() - 4
self.push_gcmap(mc, gcmap, mov=True)
mc.CALL(imm(self._frame_realloc_slowpath))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
