diff options
| author | Sverker Eriksson <[email protected]> | 2014-01-20 18:27:45 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-01-20 18:27:45 +0100 |
| commit | 9b92301dcae72faecdab9f5fe009a53f6d47b8a1 (patch) | |
| tree | 21bce1f644bcc09d74cb0b760f6b468161dcbce3 /erts/emulator/beam/beam_emu.c | |
| parent | 1e59e7638ef48732a23a363150738dfd7e314340 (diff) | |
| parent | 172ebf11dc455e22b87f742c06fa6344995d7db5 (diff) | |
| download | otp-9b92301dcae72faecdab9f5fe009a53f6d47b8a1.tar.gz otp-9b92301dcae72faecdab9f5fe009a53f6d47b8a1.tar.bz2 otp-9b92301dcae72faecdab9f5fe009a53f6d47b8a1.zip | |
Merge branch 'sverk/term2bin-simplify'
* sverk/term2bin-simplify:
erts: Refactor ESTACK & WSTACK to use a struct easy to "export"
erts: Fix benign ESTACK/WSTACK typo
erts: Fix compiler warnings for NO_JUMP_TABLE
erts: Run binary_SUITE:trapping even for 32bit
erts: Extend binary_SUITE:ttb_trap to also cover binary_to_term
erts: Remove the extra_root feature from the process structure
erts: Simplify term_to_binary by removing saved ESTACK from root set
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 592cfe273f..b413f0e859 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2013. All Rights Reserved. + * Copyright Ericsson AB 1996-2014. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -48,7 +48,7 @@ # define OpCase(OpCode) case op_##OpCode # define CountCase(OpCode) case op_count_##OpCode # define OpCode(OpCode) ((Uint*)op_##OpCode) -# define Goto(Rel) {Go = (int)(Rel); goto emulator_loop;} +# define Goto(Rel) {Go = (int)(UWord)(Rel); goto emulator_loop;} # define LabelAddr(Addr) &&##Addr #else # define OpCase(OpCode) lb_##OpCode @@ -133,7 +133,7 @@ do { \ /* We don't check the range if an ordinary switch is used */ #ifdef NO_JUMP_TABLE -#define VALID_INSTR(IP) (0 <= (int)(IP) && ((int)(IP) < (NUMBER_OF_OPCODES*2+10))) +#define VALID_INSTR(IP) ((UWord)(IP) < (NUMBER_OF_OPCODES*2+10)) #else #define VALID_INSTR(IP) \ ((SWord)LabelAddr(emulator_loop) <= (SWord)(IP) && \ |