diff options
| author | Björn Gustavsson <[email protected]> | 2015-10-30 10:05:51 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-10-30 10:05:51 +0100 |
| commit | 97313076be76f5b0ba8fb573713046fe3ee17516 (patch) | |
| tree | 6734ab51177fdabe18f3989a7940d0408e0f55bc /lib | |
| parent | d1eb2b56a18eae3d967855f4a024694f34b8776d (diff) | |
| parent | 7e9c71bfbcf57c08c863e1dc79e11fb8dfdf870f (diff) | |
| download | otp-97313076be76f5b0ba8fb573713046fe3ee17516.tar.gz otp-97313076be76f5b0ba8fb573713046fe3ee17516.tar.bz2 otp-97313076be76f5b0ba8fb573713046fe3ee17516.zip | |
Merge branch 'maint'
* maint:
beam_lib: Document all_chunks/1 and build_module/1
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/doc/src/beam_lib.xml | 14 | ||||
| -rw-r--r-- | lib/stdlib/src/beam_lib.erl | 17 |
2 files changed, 25 insertions, 6 deletions
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml index c556180b8b..faf668735e 100644 --- a/lib/stdlib/doc/src/beam_lib.xml +++ b/lib/stdlib/doc/src/beam_lib.xml @@ -224,6 +224,13 @@ <funcs> <func> + <name name="all_chunks" arity="1"/> + <fsummary>Read all chunks from a BEAM file or binary</fsummary> + <desc> + <p>Reads chunk data for all chunks.</p> + </desc> + </func> + <func> <name name="chunks" arity="2"/> <fsummary>Read selected chunks from a BEAM file or binary</fsummary> <desc> @@ -251,6 +258,13 @@ </desc> </func> <func> + <name name="build_module" arity="1"/> + <fsummary>Creates a BEAM module from a list of chunks</fsummary> + <desc> + <p>Builds a BEAM module (as a binary) from a list of chunks.</p> + </desc> + </func> + <func> <name name="version" arity="1"/> <fsummary>Read the BEAM file's module version</fsummary> <desc> diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl index cb19fe4175..6e00401dce 100644 --- a/lib/stdlib/src/beam_lib.erl +++ b/lib/stdlib/src/beam_lib.erl @@ -308,6 +308,17 @@ make_crypto_key(des3_cbc=Type, String) -> <<K3:8/binary,IVec:8/binary>> = erlang:md5([First|reverse(String)]), {Type,[K1,K2,K3],IVec,8}. +-spec build_module(Chunks) -> {'ok', Binary} when + Chunks :: [{chunkid(), dataB()}], + Binary :: binary(). + +build_module(Chunks0) -> + Chunks = list_to_binary(build_chunks(Chunks0)), + Size = byte_size(Chunks), + 0 = Size rem 4, % Assertion: correct padding? + {ok, <<"FOR1", (Size+4):32, "BEAM", Chunks/binary>>}. + + %% %% Local functions %% @@ -419,12 +430,6 @@ strip_file(File) -> end end. -build_module(Chunks0) -> - Chunks = list_to_binary(build_chunks(Chunks0)), - Size = byte_size(Chunks), - 0 = Size rem 4, % Assertion: correct padding? - {ok, <<"FOR1", (Size+4):32, "BEAM", Chunks/binary>>}. - build_chunks([{Id, Data} | Chunks]) -> BId = list_to_binary(Id), Size = byte_size(Data), |