2008-05-05 Martin Baulig <martin@ximian.com>

	Drop support for old pre-terrania symbol files.

	* MonoSymbolFile.cs
	(MonoSymbolFile.CompatibilityMode): Removed.

	* MonoSymbolTable.cs
	(LexicalBlockEntry): Removed this obsolete class.

svn path=/trunk/mcs/; revision=102520

diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/ChangeLog b/mcs/class/Mono.CompilerServices.SymbolWriter/ChangeLog
index 5fdda367bfdd6c082292e40ca8c1adb6f3b8c668..1c538e9b8322f2d3c9f072201d83569d0bc974c9 100644 (file)
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/ChangeLog
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-05  Martin Baulig  <martin@ximian.com>
+
+       Drop support for old pre-terrania symbol files.
+
+       * MonoSymbolFile.cs
+       (MonoSymbolFile.CompatibilityMode): Removed.
+
+       * MonoSymbolTable.cs
+       (LexicalBlockEntry): Removed this obsolete class.
+
 2008-04-02  Martin Baulig  <martin@ximian.com>
 
        * *.cs: Remove the `#if !DISABLE_TERRANIA_CHANGES' conditionals.

diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs b/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
index 444fd666483e60fd2b1783aa2a4fc153d446179c..ec7030ff71eeacbc6e6f8573e50dbd333d3d5cea 100644 (file)
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolFile.cs
@@ -140,7 +140,6 @@ namespace Mono.CompilerServices.SymbolWriter
                int last_namespace_index;
 
                public readonly int Version = OffsetTable.Version;
-               public readonly bool CompatibilityMode = false;
 
                public int NumLineNumbers;
 
@@ -265,18 +264,16 @@ namespace Mono.CompilerServices.SymbolWriter
                        }
                        ot.SourceTableSize = (int) bw.BaseStream.Position - ot.SourceTableOffset;
 
-                       if (!CompatibilityMode) {
-                               //
-                               // Write anonymous scope table.
-                               //
-                               ot.AnonymousScopeCount = anonymous_scopes != null ? anonymous_scopes.Count : 0;
-                               ot.AnonymousScopeTableOffset = (int) bw.BaseStream.Position;
-                               if (anonymous_scopes != null) {
-                                       foreach (AnonymousScopeEntry scope in anonymous_scopes.Values)
-                                               scope.Write (bw);
-                               }
-                               ot.AnonymousScopeTableSize = (int) bw.BaseStream.Position - ot.AnonymousScopeTableOffset;
+                       //
+                       // Write anonymous scope table.
+                       //
+                       ot.AnonymousScopeCount = anonymous_scopes != null ? anonymous_scopes.Count : 0;
+                       ot.AnonymousScopeTableOffset = (int) bw.BaseStream.Position;
+                       if (anonymous_scopes != null) {
+                               foreach (AnonymousScopeEntry scope in anonymous_scopes.Values)
+                                       scope.Write (bw);
                        }
+                       ot.AnonymousScopeTableSize = (int) bw.BaseStream.Position - ot.AnonymousScopeTableOffset;
 
                        //
                        // Fixup offset table.
@@ -323,17 +320,13 @@ namespace Mono.CompilerServices.SymbolWriter
                                        throw new MonoSymbolFileException (
                                                "Symbol file `{0}' is not a valid " +
                                                "Mono symbol file", filename);
-                               if ((version != OffsetTable.Version) &&
-                                   (version != OffsetTable.CompatibilityVersion))
+                               if (version != OffsetTable.Version)
                                        throw new MonoSymbolFileException (
                                                "Symbol file `{0}' has version {1}, " +
                                                "but expected {2}", filename, version,
                                                OffsetTable.Version);
 
                                Version = (int) version;
-                               if (version == OffsetTable.CompatibilityVersion)
-                                       CompatibilityMode = true;
-
                                guid = new Guid (reader.ReadBytes (16));
 
                                ot = new OffsetTable (reader, (int) version);

diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs b/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs
index 7d55f63e9516c7a0cf6e2fa4e28d00cdbf0dcdc2..5f1c295cd25b55c928e108063918da644b12fa66 100644 (file)
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolTable.cs
@@ -72,7 +72,6 @@ namespace Mono.CompilerServices.SymbolWriter
        public struct OffsetTable
        {
                public const int  Version = 41;
-               public const int  CompatibilityVersion = 39;
                public const long Magic   = 0x45e82623fd7fa614;
 
                #region This is actually written to the symbol file
@@ -104,15 +103,9 @@ namespace Mono.CompilerServices.SymbolWriter
                        MethodTableSize = reader.ReadInt32 ();
                        TypeCount = reader.ReadInt32 ();
 
-                       if (version == CompatibilityVersion) {
-                               AnonymousScopeCount = 0;
-                               AnonymousScopeTableOffset = 0;
-                               AnonymousScopeTableSize = 0;
-                       } else {
-                               AnonymousScopeCount = reader.ReadInt32 ();
-                               AnonymousScopeTableOffset = reader.ReadInt32 ();
-                               AnonymousScopeTableSize = reader.ReadInt32 ();
-                       }
+                       AnonymousScopeCount = reader.ReadInt32 ();
+                       AnonymousScopeTableOffset = reader.ReadInt32 ();
+                       AnonymousScopeTableSize = reader.ReadInt32 ();
                }
 
                internal void Write (BinaryWriter bw, int version)
@@ -128,9 +121,6 @@ namespace Mono.CompilerServices.SymbolWriter
                        bw.Write (MethodTableSize);
                        bw.Write (TypeCount);
 
-                       if (version == CompatibilityVersion)
-                               return;
-
                        bw.Write (AnonymousScopeCount);
                        bw.Write (AnonymousScopeTableOffset);
                        bw.Write (AnonymousScopeTableSize);
@@ -214,45 +204,6 @@ namespace Mono.CompilerServices.SymbolWriter
                }
        }
 
-       [Obsolete("LexicalBlockEntry has been replaced by CodeBlockEntry.")]
-       public class LexicalBlockEntry
-       {
-               public int Index;
-               #region This is actually written to the symbol file
-               public int StartOffset;
-               public int EndOffset;
-               #endregion
-
-               public LexicalBlockEntry (int index, int start_offset)
-               {
-                       this.Index = index;
-                       this.StartOffset = start_offset;
-               }
-
-               internal LexicalBlockEntry (int index, MyBinaryReader reader)
-               {
-                       this.Index = index;
-                       this.StartOffset = reader.ReadInt32 ();
-                       this.EndOffset = reader.ReadInt32 ();
-               }
-
-               public void Close (int end_offset)
-               {
-                       this.EndOffset = end_offset;
-               }
-
-               internal void Write (MyBinaryWriter bw)
-               {
-                       bw.Write (StartOffset);
-                       bw.Write (EndOffset);
-               }
-
-               public override string ToString ()
-               {
-                       return String.Format ("[LexicalBlock {0}:{1}]", StartOffset, EndOffset);
-               }
-       }
-
        public class CodeBlockEntry
        {
                public int Index;
@@ -333,10 +284,6 @@ namespace Mono.CompilerServices.SymbolWriter
                {
                        Index = reader.ReadLeb128 ();
                        Name = reader.ReadString ();
-                       if (file.CompatibilityMode) {
-                               int sig_length = reader.ReadLeb128 ();
-                               reader.BaseStream.Position += sig_length;
-                       }
                        BlockIndex = reader.ReadLeb128 ();
                }
 
@@ -344,8 +291,6 @@ namespace Mono.CompilerServices.SymbolWriter
                {
                        bw.WriteLeb128 (Index);
                        bw.Write (Name);
-                       if (file.CompatibilityMode)
-                               bw.WriteLeb128 (0);
                        bw.WriteLeb128 (BlockIndex);
                }
 
@@ -568,15 +513,6 @@ namespace Mono.CompilerServices.SymbolWriter
                        namespaces = new ArrayList ();
                }
 
-               [Obsolete]
-               public void DefineMethod (string name, int token, LocalVariableEntry[] locals,
-                                         LineNumberEntry[] lines, LexicalBlockEntry[] blocks,
-                                         int start, int end, int namespace_id)
-               {
-                       DefineMethod (token, null, locals, lines, null, null,
-                                     start, end, namespace_id);
-               }
-
                public void DefineMethod (int token, ScopeVariable[] scope_vars,
                                          LocalVariableEntry[] locals, LineNumberEntry[] lines,
                                          CodeBlockEntry[] blocks, string real_name,
@@ -827,11 +763,6 @@ namespace Mono.CompilerServices.SymbolWriter
                public readonly CodeBlockEntry[] CodeBlocks;
                public readonly ScopeVariable[] ScopeVariables;
 
-               [Obsolete]
-               public LexicalBlockEntry[] LexicalBlocks {
-                       get { return new LexicalBlockEntry [0]; }
-               }
-
                public readonly string RealName;
 
                public readonly MonoSymbolFile SymbolFile;
@@ -860,17 +791,15 @@ namespace Mono.CompilerServices.SymbolWriter
                        NamespaceID = reader.ReadInt32 ();
                        LocalNamesAmbiguous = reader.ReadInt32 () != 0;
 
-                       if (!file.CompatibilityMode) {
-                               NumCodeBlocks = reader.ReadInt32 ();
-                               CodeBlockTableOffset = reader.ReadInt32 ();
+                       NumCodeBlocks = reader.ReadInt32 ();
+                       CodeBlockTableOffset = reader.ReadInt32 ();
 
-                               NumScopeVariables = reader.ReadInt32 ();
-                               ScopeVariableTableOffset = reader.ReadInt32 ();
+                       NumScopeVariables = reader.ReadInt32 ();
+                       ScopeVariableTableOffset = reader.ReadInt32 ();
 
-                               RealNameOffset = reader.ReadInt32 ();
-                               if (RealNameOffset != 0)
-                                       RealName = file.ReadString (RealNameOffset);
-                       }
+                       RealNameOffset = reader.ReadInt32 ();
+                       if (RealNameOffset != 0)
+                               RealName = file.ReadString (RealNameOffset);
 
                        SourceFile = file.GetSourceFile (SourceFileIndex);
 
@@ -1078,15 +1007,13 @@ namespace Mono.CompilerServices.SymbolWriter
                        bw.Write (NamespaceID);
                        bw.Write (LocalNamesAmbiguous ? 1 : 0);
 
-                       if (!file.CompatibilityMode) {
-                               bw.Write (NumCodeBlocks);
-                               bw.Write (CodeBlockTableOffset);
+                       bw.Write (NumCodeBlocks);
+                       bw.Write (CodeBlockTableOffset);
 
-                               bw.Write (NumScopeVariables);
-                               bw.Write (ScopeVariableTableOffset);
+                       bw.Write (NumScopeVariables);
+                       bw.Write (ScopeVariableTableOffset);
 
-                               bw.Write (RealNameOffset);
-                       }
+                       bw.Write (RealNameOffset);
 
                        return new MethodSourceEntry (index, file_offset, StartRow, EndRow);
                }

diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolWriter.cs b/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolWriter.cs
index 43f219b188e41b72958731a9557af0fb2d5b1740..427de4a10f529a516e099fa4e280ac683e69fee2 100644 (file)
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolWriter.cs
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolWriter.cs
@@ -96,12 +96,6 @@ namespace Mono.CompilerServices.SymbolWriter
                public void CloseNamespace ()
                { }
 
-               [Obsolete("The signature argument is gone")]
-               public void DefineLocalVariable (int index, string name, byte[] signature)
-               {
-                       DefineLocalVariable (index, name);
-               }
-
                public void DefineLocalVariable (int index, string name)
                {
                        if (current_method == null)

diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/SymbolWriterImpl.cs b/mcs/class/Mono.CompilerServices.SymbolWriter/SymbolWriterImpl.cs
index 3958ea609d25bb0346e1505d5a62bdd2cc4cdc9e..d5254a394539cf56b36c0b93383797d37619b0e5 100644 (file)
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/SymbolWriterImpl.cs
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/SymbolWriterImpl.cs
@@ -155,7 +155,7 @@ namespace Mono.CompilerServices.SymbolWriter
                        int startOffset,
                        int endOffset)
                {
-                       msw.DefineLocalVariable (nextLocalIndex++, name, signature);
+                       msw.DefineLocalVariable (nextLocalIndex++, name);
                }
                
                public void DefineParameter (