Author: martin
Date: 2006-04-17 18:43:12 -0400 (Mon, 17 Apr 2006)
New Revision: 59550
Modified:
trunk/debugger/ChangeLog
trunk/debugger/arch/Bfd.cs
trunk/debugger/backends/MonoThreadManager.cs
trunk/debugger/backends/classes/TargetReader.cs
trunk/debugger/classes/StackFrame.cs
trunk/debugger/interfaces/ITargetMemoryAccess.cs
trunk/debugger/languages/mono/MonoLanguageBackend.cs
trunk/debugger/languages/mono/MonoSymbolFile.cs
Log:
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
* interfaces/ITargetMemoryAccess.cs
(ITargetMemoryReader): Removed this interface; `TargetReader' is
the only class implementing it.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2006-04-17 22:30:24 UTC (rev 59549)
+++ trunk/debugger/ChangeLog 2006-04-17 22:43:12 UTC (rev 59550)
@@ -1,5 +1,11 @@
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+ * interfaces/ITargetMemoryAccess.cs
+ (ITargetMemoryReader): Removed this interface; `TargetReader' is
+ the only class implementing it.
+
+2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+
* classes/ExceptionCatchPoint.cs
(ExceptionCatchPoint): Make this class sealed and rename
`CheckBreakpointHit' into `CheckException'.
Modified: trunk/debugger/arch/Bfd.cs
===================================================================
--- trunk/debugger/arch/Bfd.cs 2006-04-17 22:30:24 UTC (rev 59549)
+++ trunk/debugger/arch/Bfd.cs 2006-04-17 22:43:12 UTC (rev 59550)
@@ -95,9 +95,9 @@
return new TargetReader (data, bfd.info);
}
- public ITargetMemoryReader GetReader (TargetAddress
address)
+ public TargetReader GetReader (TargetAddress address)
{
- ITargetMemoryReader reader =
(ITargetMemoryReader) contents.Data;
+ TargetReader reader = (TargetReader)
contents.Data;
reader.Offset = address.Address - vma;
return reader;
}
@@ -768,7 +768,7 @@
return maps;
}
- public ITargetMemoryReader GetReader (TargetAddress address)
+ public TargetReader GetReader (TargetAddress address)
{
Section section = this [address.Address];
return section.GetReader (address);
Modified: trunk/debugger/backends/MonoThreadManager.cs
===================================================================
--- trunk/debugger/backends/MonoThreadManager.cs 2006-04-17 22:30:24 UTC
(rev 59549)
+++ trunk/debugger/backends/MonoThreadManager.cs 2006-04-17 22:43:12 UTC
(rev 59550)
@@ -309,7 +309,7 @@
public readonly TargetAddress Attach;
public readonly TargetAddress Initialize;
- internal MonoDebuggerInfo (ITargetMemoryReader reader)
+ internal MonoDebuggerInfo (TargetReader reader)
{
/* skip past magic, version, and total_size */
reader.Offset = 16;
Modified: trunk/debugger/backends/classes/TargetReader.cs
===================================================================
--- trunk/debugger/backends/classes/TargetReader.cs 2006-04-17 22:30:24 UTC
(rev 59549)
+++ trunk/debugger/backends/classes/TargetReader.cs 2006-04-17 22:43:12 UTC
(rev 59550)
@@ -86,7 +86,7 @@
}
[Serializable]
- internal class TargetReader : ITargetMemoryReader
+ internal class TargetReader : ITargetMemoryInfo
{
byte[] data;
TargetBinaryReader reader;
Modified: trunk/debugger/classes/StackFrame.cs
===================================================================
--- trunk/debugger/classes/StackFrame.cs 2006-04-17 22:30:24 UTC (rev
59549)
+++ trunk/debugger/classes/StackFrame.cs 2006-04-17 22:43:12 UTC (rev
59550)
@@ -320,7 +320,7 @@
}
}
- public StackFrame UnwindStack (ITargetMemoryAccess memory,
Architecture arch)
+ internal StackFrame UnwindStack (ITargetMemoryAccess memory,
Architecture arch)
{
if (parent_frame != null)
return parent_frame;
Modified: trunk/debugger/interfaces/ITargetMemoryAccess.cs
===================================================================
--- trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-17 22:30:24 UTC
(rev 59549)
+++ trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-17 22:43:12 UTC
(rev 59550)
@@ -45,57 +45,6 @@
}
}
- public interface ITargetMemoryReader : ITargetMemoryInfo
- {
- // <summary>
- // Position in the underlying memory stream.
- // </summary>
- long Offset {
- get; set;
- }
-
- // <summary>
- // Total size of this memory stream.
- // </summary>
- long Size {
- get;
- }
-
- // <summary>
- // The full contents of this memory stream.
- // </summary>
- byte[] Contents {
- get;
- }
-
- // <summary>
- // Get the underlying TargetBinaryReader.
- // </summary>
- TargetBinaryReader BinaryReader {
- get;
- }
-
- // <summary>
- // Read a single byte from the target's address space at
address @address.
- // </summary>
- byte ReadByte ();
-
- // <summary>
- // Read an integer from the target's address space at address
@address.
- // </summary>
- int ReadInteger ();
-
- // <summary>
- // Read a long int from the target's address space at address
@address.
- // </summary>
- long ReadLongInteger ();
-
- // <summary>
- // Read an address from the target's address space at address
@address.
- // </summary>
- TargetAddress ReadAddress ();
- }
-
public interface ITargetMemoryAccess : ITargetMemoryInfo
{
ITargetMemoryInfo TargetMemoryInfo {
Modified: trunk/debugger/languages/mono/MonoLanguageBackend.cs
===================================================================
--- trunk/debugger/languages/mono/MonoLanguageBackend.cs 2006-04-17
22:30:24 UTC (rev 59549)
+++ trunk/debugger/languages/mono/MonoLanguageBackend.cs 2006-04-17
22:43:12 UTC (rev 59550)
@@ -523,7 +523,7 @@
}
// This method reads a portion of the data table (defn in
mono-debug.h)
- void read_data_table (ITargetMemoryAccess memory,
ITargetMemoryReader header)
+ void read_data_table (ITargetMemoryAccess memory, TargetReader
header)
{
int num_data_tables = header.ReadInteger ();
TargetAddress data_tables = header.ReadAddress ();
@@ -611,7 +611,7 @@
}
}
- void read_range_entry (ITargetMemoryReader reader)
+ void read_range_entry (TargetReader reader)
{
int size = reader.BinaryReader.PeekInt32 ();
byte[] contents = reader.BinaryReader.PeekBuffer (size);
@@ -620,7 +620,7 @@
file.AddRangeEntry (reader, contents);
}
- void read_class_entry (ITargetMemoryReader reader)
+ void read_class_entry (TargetReader reader)
{
int size = reader.BinaryReader.PeekInt32 ();
byte[] contents = reader.BinaryReader.PeekBuffer (size);
@@ -637,7 +637,7 @@
file.AddClassEntry (reader, contents);
}
- void read_wrapper_entry (ITargetMemoryAccess memory,
ITargetMemoryReader reader)
+ void read_wrapper_entry (ITargetMemoryAccess memory,
TargetReader reader)
{
int size = reader.BinaryReader.PeekInt32 ();
byte[] contents = reader.BinaryReader.PeekBuffer (size);
Modified: trunk/debugger/languages/mono/MonoSymbolFile.cs
===================================================================
--- trunk/debugger/languages/mono/MonoSymbolFile.cs 2006-04-17 22:30:24 UTC
(rev 59549)
+++ trunk/debugger/languages/mono/MonoSymbolFile.cs 2006-04-17 22:43:12 UTC
(rev 59550)
@@ -330,7 +330,7 @@
get { return File != null; }
}
- internal void AddRangeEntry (ITargetMemoryReader reader, byte[]
contents)
+ internal void AddRangeEntry (TargetReader reader, byte[]
contents)
{
MethodRangeEntry range = MethodRangeEntry.Create (this,
reader, contents);
if (!range_hash.Contains (range.Index)) {
@@ -339,14 +339,14 @@
}
}
- internal void AddWrapperEntry (ITargetMemoryAccess memory,
ITargetMemoryReader reader,
+ internal void AddWrapperEntry (ITargetMemoryAccess memory,
TargetReader reader,
byte[] contents)
{
WrapperEntry wrapper = WrapperEntry.Create (this,
memory, reader, contents);
wrappers.Add (wrapper);
}
- internal void AddClassEntry (ITargetMemoryReader reader, byte[]
contents)
+ internal void AddClassEntry (TargetReader reader, byte[]
contents)
{
ClassEntry entry = new ClassEntry (this, reader,
contents);
class_entry_hash.Add (new TypeHashEntry (entry), entry);
@@ -1058,7 +1058,7 @@
this.contents = contents;
}
- public static MethodRangeEntry Create (MonoSymbolFile
file, ITargetMemoryReader reader,
+ public static MethodRangeEntry Create (MonoSymbolFile
file, TargetReader reader,
byte[] contents)
{
int domain = reader.BinaryReader.ReadInt32 ();
@@ -1120,7 +1120,7 @@
}
public static WrapperEntry Create (MonoSymbolFile file,
ITargetMemoryAccess memory,
- ITargetMemoryReader
reader, byte[] contents)
+ TargetReader reader,
byte[] contents)
{
int size = reader.BinaryReader.ReadInt32 ();
TargetAddress wrapper = reader.ReadAddress ();
@@ -1329,7 +1329,7 @@
public readonly TargetAddress KlassAddress;
readonly byte[] contents;
- public ClassEntry (MonoSymbolFile file,
ITargetMemoryReader reader, byte[] contents)
+ public ClassEntry (MonoSymbolFile file, TargetReader
reader, byte[] contents)
{
this.File = file;
this.contents = contents;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
