erts: Refactor out func_info into struct

This commit adds two new structs to be used to represent
erlang code in erts.

ErtsCodeInfo is used to describe the i_func_info header
that is part of all Export entries and the prelude of
each function. This replaces all the BeamInstr * that
were previously used to point to these locations.
After this change the code should never use BeamInstr *
with offsets to figure out different parts of the
func_info header.

ErtsCodeMFA is a struct that is used to descripe a
MFA in code. It is used within ErtsCodeInfo and also
in Process->current.

All function that previously took Eterm * or BeamInstr *
to identify a MFA now use the ErtsCodeMFA or ErtsCodeInfo
where appropriate.

The code has been tested to work when adding a new field to the
ErtsCodeInfo struct, but some updates are needed in ops.tab to
make it work.

3 files changed, 16 insertions, 14 deletions

diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index 3336fded7a..9faa6e1649 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -1453,11 +1453,11 @@ BIF_RETTYPE hipe_nonclosure_address(BIF_ALIST_2)
     hdr = *boxed_val(BIF_ARG_1);
     if (is_export_header(hdr)) {
 	Export *ep = (Export*)(export_val(BIF_ARG_1)[1]);
-	unsigned int actual_arity = ep->code[2];
+	unsigned int actual_arity = ep->info.mfa.arity;
 	if (actual_arity != BIF_ARG_2)
 	    goto badfun;
-	m = ep->code[0];
-	f = ep->code[1];
+	m = ep->info.mfa.module;
+	f = ep->info.mfa.function;
     } else
 	goto badfun;
     address = hipe_get_na_nofail(m, f, BIF_ARG_2, 1);
diff --git a/erts/emulator/hipe/hipe_bif1.c b/erts/emulator/hipe/hipe_bif1.c
index 5e127755c6..0c66eb6abe 100644
--- a/erts/emulator/hipe/hipe_bif1.c
+++ b/erts/emulator/hipe/hipe_bif1.c
@@ -45,7 +45,7 @@ BIF_RETTYPE hipe_bifs_call_count_on_1(BIF_ALIST_1)
     pc = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
     if (!pc)
 	BIF_ERROR(BIF_P, BADARG);
-    ASSERT(pc[-5] == BeamOpCode(op_i_func_info_IaaI));
+    ASSERT(pc[-6] == BeamOpCode(op_i_func_info_IaaI));
     if (pc[0] == BeamOpCode(op_hipe_trap_call))
 	BIF_ERROR(BIF_P, BADARG);
     if (pc[0] == BeamOpCode(op_hipe_call_count))
@@ -67,7 +67,7 @@ BIF_RETTYPE hipe_bifs_call_count_off_1(BIF_ALIST_1)
     pc = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
     if (!pc)
 	BIF_ERROR(BIF_P, BADARG);
-    ASSERT(pc[-5] == BeamOpCode(op_i_func_info_IaaI));
+    ASSERT(pc[-6] == BeamOpCode(op_i_func_info_IaaI));
     if (pc[0] != BeamOpCode(op_hipe_call_count))
 	BIF_RET(am_false);
     hcc = (struct hipe_call_count*)pc[-4];
@@ -86,7 +86,7 @@ BIF_RETTYPE hipe_bifs_call_count_get_1(BIF_ALIST_1)
     pc = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
     if (!pc)
 	BIF_ERROR(BIF_P, BADARG);
-    ASSERT(pc[-5] == BeamOpCode(op_i_func_info_IaaI));
+    ASSERT(pc[-6] == BeamOpCode(op_i_func_info_IaaI));
     if (pc[0] != BeamOpCode(op_hipe_call_count))
 	BIF_RET(am_false);
     hcc = (struct hipe_call_count*)pc[-4];
@@ -102,7 +102,7 @@ BIF_RETTYPE hipe_bifs_call_count_clear_1(BIF_ALIST_1)
     pc = hipe_bifs_find_pc_from_mfa(BIF_ARG_1);
     if (!pc)
 	BIF_ERROR(BIF_P, BADARG);
-    ASSERT(pc[-5] == BeamOpCode(op_i_func_info_IaaI));
+    ASSERT(pc[-6] == BeamOpCode(op_i_func_info_IaaI));
     if (pc[0] != BeamOpCode(op_hipe_call_count))
 	BIF_RET(am_false);
     hcc = (struct hipe_call_count*)pc[-4];
diff --git a/erts/emulator/hipe/hipe_debug.c b/erts/emulator/hipe/hipe_debug.c
index ace489452f..d4dcf2a653 100644
--- a/erts/emulator/hipe/hipe_debug.c
+++ b/erts/emulator/hipe/hipe_debug.c
@@ -62,10 +62,12 @@ static void print_beam_pc(BeamInstr *pc)
     } else if (pc == &beam_apply[1]) {
 	printf("normal-process-exit");
     } else {
-	BeamInstr *mfa = find_function_from_pc(pc);
-	if (mfa)
+	ErtsCodeInfo *ci = find_function_from_pc(pc);
+	if (ci)
 	    erts_printf("%T:%T/%bpu + 0x%bpx",
-			mfa[0], mfa[1], mfa[2], pc - &mfa[3]);
+			ci->mfa.module, ci->mfa.function,
+                        ci->mfa.arity,
+                        pc - erts_codeinfo_to_code(ci));
 	else
 	    printf("?");
     }
@@ -214,10 +216,10 @@ void hipe_print_pcb(Process *p)
     U("seq..clock ", seq_trace_clock);
     U("seq..astcnt", seq_trace_lastcnt);
     U("seq..token ", seq_trace_token);
-    U("intial[0]  ", u.initial[0]);
-    U("intial[1]  ", u.initial[1]);
-    U("intial[2]  ", u.initial[2]);
-    P("current    ", current);
+    U("intial.mod ", u.initial.module);
+    U("intial.fun ", u.initial.function);
+    U("intial.ari ", u.initial.arity);
+    U("current    ", current);
     P("cp         ", cp);
     P("i          ", i);
     U("catches    ", catches);