From bb92a8ee06841754910150d8ec05b2022a9fbe94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 25 Aug 2011 11:38:20 +0200
Subject: Update primary bootstrap

---
 bootstrap/lib/compiler/egen/beam_opcodes.erl | 6 ++++--
 bootstrap/lib/compiler/egen/core_parse.erl   | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'bootstrap/lib/compiler/egen')

diff --git a/bootstrap/lib/compiler/egen/beam_opcodes.erl b/bootstrap/lib/compiler/egen/beam_opcodes.erl
index fda227f90f..147f04ad71 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..152.
+-spec opcode(atom(), 0..8) -> 1..153.
 opcode(label, 1) -> 1;
 opcode(func_info, 3) -> 2;
 opcode(int_code_end, 0) -> 3;
@@ -161,9 +161,10 @@ opcode(on_load, 0) -> 149;
 opcode(recv_mark, 1) -> 150;
 opcode(recv_set, 1) -> 151;
 opcode(gc_bif3, 7) -> 152;
+opcode(line, 1) -> 153;
 opcode(Name, Arity) -> erlang:error(badarg, [Name,Arity]).
 
--spec opname(1..152) -> {atom(),0..8}.
+-spec opname(1..153) -> {atom(),0..8}.
 opname(1) -> {label,1};
 opname(2) -> {func_info,3};
 opname(3) -> {int_code_end,0};
@@ -316,4 +317,5 @@ opname(149) -> {on_load,0};
 opname(150) -> {recv_mark,1};
 opname(151) -> {recv_set,1};
 opname(152) -> {gc_bif3,7};
+opname(153) -> {line,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 399d61109f..fab545133c 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("/opt/installs/lib/erlang/lib/parsetools-2.0.5/include/yeccpre.hrl", 0).
+-file("/usr/local/otp/releases/sles10_32_R14B03_patched/lib/parsetools-2.0.5/include/yeccpre.hrl", 0).
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. 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
@@ -196,7 +196,7 @@ yecctoken2string(Other) ->
 
 
 
--file("/ldisk/egil/git/otp/bootstrap/lib/compiler/egen/core_parse.erl", 199).
+-file("/ldisk/bjorn/otp/bootstrap/lib/compiler/egen/core_parse.erl", 199).
 
 yeccpars2(0=S, Cat, Ss, Stack, T, Ts, Tzr) ->
  yeccpars2_0(S, Cat, Ss, Stack, T, Ts, Tzr);
-- 
cgit v1.2.3