From 5d4759518008a3bdd9c7e9d2adde94a4bd01169e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Thu, 12 Jan 2012 15:21:18 +0100 Subject: Use magic binaries in erts_prepare_loading() and erts_finish_loading() --- erts/emulator/beam/beam_bif_load.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'erts/emulator/beam/beam_bif_load.c') diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c index 995b16c376..42642e103d 100644 --- a/erts/emulator/beam/beam_bif_load.c +++ b/erts/emulator/beam/beam_bif_load.c @@ -53,7 +53,7 @@ load_module_2(BIF_ALIST_2) byte* code; Eterm res; byte* temp_alloc = NULL; - struct LoaderState* stp; + Binary* magic; int is_blocking = 0; if (is_not_atom(BIF_ARG_1)) { @@ -69,9 +69,9 @@ load_module_2(BIF_ALIST_2) /* * Read the BEAM file and prepare the module for loading. */ - stp = erts_alloc_loader_state(); + magic = erts_alloc_loader_state(); sz = binary_size(BIF_ARG_2); - reason = erts_prepare_loading(stp, BIF_P, BIF_P->group_leader, + reason = erts_prepare_loading(magic, BIF_P, BIF_P->group_leader, &BIF_ARG_1, code, sz); erts_free_aligned_binary_bytes(temp_alloc); if (reason != NIL) { @@ -101,7 +101,7 @@ load_module_2(BIF_ALIST_2) erts_clear_module_break(modp); ASSERT(modp->curr.num_breakpoints == 0); } - reason = erts_finish_loading(stp, BIF_P, 0, &BIF_ARG_1); + reason = erts_finish_loading(magic, BIF_P, 0, &BIF_ARG_1); break; } -- cgit v1.2.3