diff options
| author | Sverker Eriksson <[email protected]> | 2015-08-20 20:18:57 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-08-24 16:46:26 +0200 |
| commit | b5eba8b61ce3ea0058ba37df288738586c68d6ac (patch) | |
| tree | cfc26af358eb45622d6eca1fc312eefed4acb053 | |
| parent | 61828f77ca2542109ece006d730a4f8fe3300616 (diff) | |
| download | otp-b5eba8b61ce3ea0058ba37df288738586c68d6ac.tar.gz otp-b5eba8b61ce3ea0058ba37df288738586c68d6ac.tar.bz2 otp-b5eba8b61ce3ea0058ba37df288738586c68d6ac.zip | |
erts: Change THE_NON_VALUE to not be hard coded in hipe compiler
Instead ask running VM for the value of THE_NON_VALUE,
which is different between opt and debug VM.
Same hipe compiler can now compile for both opt and debug VM.
| -rw-r--r-- | erts/emulator/hipe/hipe_mkliterals.c | 5 | ||||
| -rw-r--r-- | lib/hipe/main/hipe.app.src | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/erts/emulator/hipe/hipe_mkliterals.c b/erts/emulator/hipe/hipe_mkliterals.c index aa12df2932..b7009aec77 100644 --- a/erts/emulator/hipe/hipe_mkliterals.c +++ b/erts/emulator/hipe/hipe_mkliterals.c @@ -269,9 +269,6 @@ static const struct literal { /* freason codes */ { "FREASON_TRAP", TRAP }, - /* special Erlang constants */ - { "THE_NON_VALUE", (int)THE_NON_VALUE }, - /* funs */ #ifdef HIPE { "EFE_NATIVE_ADDRESS", offsetof(struct erl_fun_entry, native_address) }, @@ -526,6 +523,8 @@ static const struct rts_param rts_params[] = { { 49, "P_MSG_FIRST", 1, offsetof(struct process, msg.first) }, { 50, "P_MSG_SAVE", 1, offsetof(struct process, msg.save) }, { 51, "P_CALLEE_EXP", 1, offsetof(struct process, hipe.u.callee_exp) }, + + { 52, "THE_NON_VALUE", 1, (int)THE_NON_VALUE }, }; #define NR_PARAMS ARRAY_SIZE(rts_params) diff --git a/lib/hipe/main/hipe.app.src b/lib/hipe/main/hipe.app.src index 008393e63c..aa86b6dc5b 100644 --- a/lib/hipe/main/hipe.app.src +++ b/lib/hipe/main/hipe.app.src @@ -225,4 +225,4 @@ {applications, [kernel,stdlib]}, {env, []}, {runtime_dependencies, ["syntax_tools-1.6.14","stdlib-2.5","kernel-3.0", - "erts-7.0","compiler-5.0"]}]}. + "erts-7.1","compiler-5.0"]}]}. |