diff options
| author | Lukas Larsson <[email protected]> | 2011-02-28 17:09:11 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2011-02-28 17:09:11 +0100 |
| commit | 68fd8d31a869908d008f8262310a0a1e6a12505b (patch) | |
| tree | 5790147fb43154dcb746dcfcd7773d6e4f2b9008 /lib | |
| parent | 5822b43e9acd3cfa0b6f9dea2a0fd25eb48c99e7 (diff) | |
| parent | c8ce455e3cd307a564a92161b9e082bcc3672f94 (diff) | |
| download | otp-68fd8d31a869908d008f8262310a0a1e6a12505b.tar.gz otp-68fd8d31a869908d008f8262310a0a1e6a12505b.tar.bz2 otp-68fd8d31a869908d008f8262310a0a1e6a12505b.zip | |
Merge branch 'lukas/stdlib/native_escript/OTP-9076' into dev
* lukas/stdlib/native_escript/OTP-9076:
Update escrips to allow the -n or -compile(native) flag, which compiles the code within the escript with the +native flag. You need an HiPE enabled emulator for this to work.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/escript.erl | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl index 7cb02afb11..0d2d23180a 100644 --- a/lib/stdlib/src/escript.erl +++ b/lib/stdlib/src/escript.erl @@ -31,7 +31,7 @@ %%----------------------------------------------------------------------- --type mode() :: 'compile' | 'debug' | 'interpret' | 'run'. +-type mode() :: 'native' | 'compile' | 'debug' | 'interpret' | 'run'. -type source() :: 'archive' | 'beam' | 'text'. -record(state, {file :: file:filename(), @@ -304,7 +304,11 @@ parse_and_run(File, Args, Options) -> false -> case lists:member("i", Options) of true -> interpret; - false -> Mode + false -> + case lists:member("n", Options) of + true -> native; + false -> Mode + end end end end, @@ -321,6 +325,14 @@ parse_and_run(File, Args, Options) -> _Other -> fatal("There were compilation errors.") end; + native -> + case compile:forms(FormsOrBin, [report,native]) of + {ok, Module, BeamBin} -> + {module, Module} = code:load_binary(Module, File, BeamBin), + run(Module, Args); + _Other -> + fatal("There were compilation errors.") + end; debug -> case compile:forms(FormsOrBin, [report, debug_info]) of {ok,Module,BeamBin} -> @@ -664,7 +676,7 @@ epp_parse_file2(Epp, S, Forms, Parsed) -> {attribute,Ln,mode,NewMode} -> S2 = S#state{mode = NewMode}, if - NewMode =:= compile; NewMode =:= interpret; NewMode =:= debug -> + NewMode =:= compile; NewMode =:= interpret; NewMode =:= debug; NewMode =:= native -> epp_parse_file(Epp, S2, [Form | Forms]); true -> Args = lists:flatten(io_lib:format("illegal mode attribute: ~p", [NewMode])), |