diff options
| author | Björn Gustavsson <[email protected]> | 2011-02-15 10:09:50 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-08-16 08:58:49 +0200 |
| commit | c846bf3f57937da34589c9071291a3be5ad0c4bc (patch) | |
| tree | e55a1599b22f2f3ae449fbd70ac2d65ab29fd7ae /lib/compiler/src/beam_asm.erl | |
| parent | 0befcf588ae4fe9ea686ea81727114a8dc5c0cac (diff) | |
| download | otp-c846bf3f57937da34589c9071291a3be5ad0c4bc.tar.gz otp-c846bf3f57937da34589c9071291a3be5ad0c4bc.tar.bz2 otp-c846bf3f57937da34589c9071291a3be5ad0c4bc.zip | |
compiler: Generate line instructions
Diffstat (limited to 'lib/compiler/src/beam_asm.erl')
| -rw-r--r-- | lib/compiler/src/beam_asm.erl | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl index 60824326bd..d56aeae524 100644 --- a/lib/compiler/src/beam_asm.erl +++ b/lib/compiler/src/beam_asm.erl @@ -23,7 +23,7 @@ -export([module/4]). -export([encode/2]). --import(lists, [map/2,member/2,keymember/3,duplicate/2]). +-import(lists, [map/2,member/2,keymember/3,duplicate/2,splitwith/2]). -include("beam_opcodes.hrl"). module(Code, Abst, SourceFile, Opts) -> @@ -41,12 +41,9 @@ on_load(Fs0, Attr0) -> undefined -> {Fs0,Attr0}; [{Name,0}] -> - Fs = map(fun({function,N,0,Entry,Asm0}) when N =:= Name -> - [{label,_}=L, - {func_info,_,_,_}=Fi, - {label,_}=E|Asm1] = Asm0, - Asm = [L,Fi,E,on_load|Asm1], - {function,N,0,Entry,Asm}; + Fs = map(fun({function,N,0,Entry,Is0}) when N =:= Name -> + Is = insert_on_load_instruction(Is0, Entry), + {function,N,0,Entry,Is}; (F) -> F end, Fs0), @@ -54,6 +51,13 @@ on_load(Fs0, Attr0) -> {Fs,Attr} end. +insert_on_load_instruction(Is0, Entry) -> + {Bef,[{label,Entry}=El|Is]} = + splitwith(fun({label,L}) when L =:= Entry -> false; + (_) -> true + end, Is0), + Bef ++ [El,on_load|Is]. + assemble_1([{function,Name,Arity,Entry,Asm}|T], Exp, Dict0, Acc) -> Dict1 = case member({Name,Arity}, Exp) of true -> |