1 files changed, 23 insertions, 22 deletions

diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c
index e3e8367b62..4d75883fc5 100644
--- a/erts/emulator/hipe/hipe_mode_switch.c
+++ b/erts/emulator/hipe/hipe_mode_switch.c
@@ -35,6 +35,17 @@
 #include "hipe_stack.h"
 #include "hipe_bif0.h"	/* hipe_mfa_info_table_init() */
 
+#if defined(ERTS_ENABLE_LOCK_CHECK) && defined(ERTS_SMP)
+#    define ERTS_SMP_REQ_PROC_MAIN_LOCK(P) \
+        if ((P)) erts_proc_lc_require_lock((P), ERTS_PROC_LOCK_MAIN)
+#    define ERTS_SMP_UNREQ_PROC_MAIN_LOCK(P) \
+        if ((P)) erts_proc_lc_unrequire_lock((P), ERTS_PROC_LOCK_MAIN)
+#else
+#    define ERTS_SMP_REQ_PROC_MAIN_LOCK(P)
+#    define ERTS_SMP_UNREQ_PROC_MAIN_LOCK(P)
+#endif
+
+
 /*
  * Internal debug support.
  * #define HIPE_DEBUG to the desired debug level:
@@ -318,8 +329,8 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[])
 	   * Native code called a BIF, which "failed" with a TRAP to BEAM.
 	   * Prior to returning, the BIF stored (see BIF_TRAP<N>):
 
-	   * the callee's address in p->def_arg_reg[3]
-	   * the callee's parameters in p->def_arg_reg[0..2]
+	   * the callee's address in p->i
+	   * the callee's parameters in reg[0..2]
 	   * the callee's arity in p->arity (for BEAM gc purposes)
 	   *
 	   * We need to remove the BIF's parameters from the native
@@ -331,19 +342,8 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[])
 	   */
 	  unsigned int i, is_recursive = 0;
 
-	  /* Save p->arity, then update it with the original BIF's arity.
-	     Get rid of any stacked parameters in that call. */
-	  /* XXX: hipe_call_from_native_is_recursive() copies data to
-	     reg[], which is useless in the TRAP case. Maybe write a
-	     specialised hipe_trap_from_native_is_recursive() later. */
           if (p->hipe.nsp != NULL) {
-	      unsigned int callee_arity;
-	      callee_arity = p->arity;
-	      p->arity = p->hipe.narity; /* caller's arity */
-	      is_recursive = hipe_call_from_native_is_recursive(p, reg);
-
-	      p->i = (Eterm *)(p->def_arg_reg[3]);
-	      p->arity = callee_arity;
+	      is_recursive = hipe_trap_from_native_is_recursive(p);
           }
 
 	  /* Schedule next process if current process was hibernated or is waiting
@@ -353,15 +353,14 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[])
 	      goto do_schedule;
 	  }
 	  if (p->status == P_WAITING) {
+	      for (i = 0; i < p->arity; ++i)
+		  p->arg_reg[i] = reg[i]; 	      
 	      goto do_schedule;
 	  }
 
-	  for (i = 0; i < p->arity; ++i)
-	      reg[i] = p->def_arg_reg[i];
-
 	  if (is_recursive)
 	      hipe_push_beam_trap_frame(p, reg, p->arity);
-
+	  
 	  result = HIPE_MODE_SWITCH_RES_CALL;
 	  break;
       }
@@ -470,10 +469,12 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[])
 #if !(NR_ARG_REGS > 5)
 	      int reds_in = p->def_arg_reg[5];
 #endif
+	      ERTS_SMP_UNREQ_PROC_MAIN_LOCK(p);
 	      p = schedule(p, reds_in - p->fcalls);
+	      ERTS_SMP_REQ_PROC_MAIN_LOCK(p);
 #ifdef ERTS_SMP
 	      p->hipe_smp.have_receive_locks = 0;
-	      reg = p->scheduler_data->save_reg;
+	      reg = p->scheduler_data->x_reg_array;
 #endif
 	  }
 	  {
@@ -648,7 +649,7 @@ Eterm hipe_build_stacktrace(Process *p, struct StackTrace *s)
     if (depth < 1)
 	return NIL;
 
-    heap_size = 6 * depth;	/* each [{M,F,A}|_] is 2+4 == 6 words */
+    heap_size = 7 * depth;	/* each [{M,F,A,[]}|_] is 2+5 == 7 words */
     hp = HAlloc(p, heap_size);
     hp_end = hp + heap_size;
 
@@ -659,8 +660,8 @@ Eterm hipe_build_stacktrace(Process *p, struct StackTrace *s)
 	ra = (const void*)s->trace[i];
 	if (!hipe_find_mfa_from_ra(ra, &m, &f, &a))
 	    continue;
-	mfa = TUPLE3(hp, m, f, make_small(a));
-	hp += 4;
+	mfa = TUPLE4(hp, m, f, make_small(a), NIL);
+	hp += 5;
 	next = CONS(hp, mfa, NIL);
 	*next_p = next;
 	next_p = &CDR(list_val(next));