Store the trap arguments in the X register array

Store arguments for a trap in the X register array to allow
traps to have any number of arguments.

3 files changed, 49 insertions, 48 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index ecf52fd2ed..44c9d4ee05 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -1523,8 +1523,7 @@ void process_main(void)
 	 SET_CP(c_p, I+1);
 	 SET_I(*((BeamInstr **) (BeamInstr) ((c_p)->def_arg_reg + 3)));
 	 SWAPIN;
-	 r(0) = c_p->def_arg_reg[0];
-	 x(1) = c_p->def_arg_reg[1];
+	 r(0) = reg[0];
 	 Dispatch();
      }
      goto find_func_info;
@@ -2437,9 +2436,7 @@ void process_main(void)
 	    SET_CP(c_p, I+2);
 	    SET_I(*((BeamInstr **) (UWord) ((c_p)->def_arg_reg + 3)));
 	    SWAPIN;
-	    r(0) = c_p->def_arg_reg[0];
-	    x(1) = c_p->def_arg_reg[1];
-	    x(2) = c_p->def_arg_reg[2];
+	    r(0) = reg[0];
 	    Dispatch();
 	}
 
@@ -3227,9 +3224,7 @@ void process_main(void)
 		Goto(*I);
 	    } else if (c_p->freason == TRAP) {
 		SET_I(*((BeamInstr **) (UWord) ((c_p)->def_arg_reg + 3)));
-		r(0) = c_p->def_arg_reg[0];
-		x(1) = c_p->def_arg_reg[1];
-		x(2) = c_p->def_arg_reg[2];
+		r(0) = reg[0];
 		if (c_p->flags & F_HIBERNATE_SCHED) {
 		    c_p->flags &= ~F_HIBERNATE_SCHED;
 		    goto do_schedule;
diff --git a/erts/emulator/beam/bif.h b/erts/emulator/beam/bif.h
index cb5d266660..a166298455 100644
--- a/erts/emulator/beam/bif.h
+++ b/erts/emulator/beam/bif.h
@@ -130,34 +130,37 @@ do {							\
     (Ret) = THE_NON_VALUE;				\
 } while (0)
 
-#define ERTS_BIF_PREP_TRAP1(Ret, Trap, Proc, A0)	\
-do {							\
-    (Proc)->arity = 1;					\
-    (Proc)->def_arg_reg[0] = (Eterm) (A0);		\
+#define ERTS_BIF_PREP_TRAP1(Ret, Trap, Proc, A0)			\
+do {									\
+    Eterm* reg = ERTS_PROC_GET_SCHDATA((Proc))->x_reg_array;		\
+    (Proc)->arity = 1;							\
+    reg[0] = (Eterm) (A0);						\
     *((UWord *) (UWord) ((Proc)->def_arg_reg + 3)) = (UWord) ((Trap)->address);	\
-    (Proc)->freason = TRAP;				\
-    (Ret) = THE_NON_VALUE;				\
+    (Proc)->freason = TRAP;						\
+    (Ret) = THE_NON_VALUE;						\
 } while (0)
 
-#define ERTS_BIF_PREP_TRAP2(Ret, Trap, Proc, A0, A1)	\
-do {							\
-    (Proc)->arity = 2;					\
-    (Proc)->def_arg_reg[0] = (Eterm) (A0);		\
-    (Proc)->def_arg_reg[1] = (Eterm) (A1);		\
+#define ERTS_BIF_PREP_TRAP2(Ret, Trap, Proc, A0, A1)			\
+do {									\
+    Eterm* reg = ERTS_PROC_GET_SCHDATA((Proc))->x_reg_array;		\
+    (Proc)->arity = 2;							\
+    reg[0] = (Eterm) (A0);						\
+    reg[1] = (Eterm) (A1);						\
     *((UWord *) (UWord) ((Proc)->def_arg_reg + 3)) = (UWord) ((Trap)->address);	\
-    (Proc)->freason = TRAP;				\
-    (Ret) = THE_NON_VALUE;				\
+    (Proc)->freason = TRAP;						\
+    (Ret) = THE_NON_VALUE;						\
 } while (0)
 
-#define ERTS_BIF_PREP_TRAP3(Ret, Trap, Proc, A0, A1, A2)\
-do {							\
-    (Proc)->arity = 3;					\
-    (Proc)->def_arg_reg[0] = (Eterm) (A0);		\
-    (Proc)->def_arg_reg[1] = (Eterm) (A1);		\
-    (Proc)->def_arg_reg[2] = (Eterm) (A2);		\
+#define ERTS_BIF_PREP_TRAP3(Ret, Trap, Proc, A0, A1, A2)		\
+do {									\
+    Eterm* reg = ERTS_PROC_GET_SCHDATA((Proc))->x_reg_array;		\
+    (Proc)->arity = 3;							\
+    reg[0] = (Eterm) (A0);						\
+    reg[1] = (Eterm) (A1);						\
+    reg[2] = (Eterm) (A2);						\
     *((UWord *) (UWord) ((Proc)->def_arg_reg + 3)) = (UWord) ((Trap)->address);	\
-    (Proc)->freason = TRAP;				\
-    (Ret) = THE_NON_VALUE;				\
+    (Proc)->freason = TRAP;						\
+    (Ret) = THE_NON_VALUE;						\
 } while (0)
 
 #define BIF_TRAP0(p, Trap_) do {			\
@@ -167,31 +170,34 @@ do {							\
       return THE_NON_VALUE;				\
  } while(0)
 
-#define BIF_TRAP1(Trap_, p, A0) do {			\
-      (p)->arity = 1;					\
-      (p)->def_arg_reg[0] = (A0);			\
+#define BIF_TRAP1(Trap_, p, A0) do {					\
+      Eterm* reg = ERTS_PROC_GET_SCHDATA((p))->x_reg_array;		\
+      (p)->arity = 1;							\
+      reg[0] = (A0);							\
       *((UWord *) (UWord) ((p)->def_arg_reg + 3)) = (UWord) ((Trap_)->address);	\
-      (p)->freason = TRAP;				\
-      return THE_NON_VALUE;				\
+      (p)->freason = TRAP;						\
+      return THE_NON_VALUE;						\
  } while(0)
 
-#define BIF_TRAP2(Trap_, p, A0, A1) do {		\
-      (p)->arity = 2;					\
-      (p)->def_arg_reg[0] = (A0);			\
-      (p)->def_arg_reg[1] = (A1);			\
+#define BIF_TRAP2(Trap_, p, A0, A1) do {				\
+      Eterm* reg = ERTS_PROC_GET_SCHDATA((p))->x_reg_array;		\
+      (p)->arity = 2;							\
+      reg[0] = (A0);							\
+      reg[1] = (A1);							\
       *((UWord *) (UWord) ((p)->def_arg_reg + 3)) = (UWord) ((Trap_)->address);	\
-      (p)->freason = TRAP;				\
-      return THE_NON_VALUE;				\
+      (p)->freason = TRAP;						\
+      return THE_NON_VALUE;						\
  } while(0)
 
-#define BIF_TRAP3(Trap_, p, A0, A1, A2) do {		\
-      (p)->arity = 3;					\
-      (p)->def_arg_reg[0] = (A0);			\
-      (p)->def_arg_reg[1] = (A1);			\
-      (p)->def_arg_reg[2] = (A2);			\
+#define BIF_TRAP3(Trap_, p, A0, A1, A2) do {				\
+      Eterm* reg = ERTS_PROC_GET_SCHDATA((p))->x_reg_array;		\
+      (p)->arity = 3;							\
+      reg[0] = (A0);							\
+      reg[1] = (A1);							\
+      reg[2] = (A2);							\
       *((UWord *) (UWord) ((p)->def_arg_reg + 3)) = (UWord) ((Trap_)->address);	\
-      (p)->freason = TRAP;				\
-      return THE_NON_VALUE;				\
+      (p)->freason = TRAP;						\
+      return THE_NON_VALUE;						\
  } while(0)
 
 #define BIF_TRAP_CODE_PTR_0(p, Code_) do {		\
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index e3445bcdc5..17cc6e0a2c 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -315,7 +315,7 @@ erts_gc_after_bif_call(Process* p, Eterm result, Eterm* regs, Uint arity)
 
     if (is_non_value(result)) {
 	if (p->freason == TRAP) {
-	    cost = erts_garbage_collect(p, 0, p->def_arg_reg, p->arity);
+	    cost = erts_garbage_collect(p, 0, regs, p->arity);
 	} else {
 	    cost = erts_garbage_collect(p, 0, regs, arity);
 	}