From 41cf0cb977472a15527b6ac693883daaa84faa5a Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 17 Jan 2012 11:18:26 +0100
Subject: erts: First stab at code_ix interface and beam_catches using it

Code loading still blocking
---
 erts/emulator/beam/erl_init.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'erts/emulator/beam/erl_init.c')

diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 717315d8bd..8d382057dc 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -236,7 +236,7 @@ void erl_error(char *fmt, va_list args)
 static int early_init(int *argc, char **argv);
 
 void
-erts_short_init(void)
+erts_short_init_SVERK_SAYS_NOT_USED(void)
 {
     int ncpu = early_init(NULL, NULL);
     erl_init(ncpu);
@@ -264,6 +264,7 @@ erl_init(int ncpu)
     erts_init_trace();
     erts_init_binary();
     erts_init_bits();
+    erts_code_ix_init();
     erts_init_fun_table();
     init_atom_table();
     init_export_table();
@@ -1471,6 +1472,7 @@ erl_start(int argc, char **argv)
 
     init_shared_memory(boot_argc, boot_argv);
     load_preloaded();
+    erts_commit_loader_code_ix();
 
     erts_initialized = 1;
 
-- 
cgit v1.2.3