diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-04-17 11:07:12 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-04-17 11:07:12 +0200 |
| commit | 8a16e96c66728a1fd8f3b00e00c8fb999d9ad30f (patch) | |
| tree | 12f2d451dc25b142a2b37458449e763d47cf79fc /erts/emulator | |
| parent | c0a6d9b712a2685443f0351fa589c520f624d872 (diff) | |
| parent | 544d962f3401e96d1bd9efd1209ab53ade9568b9 (diff) | |
| download | otp-8a16e96c66728a1fd8f3b00e00c8fb999d9ad30f.tar.gz otp-8a16e96c66728a1fd8f3b00e00c8fb999d9ad30f.tar.bz2 otp-8a16e96c66728a1fd8f3b00e00c8fb999d9ad30f.zip | |
Merge branch 'egil/fix-icount'
* egil/fix-icount:
erts: Assume counting opcodes are correctly generated
erts: Remove instruction_count command option
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 6a3415d9f4..bb7b799950 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -5137,8 +5137,6 @@ do { \ #ifndef NO_JUMP_TABLE #ifdef ERTS_OPCODE_COUNTER_SUPPORT - /* Are tables correctly generated by beam_makeops? */ - ERTS_CT_ASSERT(sizeof(counting_opcodes) == sizeof(opcodes)); #ifdef DEBUG counting_opcodes[op_catch_end_y] = LabelAddr(lb_catch_end_y); #endif diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 86d3416423..a4f1e0d7ee 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -1955,11 +1955,6 @@ erl_start(int argc, char **argv) goto time_correction_false; else if (sys_strcmp(argv[i]+2, "true") == 0) goto time_correction_true; -#ifdef ERTS_OPCODE_COUNTER_SUPPORT - else if (argv[i][2] == 'i') { /* -ci: undcoumented option*/ - count_instructions = 1; - } -#endif else if (argv[i][2] == '\0') { if (i + 1 >= argc) goto time_correction_false; |