Merge tag 'OTP-21.2' into sverker/map-from-ks-vs-bug

1 files changed, 17 insertions, 9 deletions

diff --git a/erts/emulator/beam/module.h b/erts/emulator/beam/module.h
index 1c1afc8461..00efd129ff 100644
--- a/erts/emulator/beam/module.h
+++ b/erts/emulator/beam/module.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1996-2016. All Rights Reserved.
+ * Copyright Ericsson AB 1996-2018. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,10 @@
 
 #include "index.h"
 
+#ifdef HIPE
+#include "hipe_module.h"
+#endif
+
 struct erl_module_instance {
     BeamCodeHeader* code_hdr;
     int code_length;		/* Length of loaded code in bytes. */
@@ -30,6 +34,9 @@ struct erl_module_instance {
     struct erl_module_nif* nif;
     int num_breakpoints;
     int num_traced_exports;
+#ifdef HIPE
+    HipeModule *hipe_code;
+#endif
 };
 
 typedef struct erl_module {
@@ -38,17 +45,18 @@ typedef struct erl_module {
     int seen;			/* Used by finish_loading() */
 
     struct erl_module_instance curr;
-    struct erl_module_instance old; /* protected by "old_code" rwlock */
+    struct erl_module_instance old; /* active protected by "old_code" rwlock */
     struct erl_module_instance* on_load;
 } Module; 
 
+void erts_module_instance_init(struct erl_module_instance* modi);
 Module* erts_get_module(Eterm mod, ErtsCodeIndex code_ix);
 Module* erts_put_module(Eterm mod);
 
 void init_module_table(void);
 void module_start_staging(void);
 void module_end_staging(int commit);
-void module_info(int, void *);
+void module_info(fmtfn_t, void *);
 
 Module *module_code(int, ErtsCodeIndex);
 int module_code_size(ErtsCodeIndex);
@@ -64,29 +72,29 @@ int erts_is_old_code_rlocked(ErtsCodeIndex);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
-extern erts_smp_rwmtx_t the_old_code_rwlocks[ERTS_NUM_CODE_IX];
+extern erts_rwmtx_t the_old_code_rwlocks[ERTS_NUM_CODE_IX];
 
 ERTS_GLB_INLINE void erts_rwlock_old_code(ErtsCodeIndex code_ix)
 {
-    erts_smp_rwmtx_rwlock(&the_old_code_rwlocks[code_ix]);
+    erts_rwmtx_rwlock(&the_old_code_rwlocks[code_ix]);
 }
 ERTS_GLB_INLINE void erts_rwunlock_old_code(ErtsCodeIndex code_ix)
 {
-    erts_smp_rwmtx_rwunlock(&the_old_code_rwlocks[code_ix]);
+    erts_rwmtx_rwunlock(&the_old_code_rwlocks[code_ix]);
 }
 ERTS_GLB_INLINE void erts_rlock_old_code(ErtsCodeIndex code_ix)
 {
-    erts_smp_rwmtx_rlock(&the_old_code_rwlocks[code_ix]);
+    erts_rwmtx_rlock(&the_old_code_rwlocks[code_ix]);
 }
 ERTS_GLB_INLINE void erts_runlock_old_code(ErtsCodeIndex code_ix)
 {
-    erts_smp_rwmtx_runlock(&the_old_code_rwlocks[code_ix]);
+    erts_rwmtx_runlock(&the_old_code_rwlocks[code_ix]);
 }
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
 ERTS_GLB_INLINE int erts_is_old_code_rlocked(ErtsCodeIndex code_ix)
 {
-    return erts_smp_lc_rwmtx_is_rlocked(&the_old_code_rwlocks[code_ix]);
+    return erts_lc_rwmtx_is_rlocked(&the_old_code_rwlocks[code_ix]);
 }
 #endif