Use the proper macros in all BIFs

As a preparation for changing the calling convention for
BIFs, make sure that all BIFs use the macros. Also, eliminate
all calls from one BIF to another, since that also breaks
the calling convention abstraction.

1 files changed, 58 insertions, 34 deletions

diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 5b3261077b..7570c69473 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -1107,9 +1107,9 @@ BIF_RETTYPE hibernate_3(BIF_ALIST_3)
 
 /**********************************************************************/
 
-BIF_RETTYPE get_stacktrace_0(Process* p)
+BIF_RETTYPE get_stacktrace_0(BIF_ALIST_0)
 {
-    Eterm t = build_stacktrace(p, p->ftrace);
+    Eterm t = build_stacktrace(BIF_P, BIF_P->ftrace);
     BIF_RET(t);
 }
 
@@ -1119,10 +1119,10 @@ BIF_RETTYPE get_stacktrace_0(Process* p)
  * the process, and the final error value will be {Term,StackTrace}.
  */
 
-BIF_RETTYPE error_1(Process* p, Eterm term)
+BIF_RETTYPE error_1(BIF_ALIST_1)
 {
-    p->fvalue = term;
-    BIF_ERROR(p, EXC_ERROR);
+    BIF_P->fvalue = BIF_ARG_1;
+    BIF_ERROR(BIF_P, EXC_ERROR);
 }
 
 /**********************************************************************/
@@ -1131,12 +1131,12 @@ BIF_RETTYPE error_1(Process* p, Eterm term)
  * in the stacktrace.
  */
 
-BIF_RETTYPE error_2(Process* p, Eterm value, Eterm args)
+BIF_RETTYPE error_2(BIF_ALIST_2)
 {
-    Eterm* hp = HAlloc(p, 3);
+    Eterm* hp = HAlloc(BIF_P, 3);
 
-    p->fvalue = TUPLE2(hp, value, args);
-    BIF_ERROR(p, EXC_ERROR_2);
+    BIF_P->fvalue = TUPLE2(hp, BIF_ARG_1, BIF_ARG_2);
+    BIF_ERROR(BIF_P, EXC_ERROR_2);
 }
 
 /**********************************************************************/
@@ -1146,10 +1146,10 @@ BIF_RETTYPE error_2(Process* p, Eterm value, Eterm args)
  * It is useful in stub functions for NIFs.
  */
 
-BIF_RETTYPE nif_error_1(Process* p, Eterm term)
+BIF_RETTYPE nif_error_1(BIF_ALIST_1)
 {
-    p->fvalue = term;
-    BIF_ERROR(p, EXC_ERROR);
+    BIF_P->fvalue = BIF_ARG_1;
+    BIF_ERROR(BIF_P, EXC_ERROR);
 }
 
 /**********************************************************************/
@@ -1159,12 +1159,12 @@ BIF_RETTYPE nif_error_1(Process* p, Eterm term)
  * It is useful in stub functions for NIFs.
  */
 
-BIF_RETTYPE nif_error_2(Process* p, Eterm value, Eterm args)
+BIF_RETTYPE nif_error_2(BIF_ALIST_2)
 {
-    Eterm* hp = HAlloc(p, 3);
+    Eterm* hp = HAlloc(BIF_P, 3);
 
-    p->fvalue = TUPLE2(hp, value, args);
-    BIF_ERROR(p, EXC_ERROR_2);
+    BIF_P->fvalue = TUPLE2(hp, BIF_ARG_1, BIF_ARG_2);
+    BIF_ERROR(BIF_P, EXC_ERROR_2);
 }
 
 /**********************************************************************/
@@ -1183,8 +1183,12 @@ BIF_RETTYPE exit_1(BIF_ALIST_1)
  * If there is an error in the argument format, 
  * return the atom 'badarg' instead.
  */
-Eterm 
-raise_3(Process *c_p, Eterm class, Eterm value, Eterm stacktrace) {
+BIF_RETTYPE raise_3(BIF_ALIST_3)
+{
+    Process *c_p = BIF_P;
+    Eterm class = BIF_ARG_1;
+    Eterm value = BIF_ARG_2;
+    Eterm stacktrace = BIF_ARG_3;
     Eterm reason;
     Eterm l, *hp, *hp_end, *tp;
     int depth, cnt;
@@ -1730,10 +1734,10 @@ BIF_RETTYPE whereis_1(BIF_ALIST_1)
  * erlang:'!'/2
  */
 
-Eterm
-ebif_bang_2(Process* p, Eterm To, Eterm Message)
+BIF_RETTYPE
+ebif_bang_2(BIF_ALIST_2)
 {
-    return send_2(p, To, Message);
+    return erl_send(BIF_P, BIF_ARG_1, BIF_ARG_2);
 }
 
 
@@ -2070,8 +2074,13 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 }
 
 
-Eterm
-send_3(Process *p, Eterm to, Eterm msg, Eterm opts) {
+BIF_RETTYPE send_3(BIF_ALIST_3)
+{
+    Process *p = BIF_P;
+    Eterm to = BIF_ARG_1;
+    Eterm msg = BIF_ARG_2;
+    Eterm opts = BIF_ARG_3;
+
     int connect = !0;
     int suspend = !0;
     Eterm l = opts;
@@ -2135,8 +2144,13 @@ send_3(Process *p, Eterm to, Eterm msg, Eterm opts) {
     BIF_ERROR(p, BADARG);
 }
 
-Eterm
-send_2(Process *p, Eterm to, Eterm msg) {
+BIF_RETTYPE send_2(BIF_ALIST_2)
+{
+    return erl_send(BIF_P, BIF_ARG_1, BIF_ARG_2);
+}
+
+Eterm erl_send(Process *p, Eterm to, Eterm msg)
+{
     Sint result = do_send(p, to, msg, !0);
     
     if (result > 0) {
@@ -3312,8 +3326,11 @@ time_to_parts(Eterm date, Sint* year, Sint* month, Sint* day,
 /* return the universal time */
 
 BIF_RETTYPE 
-localtime_to_universaltime_2(Process *p, Eterm localtime, Eterm dst)
+localtime_to_universaltime_2(BIF_ALIST_2)
 {
+    Process *p = BIF_P;
+    Eterm localtime = BIF_ARG_1;
+    Eterm dst = BIF_ARG_2;
     Sint year, month, day;
     Sint hour, minute, second;
     int isdst;
@@ -3562,9 +3579,10 @@ BIF_RETTYPE erts_debug_display_1(BIF_ALIST_1)
 }
 
 
-Eterm
-display_string_1(Process* p, Eterm string)
+BIF_RETTYPE display_string_1(BIF_ALIST_1)
 {
+    Process* p = BIF_P;
+    Eterm string = BIF_ARG_1;
     int len = is_string(string);
     char *str;
 
@@ -3580,8 +3598,7 @@ display_string_1(Process* p, Eterm string)
     BIF_RET(am_true);
 }
 
-Eterm
-display_nl_0(Process* p)
+BIF_RETTYPE display_nl_0(BIF_ALIST_0)
 {
     erts_fprintf(stderr, "\n");
     BIF_RET(am_true);
@@ -3645,8 +3662,13 @@ BIF_RETTYPE function_exported_3(BIF_ALIST_3)
 
 /**********************************************************************/    
 
-BIF_RETTYPE is_builtin_3(Process* p, Eterm Mod, Eterm Name, Eterm Arity)
+BIF_RETTYPE is_builtin_3(BIF_ALIST_3)
 {
+    Process* p = BIF_P;
+    Eterm Mod = BIF_ARG_1;
+    Eterm Name = BIF_ARG_2;
+    Eterm Arity = BIF_ARG_3;
+
     if (is_not_atom(Mod) || is_not_atom(Name) || is_not_small(Arity)) {
 	BIF_ERROR(p, BADARG);
     }
@@ -3711,9 +3733,11 @@ BIF_RETTYPE make_fun_3(BIF_ALIST_3)
     BIF_RET(make_export(hp));
 }
 
-Eterm
-fun_to_list_1(Process* p, Eterm fun)
+BIF_RETTYPE fun_to_list_1(BIF_ALIST_1)
 {
+    Process* p = BIF_P;
+    Eterm fun = BIF_ARG_1;
+
     if (is_not_any_fun(fun))
 	BIF_ERROR(p, BADARG);
     BIF_RET(term2list_dsprintf(p, fun));
@@ -4051,7 +4075,7 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 	erts_backtrace_depth = n;
 	BIF_RET(make_small(oval));
     } else if (BIF_ARG_1 == am_trace_control_word) {
-	BIF_RET(db_set_trace_control_word_1(BIF_P, BIF_ARG_2));
+	BIF_RET(db_set_trace_control_word(BIF_P, BIF_ARG_2));
     } else if (BIF_ARG_1 == am_sequential_tracer) {
         Eterm old_value = erts_set_system_seq_tracer(BIF_P,
 						     ERTS_PROC_LOCK_MAIN,