diff options
| author | Björn Gustavsson <[email protected]> | 2010-05-10 07:19:53 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-05-11 09:04:22 +0200 |
| commit | cdd4f992ec0c64c086255f87f1c6282d2a0a7a4d (patch) | |
| tree | a022733ee92f385e34b59ec0467999c451faaa53 /bootstrap/lib/compiler/egen | |
| parent | 9c91901e8e57fd6366fd966e754a62a8a205c000 (diff) | |
| download | otp-cdd4f992ec0c64c086255f87f1c6282d2a0a7a4d.tar.gz otp-cdd4f992ec0c64c086255f87f1c6282d2a0a7a4d.tar.bz2 otp-cdd4f992ec0c64c086255f87f1c6282d2a0a7a4d.zip | |
Update primary bootstrap
Diffstat (limited to 'bootstrap/lib/compiler/egen')
| -rw-r--r-- | bootstrap/lib/compiler/egen/beam_opcodes.erl | 8 | ||||
| -rw-r--r-- | bootstrap/lib/compiler/egen/core_parse.erl | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/bootstrap/lib/compiler/egen/beam_opcodes.erl b/bootstrap/lib/compiler/egen/beam_opcodes.erl index 83cdaa4d48..05587800b4 100644 --- a/bootstrap/lib/compiler/egen/beam_opcodes.erl +++ b/bootstrap/lib/compiler/egen/beam_opcodes.erl @@ -8,7 +8,7 @@ -spec format_number() -> 0. format_number() -> 0. --spec opcode(atom(), 0..8) -> 1..149. +-spec opcode(atom(), 0..8) -> 1..151. opcode(label, 1) -> 1; opcode(func_info, 3) -> 2; opcode(int_code_end, 0) -> 3; @@ -158,9 +158,11 @@ opcode(bs_utf16_size, 3) -> 146; opcode(bs_put_utf16, 3) -> 147; opcode(bs_put_utf32, 3) -> 148; opcode(on_load, 0) -> 149; +opcode(recv_mark, 1) -> 150; +opcode(recv_set, 1) -> 151; opcode(Name, Arity) -> erlang:error(badarg, [Name,Arity]). --spec opname(1..149) -> {atom(),0..8}. +-spec opname(1..151) -> {atom(),0..8}. opname(1) -> {label,1}; opname(2) -> {func_info,3}; opname(3) -> {int_code_end,0}; @@ -310,4 +312,6 @@ opname(146) -> {bs_utf16_size,3}; opname(147) -> {bs_put_utf16,3}; opname(148) -> {bs_put_utf32,3}; opname(149) -> {on_load,0}; +opname(150) -> {recv_mark,1}; +opname(151) -> {recv_set,1}; opname(Number) -> erlang:error(badarg, [Number]). diff --git a/bootstrap/lib/compiler/egen/core_parse.erl b/bootstrap/lib/compiler/egen/core_parse.erl index 05624beb14..02b3458ebb 100644 --- a/bootstrap/lib/compiler/egen/core_parse.erl +++ b/bootstrap/lib/compiler/egen/core_parse.erl @@ -13,11 +13,11 @@ tok_val(T) -> element(3, T). tok_line(T) -> element(2, T). --file("/usr/local/otp/releases/sles10_32_R13B04_patched/lib/parsetools-2.0.2/include/yeccpre.hrl", 0). +-file("/usr/local/lib/erlang/lib/parsetools-2.0.2/include/yeccpre.hrl", 0). %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 1996-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 @@ -194,7 +194,7 @@ yecctoken2string(Other) -> --file("/clearcase/otp/erts/bootstrap/lib/compiler/egen/core_parse.erl", 197). +-file("/Users/bjorng/Downloads/otp/bootstrap/lib/compiler/egen/core_parse.erl", 197). yeccpars2(0=S, Cat, Ss, Stack, T, Ts, Tzr) -> yeccpars2_0(S, Cat, Ss, Stack, T, Ts, Tzr); |