diff options
| author | Björn Gustavsson <[email protected]> | 2017-10-02 12:23:35 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-10-02 12:23:35 +0200 |
| commit | 4bb581abb2ef40325ed5303b08ef89a1195134ff (patch) | |
| tree | ca6775de515aa42707969d362d660cc22ddcc842 /erts/emulator/beam/export.h | |
| parent | 883ceaec7d5e6c84490de9d766878b1c3877e046 (diff) | |
| parent | f589687e9bd172f6f7841043a8de05d260889c8b (diff) | |
| download | otp-4bb581abb2ef40325ed5303b08ef89a1195134ff.tar.gz otp-4bb581abb2ef40325ed5303b08ef89a1195134ff.tar.bz2 otp-4bb581abb2ef40325ed5303b08ef89a1195134ff.zip | |
Merge branch 'bjorn/erts/improve-beam-ops'
* bjorn/erts/improve-beam-ops:
Move out variables from the head of combined instructions
Change operand from 'P' to 'Q' for i_apply_last and i_apply_fun_last
Add CHECK_ALIGNED() for testing storage destinations
instrs.tab: Add missing -no_next directives
beam_load.c: Generalize the 'P' operator in the packing engine
Break out most of the initialization from process_main()
Eliminate the OpCode() macro
Eliminate unnecessary and inconsistent casts
Refactor macros for accessing Beam instructions
beam_emu: Make order of macros consistent
beam_SUITE: Strengthen test of packed registers
Diffstat (limited to 'erts/emulator/beam/export.h')
| -rw-r--r-- | erts/emulator/beam/export.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/export.h b/erts/emulator/beam/export.h index be6cce07bf..194e514b12 100644 --- a/erts/emulator/beam/export.h +++ b/erts/emulator/beam/export.h @@ -73,7 +73,7 @@ extern erts_mtx_t export_staging_lock; #include "beam_load.h" /* For em_* extern declarations */ #define ExportIsBuiltIn(EntryPtr) \ (((EntryPtr)->addressv[erts_active_code_ix()] == (EntryPtr)->beam) && \ - ((EntryPtr)->beam[0] == (BeamInstr) em_apply_bif)) + (BeamIsOpCode((EntryPtr)->beam[0], op_apply_bif))) #if ERTS_GLB_INLINE_INCL_FUNC_DEF |