diff options
| author | Björn Gustavsson <[email protected]> | 2011-02-26 11:11:27 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-08-16 08:58:49 +0200 |
| commit | 0befcf588ae4fe9ea686ea81727114a8dc5c0cac (patch) | |
| tree | 42776c505002c3753307349afb8486e5be98c741 /lib/compiler | |
| parent | 29d734adaec35052ce153b05621babf9333bc651 (diff) | |
| download | otp-0befcf588ae4fe9ea686ea81727114a8dc5c0cac.tar.gz otp-0befcf588ae4fe9ea686ea81727114a8dc5c0cac.tar.bz2 otp-0befcf588ae4fe9ea686ea81727114a8dc5c0cac.zip | |
compiler, emulator: Introduce the line/1 instruction
Introduce the line/1 instruction in the compiler and the BEAM
virtual machine. It will not yet be generated by the compiler and
will not actually carry any information.
Diffstat (limited to 'lib/compiler')
| -rw-r--r-- | lib/compiler/src/beam_asm.erl | 2 | ||||
| -rw-r--r-- | lib/compiler/src/beam_disasm.erl | 6 | ||||
| -rw-r--r-- | lib/compiler/src/genop.tab | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl index 89d64834cf..60824326bd 100644 --- a/lib/compiler/src/beam_asm.erl +++ b/lib/compiler/src/beam_asm.erl @@ -243,6 +243,8 @@ bif_type(_, 2) -> bif2. make_op({'%',_}, Dict) -> {[],Dict}; +make_op({line,_}, Dict) -> + encode_op(line, [0], Dict); make_op({bif, Bif, {f,_}, [], Dest}, Dict) -> %% BIFs without arguments cannot fail. encode_op(bif0, [{extfunc, erlang, Bif, 0}, Dest], Dict); diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl index 017ca129b0..fc1800d8be 100644 --- a/lib/compiler/src/beam_disasm.erl +++ b/lib/compiler/src/beam_disasm.erl @@ -1105,6 +1105,12 @@ resolve_inst({recv_set,[Lbl]},_,_,_) -> {recv_set,Lbl}; %% +%% R15A. +%% +resolve_inst({line,[Index]},_,_,_) -> + {line,resolve_arg(Index)}; + +%% %% Catches instructions that are not yet handled. %% resolve_inst(X,_,_,_) -> ?exit({resolve_inst,X}). diff --git a/lib/compiler/src/genop.tab b/lib/compiler/src/genop.tab index 63527bda8f..39c1e8297f 100644 --- a/lib/compiler/src/genop.tab +++ b/lib/compiler/src/genop.tab @@ -280,3 +280,7 @@ BEAM_FORMAT_NUMBER=0 150: recv_mark/1 151: recv_set/1 152: gc_bif3/7 + +# R15A + +153: line/1 |