diff options
author | Erlang/OTP <otp@erlang.org> | 2010-03-25 14:23:21 +0000 |
---|---|---|
committer | Erlang/OTP <otp@erlang.org> | 2010-03-25 14:23:21 +0000 |
commit | 7ffd0736fa636a871b39412ab037d7fb1ed04cf1 (patch) | |
tree | 9d57389bc0f41dcaaeaea445a059b4458f9bd797 /erts/emulator/beam/ops.tab | |
parent | 01d605fdb7c396b5c98a9151baf3882930d0c6af (diff) | |
parent | d179c1522c73de550bce45c7f5d5055e04b93f32 (diff) | |
download | otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.tar.gz otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.tar.bz2 otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.zip |
Merge branch 'bg/compiler-remove-r11-support' into dev
* bg/compiler-remove-r11-support:
compiler: Don't support the no_binaries option
erts: Don't support the put_string/3 instruction
compiler: Don't support the no_constant_pool option
compiler: Don't support the r11 option
test_server: Don't support communication with R11 nodes
binary_SUITE: Don't test bit-level binary roundtrips with R11 nodes
erts: Test compatibility of funs with R12 instead of R11
OTP-8531 bg/compiler-remove-r11-support
Diffstat (limited to 'erts/emulator/beam/ops.tab')
-rw-r--r-- | erts/emulator/beam/ops.tab | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab index ce1df74f03..231ea34fd5 100644 --- a/erts/emulator/beam/ops.tab +++ b/erts/emulator/beam/ops.tab @@ -1,19 +1,19 @@ # # %CopyrightBegin% -# -# Copyright Ericsson AB 1997-2009. All Rights Reserved. -# +# +# Copyright Ericsson AB 1997-2010. All Rights Reserved. +# # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in # compliance with the License. You should have received a copy of the # Erlang Public License along with this software. If not, it can be # retrieved online at http://www.erlang.org/. -# +# # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See # the License for the specific language governing rights and limitations # under the License. -# +# # %CopyrightEnd% # @@ -66,7 +66,6 @@ func_info M=a a==am_module_info A=u==1 | label L | move n r => too_old_compiler bif1 Fail u$func:erlang:is_constant/1 Src Dst => too_old_compiler - # # All the other instructions. # @@ -115,12 +114,6 @@ init Y1 | init Y2 => init2 Y1 Y2 %macro: init2 Init2 -pack %macro: init3 Init3 -pack -# -# Warning: The put_string instruction is specially treated in the loader. -# Don't change the instruction format unless you change the loader too. -# -put_string I I d - # Selecting values select_val S=q Fail=f Size=u Rest=* => const_select_val(S, Fail, Size, Rest) |