From a5ce823283d36eda4788c55b0b9b645577473983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Mon, 22 Sep 2014 17:21:15 +0200
Subject: erts: Fix SMP for ERTS_OPCODE_COUNTER_SUPPORT

Cleanup macro code.
---
 erts/emulator/beam/beam_emu.c | 29 ++++++++++-------------------
 erts/emulator/beam/erl_init.c |  8 --------
 erts/emulator/beam/erl_vm.h   |  2 --
 3 files changed, 10 insertions(+), 29 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 8bfb7d2ad2..f02ace9094 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -241,10 +241,6 @@ BeamInstr beam_return_time_trace[1]; /* OpCode(i_return_time_trace) */
 void** beam_ops;
 #endif
 
-#ifndef ERTS_SMP /* Not supported with smp emulator */
-extern int count_instructions;
-#endif
-
 #define SWAPIN             \
     HTOP = HEAP_TOP(c_p);  \
     E = c_p->stop
@@ -1163,13 +1159,14 @@ void process_main(void)
 
     Eterm (*arith_func)(Process* p, Eterm* reg, Uint live);
 
-#ifndef NO_JUMP_TABLE
-    static void* opcodes[] = { DEFINE_OPCODES };
 #ifdef ERTS_OPCODE_COUNTER_SUPPORT
     static void* counting_opcodes[] = { DEFINE_COUNTING_OPCODES };
-#endif
+#else
+#ifndef NO_JUMP_TABLE
+    static void* opcodes[] = { DEFINE_OPCODES };
 #else
     int Go;
+#endif
 #endif
 
     Uint temp_bits; /* Temporary used by BsSkipBits2 & BsGetInteger2 */
@@ -5145,22 +5142,16 @@ get_map_elements_fail:
 
 #ifndef NO_JUMP_TABLE
 #ifdef ERTS_OPCODE_COUNTER_SUPPORT
-
      /* Are tables correctly generated by beam_makeops? */
      ASSERT(sizeof(counting_opcodes) == sizeof(opcodes));
-
-     if (count_instructions) {
 #ifdef DEBUG
-	 counting_opcodes[op_catch_end_y] = LabelAddr(lb_catch_end_y);
+     counting_opcodes[op_catch_end_y] = LabelAddr(lb_catch_end_y);
 #endif
-	 counting_opcodes[op_i_func_info_IaaI] = LabelAddr(lb_i_func_info_IaaI);
-	 beam_ops = counting_opcodes;
-     }
-     else
-#endif /* #ifndef ERTS_OPCODE_COUNTER_SUPPORT */
-     {
-	 beam_ops = opcodes;
-     }
+     counting_opcodes[op_i_func_info_IaaI] = LabelAddr(lb_i_func_info_IaaI);
+     beam_ops = counting_opcodes;
+#else /* #ifndef ERTS_OPCODE_COUNTER_SUPPORT */
+     beam_ops = opcodes;
+#endif /* ERTS_OPCODE_COUNTER_SUPPORT */
 #endif /* NO_JUMP_TABLE */
      
      em_call_error_handler = OpCode(call_error_handler);
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 88c4006934..890ef89cc1 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -161,9 +161,6 @@ int H_MIN_SIZE;			/* The minimum heap grain */
 int BIN_VH_MIN_SIZE;		/* The minimum binary virtual*/
 
 Uint32 erts_debug_flags;	/* Debug flags. */
-#ifdef ERTS_OPCODE_COUNTER_SUPPORT
-int count_instructions;
-#endif
 int erts_backtrace_depth;	/* How many functions to show in a backtrace
 				 * in error codes.
 				 */
@@ -1882,11 +1879,6 @@ erl_start(int argc, char **argv)
 	    if (argv[i][2] == 0) { /* -c: documented option */
 		erts_disable_tolerant_timeofday = 1;
 	    }
-#ifdef ERTS_OPCODE_COUNTER_SUPPORT
-	    else if (argv[i][2] == 'i') { /* -ci: undcoumented option*/
-		count_instructions = 1;
-	    }
-#endif
 	    break;
 	case 'W':
 	    arg = get_arg(argv[i]+2, argv[i+1], &i);
diff --git a/erts/emulator/beam/erl_vm.h b/erts/emulator/beam/erl_vm.h
index b7de8208ad..78d98229d8 100644
--- a/erts/emulator/beam/erl_vm.h
+++ b/erts/emulator/beam/erl_vm.h
@@ -20,8 +20,6 @@
 #ifndef __ERL_VM_H__
 #define __ERL_VM_H__
 
-/* #define ERTS_OPCODE_COUNTER_SUPPORT */
-
 /* FORCE_HEAP_FRAGS:
  * Debug provocation to make HAlloc always create heap fragments (if allowed)
  * even if there is room on heap.
-- 
cgit v1.2.3