diff options
| author | Sverker Eriksson <[email protected]> | 2016-12-05 19:16:48 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-12-05 19:16:48 +0100 |
| commit | 57e0fb97e74c48c502b2eb35990abf4396e04b52 (patch) | |
| tree | f7ebaa2f0acff560d7cebf2934f4994d252bc06c /erts/emulator/beam/beam_load.c | |
| parent | df2f089ad064f502b8797f53640acdc46187862c (diff) | |
| parent | 6c76bfa96c12b9f29e66baf3a2df7e84bb9b05ef (diff) | |
| download | otp-57e0fb97e74c48c502b2eb35990abf4396e04b52.tar.gz otp-57e0fb97e74c48c502b2eb35990abf4396e04b52.tar.bz2 otp-57e0fb97e74c48c502b2eb35990abf4396e04b52.zip | |
Merge branch 'sverker/secret-atom'
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 3cd395c2c1..8f1faa6719 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -2546,15 +2546,10 @@ load_code(LoaderState* stp) if (stp->may_load_nif) { const int finfo_ix = ci - FUNC_INFO_SZ; -#ifdef ERTS_DIRTY_SCHEDULERS - enum { MIN_FUNC_SZ = 4 }; -#else - enum { MIN_FUNC_SZ = 3 }; -#endif - if (finfo_ix - last_func_start < MIN_FUNC_SZ && last_func_start) { + if (finfo_ix - last_func_start < BEAM_NIF_MIN_FUNC_SZ && last_func_start) { /* Must make room for call_nif op */ - int pad = MIN_FUNC_SZ - (finfo_ix - last_func_start); - ASSERT(pad > 0 && pad < MIN_FUNC_SZ); + int pad = BEAM_NIF_MIN_FUNC_SZ - (finfo_ix - last_func_start); + ASSERT(pad > 0 && pad < BEAM_NIF_MIN_FUNC_SZ); CodeNeed(pad); sys_memmove(&code[finfo_ix+pad], &code[finfo_ix], FUNC_INFO_SZ*sizeof(BeamInstr)); |