diff options
| author | Lukas Larsson <[email protected]> | 2017-10-30 19:41:18 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-10-30 19:41:18 +0100 |
| commit | d998d08c964804d9facd7b05c8429fcb8fab7f59 (patch) | |
| tree | 3a82584781b80219f0b46b02d8d6c06e4a3b1e88 /erts/emulator/beam/beam_debug.c | |
| parent | bdd21517a65aa13393c8e97a89e3c9127f99c273 (diff) | |
| parent | 1b00539d6db8e349c6782bcd38ab006420734106 (diff) | |
| download | otp-d998d08c964804d9facd7b05c8429fcb8fab7f59.tar.gz otp-d998d08c964804d9facd7b05c8429fcb8fab7f59.tar.bz2 otp-d998d08c964804d9facd7b05c8429fcb8fab7f59.zip | |
Merge branch 'lukas/erts/misc_fixes'
* lukas/erts/misc_fixes:
erts: Fix a bunch of compiler warnings
kernel: Fix gen_tcp_misc indentation
erts: Fail port_SUITE:huge_env if error code > 127
erts: Add lcnt prototype for dist locks update
Diffstat (limited to 'erts/emulator/beam/beam_debug.c')
| -rw-r--r-- | erts/emulator/beam/beam_debug.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c index 70078c8c59..509aa2a84f 100644 --- a/erts/emulator/beam/beam_debug.c +++ b/erts/emulator/beam/beam_debug.c @@ -408,7 +408,10 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr) addr++; ap = addr; } else { - BeamInstr instr_word = addr++[0]; +#if defined(ARCH_64) && defined(CODE_MODEL_SMALL) + BeamInstr instr_word = addr[0]; +#endif + addr++; /* * Copy all arguments to a local buffer for the unpacking. |