forgot to remove dead code
[mono.git] / mcs / class / Mono.CSharp.Debugger / MonoSymbolTable.cs
index 630330f67ce5b4267a350531cb9533da96b02f46..723643f52cab0dc361d43cd804bc2fe04280ff9c 100644 (file)
@@ -18,58 +18,55 @@ namespace Mono.CSharp.Debugger
 {
        public struct OffsetTable
        {
-               public const int Version = 25;
+               public const int  Version = 35;
                public const long Magic   = 0x45e82623fd7fa614;
 
-               public int total_file_size;
-               public int source_table_offset;
-               public int source_table_size;
-               public int method_count;
-               public int method_table_offset;
-               public int method_table_size;
-               public int line_number_table_offset;
-               public int line_number_table_size;
-               public int local_variable_table_offset;
-               public int local_variable_table_size;
-               public int type_count;
-               public int type_index_table_offset;
-               public int type_index_table_size;
-               public int address_table_size;
-
-               public OffsetTable (IMonoBinaryReader reader)
-               {
-                       total_file_size = reader.ReadInt32 ();
-                       source_table_offset = reader.ReadInt32 ();
-                       source_table_size = reader.ReadInt32 ();
-                       method_count = reader.ReadInt32 ();
-                       method_table_offset = reader.ReadInt32 ();
-                       method_table_size = reader.ReadInt32 ();
-                       line_number_table_offset = reader.ReadInt32 ();
-                       line_number_table_size = reader.ReadInt32 ();
-                       local_variable_table_offset = reader.ReadInt32 ();
-                       local_variable_table_size = reader.ReadInt32 ();
-                       type_count = reader.ReadInt32 ();
-                       type_index_table_offset = reader.ReadInt32 ();
-                       type_index_table_size = reader.ReadInt32 ();
-                       address_table_size = reader.ReadInt32 ();
-               }
-
-               public void Write (BinaryWriter bw)
-               {
-                       bw.Write (total_file_size);
-                       bw.Write (source_table_offset);
-                       bw.Write (source_table_size);
-                       bw.Write (method_count);
-                       bw.Write (method_table_offset);
-                       bw.Write (method_table_size);
-                       bw.Write (line_number_table_offset);
-                       bw.Write (line_number_table_size);
-                       bw.Write (local_variable_table_offset);
-                       bw.Write (local_variable_table_size);
-                       bw.Write (type_count);
-                       bw.Write (type_index_table_offset);
-                       bw.Write (type_index_table_size);
-                       bw.Write (address_table_size);
+               public int TotalFileSize;
+               public int DataSectionOffset;
+               public int DataSectionSize;
+               public int SourceCount;
+               public int SourceTableOffset;
+               public int SourceTableSize;
+               public int MethodCount;
+               public int MethodTableOffset;
+               public int MethodTableSize;
+               public int TypeCount;
+
+               internal OffsetTable (BinaryReader reader)
+               {
+                       TotalFileSize = reader.ReadInt32 ();
+                       DataSectionOffset = reader.ReadInt32 ();
+                       DataSectionSize = reader.ReadInt32 ();
+                       SourceCount = reader.ReadInt32 ();
+                       SourceTableOffset = reader.ReadInt32 ();
+                       SourceTableSize = reader.ReadInt32 ();
+                       MethodCount = reader.ReadInt32 ();
+                       MethodTableOffset = reader.ReadInt32 ();
+                       MethodTableSize = reader.ReadInt32 ();
+                       TypeCount = reader.ReadInt32 ();
+               }
+
+               internal void Write (BinaryWriter bw)
+               {
+                       bw.Write (TotalFileSize);
+                       bw.Write (DataSectionOffset);
+                       bw.Write (DataSectionSize);
+                       bw.Write (SourceCount);
+                       bw.Write (SourceTableOffset);
+                       bw.Write (SourceTableSize);
+                       bw.Write (MethodCount);
+                       bw.Write (MethodTableOffset);
+                       bw.Write (MethodTableSize);
+                       bw.Write (TypeCount);
+               }
+
+               public override string ToString ()
+               {
+                       return String.Format (
+                               "OffsetTable [{0} - {1}:{2} - {3}:{4}:{5} - {6}:{7}:{8} - {9}]",
+                               TotalFileSize, DataSectionOffset, DataSectionSize, SourceCount,
+                               SourceTableOffset, SourceTableSize, MethodCount, MethodTableOffset,
+                               MethodTableSize, TypeCount);
                }
        }
 
@@ -84,11 +81,9 @@ namespace Mono.CSharp.Debugger
                        this.Offset = offset;
                }
 
-               internal LineNumberEntry (SourceLine line)
-                       : this (line.Row, line.Offset)
-               { }
+               public static LineNumberEntry Null = new LineNumberEntry (0, 0);
 
-               public LineNumberEntry (IMonoBinaryReader reader)
+               internal LineNumberEntry (BinaryReader reader)
                {
                        Row = reader.ReadInt32 ();
                        Offset = reader.ReadInt32 ();
@@ -100,43 +95,117 @@ namespace Mono.CSharp.Debugger
                        bw.Write (Offset);
                }
 
+               private class OffsetComparerClass : IComparer
+               {
+                       public int Compare (object a, object b)
+                       {
+                               LineNumberEntry l1 = (LineNumberEntry) a;
+                               LineNumberEntry l2 = (LineNumberEntry) b;
+
+                               if (l1.Offset < l2.Offset)
+                                       return -1;
+                               else if (l1.Offset > l2.Offset)
+                                       return 1;
+                               else
+                                       return 0;
+                       }
+               }
+
+               private class RowComparerClass : IComparer
+               {
+                       public int Compare (object a, object b)
+                       {
+                               LineNumberEntry l1 = (LineNumberEntry) a;
+                               LineNumberEntry l2 = (LineNumberEntry) b;
+
+                               if (l1.Row < l2.Row)
+                                       return -1;
+                               else if (l1.Row > l2.Row)
+                                       return 1;
+                               else
+                                       return 0;
+                       }
+               }
+
+               public static readonly IComparer OffsetComparer = new OffsetComparerClass ();
+               public static readonly IComparer RowComparer = new RowComparerClass ();
+
                public override string ToString ()
                {
                        return String.Format ("[Line {0}:{1}]", Row, Offset);
                }
        }
 
+       public class LexicalBlockEntry
+       {
+               public int Index;
+               public int StartOffset;
+               public int EndOffset;
+
+               public LexicalBlockEntry (int index, int start_offset)
+               {
+                       this.Index = index;
+                       this.StartOffset = start_offset;
+               }
+
+               internal LexicalBlockEntry (int index, BinaryReader 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 (BinaryWriter bw)
+               {
+                       bw.Write (StartOffset);
+                       bw.Write (EndOffset);
+               }
+
+               public override string ToString ()
+               {
+                       return String.Format ("[LexicalBlock {0}:{1}]", StartOffset, EndOffset);
+               }
+       }
+
        public struct LocalVariableEntry
        {
                public readonly string Name;
                public readonly FieldAttributes Attributes;
                public readonly byte[] Signature;
+               public readonly int BlockIndex;
 
-               public LocalVariableEntry (string Name, FieldAttributes Attributes, byte[] Signature)
+               public LocalVariableEntry (string Name, FieldAttributes Attributes, byte[] Signature,
+                                          int BlockIndex)
                {
                        this.Name = Name;
                        this.Attributes = Attributes;
                        this.Signature = Signature;
+                       this.BlockIndex = BlockIndex;
                }
 
-               public LocalVariableEntry (IMonoBinaryReader reader)
+               internal LocalVariableEntry (BinaryReader reader)
                {
                        int name_length = reader.ReadInt32 ();
-                       byte[] name = reader.ReadBuffer (name_length);
+                       byte[] name = reader.ReadBytes (name_length);
                        Name = Encoding.UTF8.GetString (name);
                        Attributes = (FieldAttributes) reader.ReadInt32 ();
                        int sig_length = reader.ReadInt32 ();
-                       Signature = reader.ReadBuffer (sig_length);
+                       Signature = reader.ReadBytes (sig_length);
+                       BlockIndex = reader.ReadInt32 ();
                }
 
-               internal void Write (BinaryWriter bw)
+               internal void Write (MonoSymbolFile file, BinaryWriter bw)
                {
-                       byte[] name = Encoding.UTF8.GetBytes (Name);
-                       bw.Write ((int) name.Length);
-                       bw.Write (name);
+                       file.WriteString (bw, Name);
                        bw.Write ((int) Attributes);
                        bw.Write ((int) Signature.Length);
                        bw.Write (Signature);
+                       bw.Write (BlockIndex);
                }
 
                public override string ToString ()
@@ -145,186 +214,342 @@ namespace Mono.CSharp.Debugger
                }
        }
 
-       public class VariableInfo
+       public class SourceFileEntry
        {
-               public readonly int Index;
-               public readonly int Offset;
-               public readonly int Size;
-               public readonly AddressMode Mode;
-               public readonly int BeginScope;
-               public readonly int EndScope;
+               MonoSymbolFile file;
+               string file_name;
+               ArrayList methods;
+               ArrayList namespaces;
+               int index, count, name_offset, method_offset;
+               int namespace_count, nstable_offset;
+               bool creating;
+
+               public static int Size {
+                       get { return 24; }
+               }
 
-               public enum AddressMode : long
+               internal SourceFileEntry (MonoSymbolFile file, string file_name)
                {
-                       Stack           = 0,
-                       Register        = 0x10000000,
-                       TwoRegisters    = 0x20000000
+                       this.file = file;
+                       this.file_name = file_name;
+                       this.index = file.AddSource (this);
+
+                       creating = true;
+                       methods = new ArrayList ();
+                       namespaces = new ArrayList ();
+               }
+
+               public void DefineMethod (MethodBase method, int token, LocalVariableEntry[] locals,
+                                         LineNumberEntry[] lines, LexicalBlockEntry[] blocks,
+                                         int start, int end, int namespace_id)
+               {
+                       if (!creating)
+                               throw new InvalidOperationException ();
+
+                       MethodEntry entry = new MethodEntry (
+                               file, this, method, token, locals, lines, blocks, start, end, namespace_id);
+
+                       methods.Add (entry);
+                       file.AddMethod (entry);
+               }
+
+               public int DefineNamespace (string name, string[] using_clauses, int parent)
+               {
+                       if (!creating)
+                               throw new InvalidOperationException ();
+
+                       int index = file.GetNextNamespaceIndex ();
+                       NamespaceEntry ns = new NamespaceEntry (name, index, using_clauses, parent);
+                       namespaces.Add (ns);
+                       return index;
+               }
+
+               internal void WriteData (BinaryWriter bw)
+               {
+                       name_offset = (int) bw.BaseStream.Position;
+                       file.WriteString (bw, file_name);
+
+                       ArrayList list = new ArrayList ();
+                       foreach (MethodEntry entry in methods)
+                               list.Add (entry.Write (file, bw));
+                       list.Sort ();
+                       count = list.Count;
+
+                       method_offset = (int) bw.BaseStream.Position;
+                       foreach (MethodSourceEntry method in list)
+                               method.Write (bw);
+
+                       namespace_count = namespaces.Count;
+                       nstable_offset = (int) bw.BaseStream.Position;
+                       foreach (NamespaceEntry ns in namespaces)
+                               ns.Write (file, bw);
                }
 
-               const long AddressModeFlags = 0xf0000000;
+               internal void Write (BinaryWriter bw)
+               {
+                       bw.Write (index);
+                       bw.Write (count);
+                       bw.Write (namespace_count);
+                       bw.Write (name_offset);
+                       bw.Write (method_offset);
+                       bw.Write (nstable_offset);
+               }
 
-               public static int StructSize {
+               internal SourceFileEntry (MonoSymbolFile file, BinaryReader reader)
+               {
+                       this.file = file;
+
+                       index = reader.ReadInt32 ();
+                       count = reader.ReadInt32 ();
+                       namespace_count = reader.ReadInt32 ();
+                       name_offset = reader.ReadInt32 ();
+                       method_offset = reader.ReadInt32 ();
+                       nstable_offset = reader.ReadInt32 ();
+
+                       file_name = file.ReadString (name_offset);
+               }
+
+               public int Index {
+                       get { return index; }
+               }
+
+               public string FileName {
+                       get { return file_name; }
+               }
+
+               public MethodSourceEntry[] Methods {
                        get {
-                               return 20;
+                               if (creating)
+                                       throw new InvalidOperationException ();
+
+                               BinaryReader reader = file.BinaryReader;
+                               int old_pos = (int) reader.BaseStream.Position;
+
+                               reader.BaseStream.Position = method_offset;
+                               ArrayList list = new ArrayList ();
+                               for (int i = 0; i < count; i ++)
+                                       list.Add (new MethodSourceEntry (reader));
+                               reader.BaseStream.Position = old_pos;
+
+                               MethodSourceEntry[] retval = new MethodSourceEntry [count];
+                               list.CopyTo (retval, 0);
+                               return retval;
                        }
                }
 
-               public VariableInfo (IMonoBinaryReader reader)
+               public override string ToString ()
+               {
+                       return String.Format ("SourceFileEntry ({0}:{1}:{2})", index, file_name, count);
+               }
+       }
+
+       public struct MethodSourceEntry : IComparable
+       {
+               public readonly int Index;
+               public readonly int FileOffset;
+               public readonly int StartRow;
+               public readonly int EndRow;
+
+               public MethodSourceEntry (int index, int file_offset, int start, int end)
+               {
+                       this.Index = index;
+                       this.FileOffset = file_offset;
+                       this.StartRow = start;
+                       this.EndRow = end;
+               }
+
+               internal MethodSourceEntry (BinaryReader reader)
                {
                        Index = reader.ReadInt32 ();
-                       Offset = reader.ReadInt32 ();
-                       Size = reader.ReadInt32 ();
-                       BeginScope = reader.ReadInt32 ();
-                       EndScope = reader.ReadInt32 ();
+                       FileOffset = reader.ReadInt32 ();
+                       StartRow = reader.ReadInt32 ();
+                       EndRow = reader.ReadInt32 ();
+               }
 
-                       Mode = (AddressMode) (Index & AddressModeFlags);
-                       Index = (int) ((long) Index & ~AddressModeFlags);
+               public static int Size {
+                       get { return 16; }
+               }
 
-                       Console.WriteLine (this);
+               internal void Write (BinaryWriter bw)
+               {
+                       bw.Write (Index);
+                       bw.Write (FileOffset);
+                       bw.Write (StartRow);
+                       bw.Write (EndRow);
+               }
+
+               public int CompareTo (object obj)
+               {
+                       MethodSourceEntry method = (MethodSourceEntry) obj;
+
+                       if (method.StartRow < StartRow)
+                               return -1;
+                       else if (method.StartRow > StartRow)
+                               return 1;
+                       else
+                               return 0;
                }
 
                public override string ToString ()
                {
-                       return String.Format ("[VariableInfo {0}:{1:x}:{2:x}:{3:x}:{4:x}:{5:x}]",
-                                             Mode, Index, Offset, Size, BeginScope, EndScope);
+                       return String.Format ("MethodSourceEntry ({0}:{1}:{2}:{3})",
+                                             Index, FileOffset, StartRow, EndRow);
                }
        }
 
-       public class MethodAddress
+       public struct MethodIndexEntry
        {
-               public readonly long StartAddress;
-               public readonly long EndAddress;
-               public readonly int[] LineAddresses;
+               public readonly int FileOffset;
+               public readonly int FullNameOffset;
+               public readonly int Token;
 
                public static int Size {
-                       get {
-                               return 20;
-                       }
+                       get { return 12; }
+               }
+
+               public MethodIndexEntry (int offset, int name_offset, int token)
+               {
+                       this.FileOffset = offset;
+                       this.FullNameOffset = name_offset;
+                       this.Token = token;
+               }
+
+               internal MethodIndexEntry (BinaryReader reader)
+               {
+                       FileOffset = reader.ReadInt32 ();
+                       FullNameOffset = reader.ReadInt32 ();
+                       Token = reader.ReadInt32 ();
                }
 
-               public MethodAddress (MethodEntry entry, IMonoBinaryReader reader)
+               internal void Write (BinaryWriter bw)
                {
-                       StartAddress = reader.ReadInt64 ();
-                       EndAddress = reader.ReadInt64 ();
-                       LineAddresses = new int [entry.NumLineNumbers];
-                       for (int i = 0; i < entry.NumLineNumbers; i++)
-                               LineAddresses [i] = reader.ReadInt32 ();
+                       bw.Write (FileOffset);
+                       bw.Write (FullNameOffset);
+                       bw.Write (Token);
                }
 
                public override string ToString ()
                {
-                       return String.Format ("[Address {0:x}:{1:x}]",
-                                             StartAddress, EndAddress);
+                       return String.Format ("MethodIndexEntry ({0}:{1}:{2:x})",
+                                             FileOffset, FullNameOffset, Token);
                }
        }
 
        public class MethodEntry
        {
+               #region This is actually written to the symbol file
+               public readonly int SourceFileIndex;
                public readonly int Token;
                public readonly int StartRow;
                public readonly int EndRow;
-               public readonly int NumLineNumbers;
-               public readonly int ThisTypeIndex;
+               public readonly int ClassTypeIndex;
                public readonly int NumParameters;
                public readonly int NumLocals;
+               public readonly int NumLineNumbers;
+               public readonly int NamespaceID;
+               public readonly bool LocalNamesAmbiguous;
+
+               int NameOffset;
+               int FullNameOffset;
+               int TypeIndexTableOffset;
+               int LocalVariableTableOffset;
+               int LineNumberTableOffset;
+               int NumLexicalBlocks;
+               int LexicalBlockTableOffset;
+               #endregion
+
+               int file_offset;
+               string name;
+               string full_name;
+               MethodIndexEntry index_entry;
 
-               public int TypeIndexTableOffset;
-               public int LocalVariableTableOffset;
-               public readonly int SourceFileOffset;
-               public readonly int LineNumberTableOffset;
-               public readonly int AddressTableOffset;
-               public readonly int VariableTableOffset;
-               public readonly int AddressTableSize;
-
-               public readonly string SourceFile = null;
-               public readonly LineNumberEntry[] LineNumbers = null;
-               public readonly MethodAddress Address = null;
-               public readonly VariableInfo ThisVariable = null;
-               public readonly VariableInfo[] ParameterVarInfo = null;
-               public readonly VariableInfo[] LocalVarInfo = null;
-               public readonly int[] ParamTypeIndices = null;
-               public readonly int[] LocalTypeIndices = null;
-               public readonly LocalVariableEntry[] Locals = null;
-
-               public static int Size
-               {
-                       get {
-                               return 56;
-                       }
+               public readonly int Index;
+               public readonly SourceFileEntry SourceFile;
+               public readonly LineNumberEntry[] LineNumbers;
+               public readonly int[] ParamTypeIndices;
+               public readonly int[] LocalTypeIndices;
+               public readonly LocalVariableEntry[] Locals;
+               public readonly Type[] LocalTypes;
+               public readonly LexicalBlockEntry[] LexicalBlocks;
+
+               public readonly MonoSymbolFile SymbolFile;
+
+               public static int Size {
+                       get { return 52; }
                }
 
-               public MethodEntry (IMonoBinaryReader reader, IMonoBinaryReader address_reader)
+               public string Name {
+                       get { return name; }
+               }
+
+               public string FullName {
+                       get { return full_name; }
+               }
+
+               public MethodBase MethodBase {
+                       get { return SymbolFile.Assembly.MonoDebugger_GetMethod (Token); }
+               }
+
+               internal MethodEntry (MonoSymbolFile file, BinaryReader reader, int index)
                {
+                       this.SymbolFile = file;
+                       this.Index = index;
+                       SourceFileIndex = reader.ReadInt32 ();
                        Token = reader.ReadInt32 ();
                        StartRow = reader.ReadInt32 ();
                        EndRow = reader.ReadInt32 ();
-                       ThisTypeIndex = reader.ReadInt32 ();
+                       ClassTypeIndex = reader.ReadInt32 ();
                        NumParameters = reader.ReadInt32 ();
                        NumLocals = reader.ReadInt32 ();
-
                        NumLineNumbers = reader.ReadInt32 ();
+                       NameOffset = reader.ReadInt32 ();
+                       FullNameOffset = reader.ReadInt32 ();
                        TypeIndexTableOffset = reader.ReadInt32 ();
                        LocalVariableTableOffset = reader.ReadInt32 ();
-                       SourceFileOffset = reader.ReadInt32 ();
                        LineNumberTableOffset = reader.ReadInt32 ();
-                       AddressTableOffset = reader.ReadInt32 ();
-                       VariableTableOffset = reader.ReadInt32 ();
-                       AddressTableSize = reader.ReadInt32 ();
-
-                       if (SourceFileOffset != 0) {
-                               long old_pos = reader.Position;
-                               reader.Position = SourceFileOffset;
-                               int source_file_length = reader.ReadInt32 ();
-                               byte[] source_file = reader.ReadBuffer (source_file_length);
-                               SourceFile = Encoding.UTF8.GetString (source_file);
-                               reader.Position = old_pos;
-                       }
+                       NumLexicalBlocks = reader.ReadInt32 ();
+                       LexicalBlockTableOffset = reader.ReadInt32 ();
+                       NamespaceID = reader.ReadInt32 ();
+                       LocalNamesAmbiguous = reader.ReadInt32 () != 0;
+
+                       name = file.ReadString (NameOffset);
+                       full_name = file.ReadString (FullNameOffset);
+
+                       SourceFile = file.GetSourceFile (SourceFileIndex);
 
                        if (LineNumberTableOffset != 0) {
-                               long old_pos = reader.Position;
-                               reader.Position = LineNumberTableOffset;
+                               long old_pos = reader.BaseStream.Position;
+                               reader.BaseStream.Position = LineNumberTableOffset;
 
                                LineNumbers = new LineNumberEntry [NumLineNumbers];
 
                                for (int i = 0; i < NumLineNumbers; i++)
                                        LineNumbers [i] = new LineNumberEntry (reader);
 
-                               reader.Position = old_pos;
+                               reader.BaseStream.Position = old_pos;
                        }
 
                        if (LocalVariableTableOffset != 0) {
-                               long old_pos = reader.Position;
-                               reader.Position = LocalVariableTableOffset;
+                               long old_pos = reader.BaseStream.Position;
+                               reader.BaseStream.Position = LocalVariableTableOffset;
 
                                Locals = new LocalVariableEntry [NumLocals];
+                               LocalTypes = new Type [NumLocals];
 
-                               for (int i = 0; i < NumLocals; i++)
-                                       Locals [i] = new LocalVariableEntry (reader);
+                               Assembly ass = file.Assembly;
 
-                               reader.Position = old_pos;
-                       }
+                               for (int i = 0; i < NumLocals; i++) {
+                                       Locals [i] = new LocalVariableEntry (reader);
+                                       LocalTypes [i] = ass.MonoDebugger_GetLocalTypeFromSignature (
+                                               Locals [i].Signature);
+                               }
 
-                       if (AddressTableSize != 0) {
-                               long old_pos = address_reader.Position;
-                               address_reader.Position = AddressTableOffset;
-                               int is_valid = address_reader.ReadInt32 ();
-                               if (is_valid != 0)
-                                       Address = new MethodAddress (this, address_reader);
-                               address_reader.Position = VariableTableOffset;
-                               if (ThisTypeIndex != 0)
-                                       ThisVariable = new VariableInfo (address_reader);
-                               ParameterVarInfo = new VariableInfo [NumParameters];
-                               for (int i = 0; i < NumParameters; i++)
-                                       ParameterVarInfo [i] = new VariableInfo (address_reader);
-                               LocalVarInfo = new VariableInfo [NumLocals];
-                               for (int i = 0; i < NumLocals; i++)
-                                       LocalVarInfo [i] = new VariableInfo (address_reader);
-                               address_reader.Position = old_pos;
+                               reader.BaseStream.Position = old_pos;
                        }
 
                        if (TypeIndexTableOffset != 0) {
-                               long old_pos = reader.Position;
-                               reader.Position = TypeIndexTableOffset;
+                               long old_pos = reader.BaseStream.Position;
+                               reader.BaseStream.Position = TypeIndexTableOffset;
 
                                ParamTypeIndices = new int [NumParameters];
                                LocalTypeIndices = new int [NumLocals];
@@ -334,60 +559,206 @@ namespace Mono.CSharp.Debugger
                                for (int i = 0; i < NumLocals; i++)
                                        LocalTypeIndices [i] = reader.ReadInt32 ();
 
-                               reader.Position = old_pos;
+                               reader.BaseStream.Position = old_pos;
+                       }
+
+                       if (LexicalBlockTableOffset != 0) {
+                               long old_pos = reader.BaseStream.Position;
+                               reader.BaseStream.Position = LexicalBlockTableOffset;
+
+                               LexicalBlocks = new LexicalBlockEntry [NumLexicalBlocks];
+                               for (int i = 0; i < NumLexicalBlocks; i++)
+                                       LexicalBlocks [i] = new LexicalBlockEntry (i, reader);
+
+                               reader.BaseStream.Position = old_pos;
                        }
                }
 
-               internal MethodEntry (int token, int sf_offset, string source_file,
-                                     int this_type_index, int[] param_type_indices,
-                                     int[] local_type_indices, LocalVariableEntry[] locals,
-                                     LineNumberEntry[] lines, int lnt_offset,
-                                     int addrtab_offset, int vartab_offset, int addrtab_size,
-                                     int start_row, int end_row)
+               internal MethodEntry (MonoSymbolFile file, SourceFileEntry source, MethodBase method,
+                                     int token, LocalVariableEntry[] locals, LineNumberEntry[] lines,
+                                     LexicalBlockEntry[] blocks, int start_row, int end_row,
+                                     int namespace_id)
                {
-                       this.Token = token;
-                       this.StartRow = start_row;
-                       this.EndRow = end_row;
-                       this.NumLineNumbers = lines.Length;
-                       this.ThisTypeIndex = this_type_index;
-                       this.NumParameters = param_type_indices.Length;
-                       this.NumLocals = local_type_indices.Length;
-                       this.ParamTypeIndices = param_type_indices;
-                       this.LocalTypeIndices = local_type_indices;
-                       this.Locals = locals;
-                       this.SourceFileOffset = sf_offset;
-                       this.LineNumberTableOffset = lnt_offset;
-                       this.AddressTableOffset = addrtab_offset;
-                       this.VariableTableOffset = vartab_offset;
-                       this.AddressTableSize = addrtab_size;
-                       this.SourceFile = source_file;
-                       this.LineNumbers = lines;
+                       this.SymbolFile = file;
+                       Index = file.GetNextMethodIndex ();
+
+                       Token = token;
+                       SourceFileIndex = source.Index;
+                       SourceFile = source;
+                       StartRow = start_row;
+                       EndRow = end_row;
+                       NamespaceID = namespace_id;
+                       LexicalBlocks = blocks;
+                       NumLexicalBlocks = LexicalBlocks.Length;
+
+                       LineNumbers = lines;
+                       NumLineNumbers = LineNumbers.Length;
+
+                       ParameterInfo[] parameters = method.GetParameters ();
+                       if (parameters == null)
+                               parameters = new ParameterInfo [0];
+                       
+                       if (parameters.Length == 0)
+                               full_name = method.DeclaringType.FullName + "." + method.Name + "()";
+                       else if (parameters.Length == 1)
+                               full_name = method.DeclaringType.FullName + "." + method.Name + "(" + parameters [0].ParameterType.FullName +  ")";
+                       else if (parameters.Length == 2)
+                               full_name = method.DeclaringType.FullName + "." + method.Name + "(" + parameters [0].ParameterType.FullName + "," + parameters [1].ParameterType.FullName + ")";
+                       else {
+                               StringBuilder sb = new StringBuilder ();
+                               sb.Append (method.DeclaringType.FullName);
+                               sb.Append (".");
+                               sb.Append (method.Name);
+                               sb.Append ("(");
+                               for (int i = 0; i < parameters.Length; i++) {
+                                       if (i > 0)
+                                               sb.Append (",");
+                                       sb.Append (parameters [i].ParameterType.FullName);
+                               }
+                               sb.Append (")");
+                               full_name = sb.ToString ();
+                       }
+
+                       name = method.Name;
+                       
+                       NumParameters = parameters.Length;
+                       ParamTypeIndices = new int [NumParameters];
+                       for (int i = 0; i < NumParameters; i++)
+                               ParamTypeIndices [i] = file.DefineType (parameters [i].ParameterType);
+
+                       NumLocals = locals.Length;
+                       Locals = locals;
+
+                       if (NumLocals <= 32) {
+                               // Most of the time, the O(n^2) factor is actually
+                               // less than the cost of allocating the hash table,
+                               // 32 is a rough number obtained through some testing.
+                               
+                               for (int i = 0; i < NumLocals; i ++) {
+                                       string nm = locals [i].Name;
+                                       
+                                       for (int j = i + 1; j < NumLocals; j ++) {
+                                               if (locals [j].Name == nm) {
+                                                       LocalNamesAmbiguous = true;
+                                                       goto locals_check_done;
+                                               }
+                                       }
+                               }
+                       locals_check_done :
+                               ;
+                       } else {
+                               Hashtable local_names = new Hashtable ();
+                               foreach (LocalVariableEntry local in locals) {
+                                       if (local_names.Contains (local.Name)) {
+                                               LocalNamesAmbiguous = true;
+                                               break;
+                                       }
+                                       local_names.Add (local.Name, local);
+                               }
+                       }
+
+                       LocalTypeIndices = new int [NumLocals];
+                       for (int i = 0; i < NumLocals; i++)
+                               LocalTypeIndices [i] = file.GetNextTypeIndex ();
+
+                       ClassTypeIndex = file.DefineType (method.ReflectedType);
                }
 
-               internal void Write (BinaryWriter bw)
+               internal MethodSourceEntry Write (MonoSymbolFile file, BinaryWriter bw)
                {
+                       NameOffset = (int) bw.BaseStream.Position;
+                       file.WriteString (bw, name);
+
+                       FullNameOffset = (int) bw.BaseStream.Position;
+                       file.WriteString (bw, full_name);
+
+                       TypeIndexTableOffset = (int) bw.BaseStream.Position;
+
+                       for (int i = 0; i < NumParameters; i++)
+                               bw.Write (ParamTypeIndices [i]);
+                       for (int i = 0; i < NumLocals; i++)
+                               bw.Write (LocalTypeIndices [i]);
+
+                       LocalVariableTableOffset = (int) bw.BaseStream.Position;
+                       for (int i = 0; i < NumLocals; i++)
+                               Locals [i].Write (file, bw);
+                       file.LocalCount += NumLocals;
+
+                       LineNumberTableOffset = (int) bw.BaseStream.Position;
+                       for (int i = 0; i < NumLineNumbers; i++)
+                               LineNumbers [i].Write (bw);
+                       file.LineNumberCount += NumLineNumbers;
+
+                       LexicalBlockTableOffset = (int) bw.BaseStream.Position;
+                       for (int i = 0; i < NumLexicalBlocks; i++)
+                               LexicalBlocks [i].Write (bw);
+                       file_offset = (int) bw.BaseStream.Position;
+
+                       index_entry = new MethodIndexEntry (file_offset, FullNameOffset, Token);
+
+                       bw.Write (SourceFileIndex);
                        bw.Write (Token);
                        bw.Write (StartRow);
                        bw.Write (EndRow);
-                       bw.Write (ThisTypeIndex);
+                       bw.Write (ClassTypeIndex);
                        bw.Write (NumParameters);
                        bw.Write (NumLocals);
                        bw.Write (NumLineNumbers);
+                       bw.Write (NameOffset);
+                       bw.Write (FullNameOffset);
                        bw.Write (TypeIndexTableOffset);
                        bw.Write (LocalVariableTableOffset);
-                       bw.Write (SourceFileOffset);
                        bw.Write (LineNumberTableOffset);
-                       bw.Write (AddressTableOffset);
-                       bw.Write (VariableTableOffset);
-                       bw.Write (AddressTableSize);
+                       bw.Write (NumLexicalBlocks);
+                       bw.Write (LexicalBlockTableOffset);
+                       bw.Write (NamespaceID);
+                       bw.Write (LocalNamesAmbiguous ? 1 : 0);
+
+                       return new MethodSourceEntry (Index, file_offset, StartRow, EndRow);
+               }
+
+               internal void WriteIndex (BinaryWriter bw)
+               {
+                       index_entry.Write (bw);
+               }
+
+               public override string ToString ()
+               {
+                       return String.Format ("[Method {0}:{1}:{2}:{3}:{4} - {7}:{8}:{9}:{10} - {5} - {6}]",
+                                             Index, Token, SourceFileIndex, StartRow, EndRow,
+                                             SourceFile, FullName, ClassTypeIndex, NumParameters,
+                                             NumLocals, NumLineNumbers);
+               }
+       }
+
+       public struct NamespaceEntry
+       {
+               public readonly string Name;
+               public readonly int Index;
+               public readonly int Parent;
+               public readonly string[] UsingClauses;
+
+               public NamespaceEntry (string name, int index, string[] using_clauses, int parent)
+               {
+                       this.Name = name;
+                       this.Index = index;
+                       this.Parent = parent;
+                       this.UsingClauses = using_clauses != null ? using_clauses : new string [0];
+               }
+
+               internal void Write (MonoSymbolFile file, BinaryWriter bw)
+               {
+                       file.WriteString (bw, Name);
+                       bw.Write (Index);
+                       bw.Write (Parent);
+                       bw.Write (UsingClauses.Length);
+                       foreach (string uc in UsingClauses)
+                               file.WriteString (bw, uc);
                }
 
                public override string ToString ()
                {
-                       return String.Format ("[Method {0}:{1}:{2}:{3}:{4} - {5}:{6}:{7}:{8}]",
-                                             Token, SourceFile, StartRow, EndRow, NumLineNumbers,
-                                             SourceFileOffset, LineNumberTableOffset, AddressTableOffset,
-                                             AddressTableSize);
+                       return String.Format ("[Namespace {0}:{1}:{2}]", Name, Index, Parent);
                }
        }
 }