aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-09-18 14:01:45 +0200
committerBjörn Gustavsson <[email protected]>2017-10-01 07:08:19 +0200
commit13956599d609156bd2c054213d8a5ed0a1ae7087 (patch)
tree943015bb69807ebc40c865b8adf69068b87482dc
parent3da0edc053709a8c9e3ea40e430befa027ef0bf0 (diff)
downloadotp-13956599d609156bd2c054213d8a5ed0a1ae7087.tar.gz
otp-13956599d609156bd2c054213d8a5ed0a1ae7087.tar.bz2
otp-13956599d609156bd2c054213d8a5ed0a1ae7087.zip
beam_emu: Make order of macros consistent
The inconsistent order has annoyed me for a long time. While at it, also remove the unecessary definition of LabelAddr() if NO_JUMP_TABLE is defined.
-rw-r--r--erts/emulator/beam/beam_emu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 81c4417b1e..c2aab32995 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -52,13 +52,12 @@
# define CountCase(OpCode) case op_count_##OpCode
# define OpCode(OpCode) ((Uint*)op_##OpCode)
# define Goto(Rel) {Go = (int)(UWord)(Rel); goto emulator_loop;}
-# define LabelAddr(Addr) &&##Addr
#else
# define OpCase(OpCode) lb_##OpCode
# define CountCase(OpCode) lb_count_##OpCode
+# define OpCode(OpCode) (&&lb_##OpCode)
# define Goto(Rel) goto *((void *)Rel)
# define LabelAddr(Label) &&Label
-# define OpCode(OpCode) (&&lb_##OpCode)
#endif
#ifdef ERTS_ENABLE_LOCK_CHECK