diff options
| author | Björn Gustavsson <[email protected]> | 2010-04-28 11:02:51 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-05-20 12:20:50 +0200 |
| commit | ed80dcf76968bcb039d3d5ea273421916a007454 (patch) | |
| tree | 48434e407af5be06507fd570e494e65033dfe80c /lib/compiler | |
| parent | ea404afa892da6523e07168718722b8b47e048f6 (diff) | |
| download | otp-ed80dcf76968bcb039d3d5ea273421916a007454.tar.gz otp-ed80dcf76968bcb039d3d5ea273421916a007454.tar.bz2 otp-ed80dcf76968bcb039d3d5ea273421916a007454.zip | |
Remove stray support for the bs_bits_to_bytes2/2 instruction
bs_bits_to_bytes2/2 was an experimental instruction added in R11,
but was removed in R12. Although the beam_disasm and beam_validator
modules do support instructions in older releases, there is
no reason to have them support experimental instructions.
Diffstat (limited to 'lib/compiler')
| -rw-r--r-- | lib/compiler/src/beam_disasm.erl | 3 | ||||
| -rw-r--r-- | lib/compiler/src/beam_utils.erl | 6 | ||||
| -rw-r--r-- | lib/compiler/src/beam_validator.erl | 3 |
3 files changed, 0 insertions, 12 deletions
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl index 920ce07396..a55e107a00 100644 --- a/lib/compiler/src/beam_disasm.erl +++ b/lib/compiler/src/beam_disasm.erl @@ -1015,9 +1015,6 @@ resolve_inst({gc_bif3,Args},Imports,_,_) -> %% %% New instructions for creating non-byte aligned binaries. %% -resolve_inst({bs_bits_to_bytes2,[_Arg2,_Arg3]=Args},_,_,_) -> - [A2,A3] = resolve_args(Args), - {bs_bits_to_bytes2,A2,A3}; resolve_inst({bs_final2,[X,Y]},_,_,_) -> {bs_final2,X,Y}; diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl index ac249e6672..98bb217a3a 100644 --- a/lib/compiler/src/beam_utils.erl +++ b/lib/compiler/src/beam_utils.erl @@ -424,12 +424,6 @@ check_liveness(R, [{bs_add,{f,0},Ss,D}|Is], St) -> false when R =:= D -> {killed,St}; false -> check_liveness(R, Is, St) end; -check_liveness(R, [{bs_bits_to_bytes2,Src,Dst}|Is], St) -> - case R of - Src -> {used,St}; - Dst -> {killed,St}; - _ -> check_liveness(R, Is, St) - end; check_liveness(R, [{bs_put_binary,{f,0},Sz,_,_,Src}|Is], St) -> case member(R, [Sz,Src]) of true -> {used,St}; diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl index 34065cfdce..dc5a1068db 100644 --- a/lib/compiler/src/beam_validator.erl +++ b/lib/compiler/src/beam_validator.erl @@ -757,9 +757,6 @@ valfun_4({bs_utf8_size,{f,Fail},A,Dst}, Vst) -> valfun_4({bs_utf16_size,{f,Fail},A,Dst}, Vst) -> assert_term(A, Vst), set_type_reg({integer,[]}, Dst, branch_state(Fail, Vst)); -valfun_4({bs_bits_to_bytes2,Src,Dst}, Vst) -> - assert_term(Src, Vst), - set_type_reg({integer,[]}, Dst, Vst); valfun_4({bs_bits_to_bytes,{f,Fail},Src,Dst}, Vst) -> assert_term(Src, Vst), set_type_reg({integer,[]}, Dst, branch_state(Fail, Vst)); |