diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-07 16:13:55 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-14 14:37:20 +0200 |
| commit | deed6619dee9db9c0347b25987f3a91d51424079 (patch) | |
| tree | c756c07aec4406d2213d3247bcb57d04d589826b /erts/emulator/beam/beam_bif_load.c | |
| parent | 6cd1469d0c8f9af602332b20772134c1241f6429 (diff) | |
| download | otp-deed6619dee9db9c0347b25987f3a91d51424079.tar.gz otp-deed6619dee9db9c0347b25987f3a91d51424079.tar.bz2 otp-deed6619dee9db9c0347b25987f3a91d51424079.zip | |
erts: Let code:make_stub_module raise 'notsup'
if hipe is disabled.
Makes the code simpler to just ifdef away
a lot of hipe stuff.
Diffstat (limited to 'erts/emulator/beam/beam_bif_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_bif_load.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c index f5d1ca7e54..0a4d89d51b 100644 --- a/erts/emulator/beam/beam_bif_load.c +++ b/erts/emulator/beam/beam_bif_load.c @@ -149,6 +149,9 @@ BIF_RETTYPE code_is_module_native_1(BIF_ALIST_1) BIF_RETTYPE code_make_stub_module_3(BIF_ALIST_3) { +#if !defined(HIPE) + BIF_ERROR(BIF_P, EXC_NOTSUP); +#else Module* modp; Eterm res, mod; @@ -181,11 +184,9 @@ BIF_RETTYPE code_make_stub_module_3(BIF_ALIST_3) if (res == mod) { erts_end_staging_code_ix(); erts_commit_staging_code_ix(); -#ifdef HIPE if (!modp) modp = erts_get_module(mod, erts_active_code_ix()); hipe_redirect_to_module(modp); -#endif } else { erts_abort_staging_code_ix(); @@ -194,6 +195,7 @@ BIF_RETTYPE code_make_stub_module_3(BIF_ALIST_3) erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN); erts_release_code_write_permission(); return res; +#endif } BIF_RETTYPE @@ -1069,9 +1071,11 @@ check_process_code(Process* rp, Module* modp, int *redsp, int fcalls) BeamInstr* start; char* mod_start; Uint mod_size; + Eterm* sp; +#ifdef HIPE void *nat_start = NULL; Uint nat_size = 0; - Eterm* sp; +#endif *redsp += 1; |