From 17241c30f56ba6bc31518f1c905f6178784fb4fa Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Fri, 14 Oct 2011 19:23:26 +0200 Subject: erts-hipe: Fix new trap conventions for x86, amd64 and ppc --- erts/emulator/hipe/hipe_x86_glue.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'erts/emulator/hipe/hipe_x86_glue.h') diff --git a/erts/emulator/hipe/hipe_x86_glue.h b/erts/emulator/hipe/hipe_x86_glue.h index a7b0f164be..b0db93267c 100644 --- a/erts/emulator/hipe/hipe_x86_glue.h +++ b/erts/emulator/hipe/hipe_x86_glue.h @@ -186,6 +186,25 @@ hipe_call_from_native_is_recursive(Process *p, Eterm reg[]) return 0; } +/* BEAM called native, which called BIF that returned trap + * Discard bif parameters. + * If tailcall, also clean up native stub continuation. */ +static __inline__ int +hipe_trap_from_native_is_recursive(Process *p) +{ + Eterm nra = *(p->hipe.nsp++); + + if (p->hipe.narity > NR_ARG_REGS) { + p->hipe.nsp += (p->hipe.narity - NR_ARG_REGS); + } + if (nra != (Eterm)nbif_return) { + *--(p->hipe.nsp) = nra; + return 1; + } + return 0; +} + + /* Native makes a call which needs to unload the parameters. This differs from hipe_call_from_native_is_recursive() in that it doesn't check for or pop the BEAM-calls-native frame. -- cgit v1.2.3