Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r46210:41e6e33beccd
Date: 2011-08-02 16:16 +0200
http://bitbucket.org/pypy/pypy/changeset/41e6e33beccd/
Log: Pass the test, first version (x86-32 only).
diff --git a/pypy/jit/backend/test/runner_test.py
b/pypy/jit/backend/test/runner_test.py
--- a/pypy/jit/backend/test/runner_test.py
+++ b/pypy/jit/backend/test/runner_test.py
@@ -2811,6 +2811,8 @@
excdescr = BasicFailDescr(666)
self.cpu.propagate_exception_v = self.cpu.get_fail_descr_number(
excdescr)
+ self.cpu.setup_once() # xxx redo it, because we added
+ # propagate_exception_v
i0 = BoxInt()
p0 = BoxPtr()
operations = [
@@ -2828,7 +2830,6 @@
self.cpu.set_future_value_int(0, big)
fail = self.cpu.execute_token(looptoken)
assert fail.identifier == excdescr.identifier
- assert self.cpu.grab_exc_value() == 42 # XXX
class OOtypeBackendTest(BaseBackendTest):
diff --git a/pypy/jit/backend/x86/assembler.py
b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -91,6 +91,7 @@
self._current_depths_cache = (0, 0)
self.datablockwrapper = None
self.stack_check_slowpath = 0
+ self.propagate_exception_path = 0
self.teardown()
def leave_jitted_hook(self):
@@ -129,6 +130,7 @@
self._build_float_constants()
if gc_ll_descr.get_malloc_slowpath_addr is not None:
self._build_malloc_slowpath()
+ self._build_propagate_exception_path()
self._build_stack_check_slowpath()
if gc_ll_descr.gcrootmap:
self._build_release_gil(gc_ll_descr.gcrootmap)
@@ -243,6 +245,20 @@
rawstart = mc.materialize(self.cpu.asmmemmgr, [])
self.malloc_slowpath2 = rawstart
+ def _build_propagate_exception_path(self):
+ if self.cpu.propagate_exception_v < 0:
+ return # not supported (for tests, or non-translated)
+ #
+ self.mc = codebuf.MachineCodeBlockWrapper()
+ # call on_leave_jitted_save_exc()
+ addr = self.cpu.get_on_leave_jitted_int(save_exception=True)
+ self.mc.CALL(imm(addr))
+ self.mc.MOV_ri(eax.value, self.cpu.propagate_exception_v)
+ self._call_footer()
+ rawstart = self.mc.materialize(self.cpu.asmmemmgr, [])
+ self.propagate_exception_path = rawstart
+ self.mc = None
+
def _build_stack_check_slowpath(self):
_, _, slowpathaddr = self.cpu.insert_stack_check()
if slowpathaddr == 0 or self.cpu.propagate_exception_v < 0:
@@ -1433,6 +1449,7 @@
def genop_new(self, op, arglocs, result_loc):
assert result_loc is eax
self.call(self.malloc_func_addr, arglocs, eax)
+ self.propagate_memoryerror_if_eax_is_null()
def genop_new_array(self, op, arglocs, result_loc):
assert result_loc is eax
@@ -1446,6 +1463,14 @@
assert result_loc is eax
self.call(self.malloc_unicode_func_addr, arglocs, eax)
+ def propagate_memoryerror_if_eax_is_null(self):
+ # if self.propagate_exception_path == 0 (tests), this may jump to 0
+ # and segfaults. too bad. the alternative is to continue anyway
+ # with eax==0, but that will segfault too.
+ self.mc.TEST_rr(eax.value, eax.value)
+ self.mc.J_il(rx86.Conditions['Z'], self.propagate_exception_path)
+ self.mc.add_pending_relocation()
+
# ----------
def load_from_mem(self, resloc, source_addr, size_loc, sign_loc):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
