2003-02-18 Martin Baulig <martin@ximian.com>

	* MonoSymbolFile.cs (MethodEntry.ThisTypeIndex): Renamed to
	ClassTypeIndex; provide this for all methods so we can get the
	class of static methods.

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

diff --git a/mcs/class/Mono.CSharp.Debugger/ChangeLog b/mcs/class/Mono.CSharp.Debugger/ChangeLog
index fcc0da911062c7247e3808f7d62916352b56bb19..d9d86490d9e1049ce5cc6f5891d5f859cc5c2b5c 100644 (file)
--- a/mcs/class/Mono.CSharp.Debugger/ChangeLog
+++ b/mcs/class/Mono.CSharp.Debugger/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-18  Martin Baulig  <martin@ximian.com>
+
+       * MonoSymbolFile.cs (MethodEntry.ThisTypeIndex): Renamed to
+       ClassTypeIndex; provide this for all methods so we can get the
+       class of static methods.
+
 2003-02-10  Nick Drochak  <ndrochak@gol.com>
 
        * Mono.CSharp.Debugger.build: passing the /r using an 'arg' node works.

diff --git a/mcs/class/Mono.CSharp.Debugger/MonoSymbolTable.cs b/mcs/class/Mono.CSharp.Debugger/MonoSymbolTable.cs
index 504136ff4207b52e30b2a0c9378b9e0fff124822..546503bd58f860ad1675e7f2048b43f4302e6adc 100644 (file)
--- a/mcs/class/Mono.CSharp.Debugger/MonoSymbolTable.cs
+++ b/mcs/class/Mono.CSharp.Debugger/MonoSymbolTable.cs
@@ -18,7 +18,7 @@ namespace Mono.CSharp.Debugger
 {
        public struct OffsetTable
        {
-               public const int  Version = 30;
+               public const int  Version = 31;
                public const long Magic   = 0x45e82623fd7fa614;
 
                public int TotalFileSize;
@@ -365,7 +365,7 @@ namespace Mono.CSharp.Debugger
                public readonly int Token;
                public readonly int StartRow;
                public readonly int EndRow;
-               public readonly int ThisTypeIndex;
+               public readonly int ClassTypeIndex;
                public readonly int NumParameters;
                public readonly int NumLocals;
                public readonly int NumLineNumbers;
@@ -411,7 +411,7 @@ namespace Mono.CSharp.Debugger
                        Token = reader.ReadInt32 ();
                        StartRow = reader.ReadInt32 ();
                        EndRow = reader.ReadInt32 ();
-                       ThisTypeIndex = reader.ReadInt32 ();
+                       ClassTypeIndex = reader.ReadInt32 ();
                        NumParameters = reader.ReadInt32 ();
                        NumLocals = reader.ReadInt32 ();
                        NumLineNumbers = reader.ReadInt32 ();
@@ -514,10 +514,7 @@ namespace Mono.CSharp.Debugger
                        for (int i = 0; i < NumLocals; i++)
                                LocalTypeIndices [i] = file.GetNextTypeIndex ();
 
-                       if (method.IsStatic)
-                               ThisTypeIndex = 0;
-                       else
-                               ThisTypeIndex = file.DefineType (method.ReflectedType);
+                       ClassTypeIndex = file.DefineType (method.ReflectedType);
                }
 
                LineNumberEntry[] BuildLineNumberTable (LineNumberEntry[] line_numbers)
@@ -581,7 +578,7 @@ namespace Mono.CSharp.Debugger
                        bw.Write (Token);
                        bw.Write (StartRow);
                        bw.Write (EndRow);
-                       bw.Write (ThisTypeIndex);
+                       bw.Write (ClassTypeIndex);
                        bw.Write (NumParameters);
                        bw.Write (NumLocals);
                        bw.Write (NumLineNumbers);
@@ -605,7 +602,7 @@ namespace Mono.CSharp.Debugger
                {
                        return String.Format ("[Method {0}:{1}:{2}:{3}:{4} - {7}:{8}:{9}:{10} - {5} - {6}]",
                                              index, Token, SourceFileIndex, StartRow, EndRow,
-                                             SourceFile, FullName, ThisTypeIndex, NumParameters,
+                                             SourceFile, FullName, ClassTypeIndex, NumParameters,
                                              NumLocals, NumLineNumbers);
                }
        }