Author: martin
Date: 2006-04-17 20:31:37 -0400 (Mon, 17 Apr 2006)
New Revision: 59558
Modified:
trunk/debugger/ChangeLog
trunk/debugger/arch/Bfd.cs
trunk/debugger/arch/BfdContainer.cs
trunk/debugger/arch/CoreFile.cs
trunk/debugger/backends/Inferior.cs
trunk/debugger/backends/SingleSteppingEngine.cs
trunk/debugger/backends/TargetAccess.cs
trunk/debugger/backends/Thread.cs
trunk/debugger/backends/classes/MonoVariableLocation.cs
trunk/debugger/backends/classes/TargetReader.cs
trunk/debugger/classes/StackFrame.cs
trunk/debugger/interfaces/ITargetMemoryAccess.cs
trunk/debugger/languages/mono/MonoArrayObject.cs
trunk/debugger/languages/mono/MonoClassInfo.cs
trunk/debugger/languages/mono/MonoClassType.cs
trunk/debugger/languages/mono/MonoLanguageBackend.cs
trunk/debugger/languages/mono/MonoSymbolFile.cs
Log:
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
* interfaces/ITargetMemoryAccess.cs
(ITargetMemoryAccess): Only implement `ITargetInfo'.
(ITargetMemoryAccess.TargetMemoryInfo): Removed.
(ITargetMemoryAccess.Architecture): New property.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2006-04-18 00:18:22 UTC (rev 59557)
+++ trunk/debugger/ChangeLog 2006-04-18 00:31:37 UTC (rev 59558)
@@ -1,6 +1,13 @@
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
* interfaces/ITargetMemoryAccess.cs
+ (ITargetMemoryAccess): Only implement `ITargetInfo'.
+ (ITargetMemoryAccess.TargetMemoryInfo): Removed.
+ (ITargetMemoryAccess.Architecture): New property.
+
+2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+
+ * interfaces/ITargetMemoryAccess.cs
(ITargetMemoryInfo.AddressDomain): Moved into `ITargetInfo'.
(ITargetInfo.AddressDomain): Moved here from `ITargetMemoryInfo'.
Modified: trunk/debugger/arch/Bfd.cs
===================================================================
--- trunk/debugger/arch/Bfd.cs 2006-04-18 00:18:22 UTC (rev 59557)
+++ trunk/debugger/arch/Bfd.cs 2006-04-18 00:31:37 UTC (rev 59558)
@@ -16,7 +16,7 @@
IntPtr bfd;
protected Module module;
protected BfdContainer container;
- protected ITargetMemoryInfo info;
+ protected ITargetInfo info;
protected Bfd main_bfd;
protected Architecture arch;
TargetAddress first_link_map = TargetAddress.Null;
@@ -169,7 +169,7 @@
bfd_init ();
}
- public Bfd (BfdContainer container, ITargetMemoryInfo info,
string filename,
+ public Bfd (BfdContainer container, ITargetInfo info, string
filename,
Bfd main_bfd, TargetAddress base_address, bool
is_loaded)
{
this.container = container;
Modified: trunk/debugger/arch/BfdContainer.cs
===================================================================
--- trunk/debugger/arch/BfdContainer.cs 2006-04-18 00:18:22 UTC (rev 59557)
+++ trunk/debugger/arch/BfdContainer.cs 2006-04-18 00:31:37 UTC (rev 59558)
@@ -45,7 +45,7 @@
language = new NativeLanguage (this, info);
}
- public Bfd AddFile (ITargetMemoryInfo memory, string filename,
+ public Bfd AddFile (ITargetInfo memory, string filename,
TargetAddress base_address, bool step_info,
bool is_loaded)
{
check_disposed ();
Modified: trunk/debugger/arch/CoreFile.cs
===================================================================
--- trunk/debugger/arch/CoreFile.cs 2006-04-18 00:18:22 UTC (rev 59557)
+++ trunk/debugger/arch/CoreFile.cs 2006-04-18 00:31:37 UTC (rev 59558)
@@ -193,10 +193,6 @@
get { return CoreFile.TargetInfo; }
}
- internal override ITargetMemoryInfo TargetMemoryInfo {
- get { return CoreFile.TargetMemoryInfo; }
- }
-
public override Backtrace GetBacktrace (int max_frames)
{
current_backtrace = new Backtrace
(CurrentFrame);
Modified: trunk/debugger/backends/Inferior.cs
===================================================================
--- trunk/debugger/backends/Inferior.cs 2006-04-18 00:18:22 UTC (rev 59557)
+++ trunk/debugger/backends/Inferior.cs 2006-04-18 00:31:37 UTC (rev 59558)
@@ -1176,7 +1176,7 @@
{
TargetAddress address, stack, frame;
- internal StackFrame (ITargetMemoryInfo info,
ServerStackFrame frame)
+ internal StackFrame (ITargetInfo info, ServerStackFrame
frame)
{
this.address = new TargetAddress
(info.AddressDomain, frame.Address);
this.stack = new TargetAddress
(info.AddressDomain, frame.StackPointer);
Modified: trunk/debugger/backends/SingleSteppingEngine.cs
===================================================================
--- trunk/debugger/backends/SingleSteppingEngine.cs 2006-04-18 00:18:22 UTC
(rev 59557)
+++ trunk/debugger/backends/SingleSteppingEngine.cs 2006-04-18 00:31:37 UTC
(rev 59558)
@@ -684,13 +684,6 @@
}
#endregion
- internal override ITargetMemoryInfo TargetMemoryInfo {
- get {
- check_inferior ();
- return inferior.TargetMemoryInfo;
- }
- }
-
public override ITargetInfo TargetInfo {
get {
check_inferior ();
@@ -715,7 +708,7 @@
}
public override AddressDomain AddressDomain {
- get { return TargetMemoryInfo.AddressDomain; }
+ get { return TargetInfo.AddressDomain; }
}
public TargetMemoryArea[] GetMemoryMaps ()
Modified: trunk/debugger/backends/TargetAccess.cs
===================================================================
--- trunk/debugger/backends/TargetAccess.cs 2006-04-18 00:18:22 UTC (rev
59557)
+++ trunk/debugger/backends/TargetAccess.cs 2006-04-18 00:31:37 UTC (rev
59558)
@@ -16,14 +16,6 @@
get;
}
- internal abstract ITargetMemoryInfo TargetMemoryInfo {
- get;
- }
-
- ITargetMemoryInfo ITargetMemoryAccess.TargetMemoryInfo {
- get { return TargetMemoryInfo; }
- }
-
public abstract TargetState State {
get;
}
Modified: trunk/debugger/backends/Thread.cs
===================================================================
--- trunk/debugger/backends/Thread.cs 2006-04-18 00:18:22 UTC (rev 59557)
+++ trunk/debugger/backends/Thread.cs 2006-04-18 00:31:37 UTC (rev 59558)
@@ -42,7 +42,6 @@
operation_completed_event = new ST.ManualResetEvent
(false);
this.target_info = engine.TargetInfo;
- this.target_memory_info = engine.TargetMemoryInfo;
}
internal Thread (TargetAccess target, int pid)
@@ -62,7 +61,6 @@
operation_completed_event = new ST.ManualResetEvent
(false);
this.target_info = target.TargetInfo;
- this.target_memory_info = target.TargetMemoryInfo;
}
bool is_daemon;
@@ -76,7 +74,6 @@
SymbolTableManager symtab_manager;
ST.ManualResetEvent operation_completed_event;
ITargetInfo target_info;
- ITargetMemoryInfo target_memory_info;
public ST.WaitHandle WaitHandle {
get { return operation_completed_event; }
@@ -137,7 +134,7 @@
public override Architecture Architecture {
get {
check_target ();
- return target_memory_info.Architecture;
+ return target.Architecture;
}
}
@@ -663,10 +660,6 @@
get { return target_info; }
}
- internal override ITargetMemoryInfo TargetMemoryInfo {
- get { return target_memory_info; }
- }
-
#region ITargetInfo implementation
public override int TargetAddressSize {
get { return target_info.TargetAddressSize; }
@@ -694,7 +687,7 @@
public override AddressDomain AddressDomain {
get {
- return target_memory_info.AddressDomain;
+ return target_info.AddressDomain;
}
}
Modified: trunk/debugger/backends/classes/MonoVariableLocation.cs
===================================================================
--- trunk/debugger/backends/classes/MonoVariableLocation.cs 2006-04-18
00:18:22 UTC (rev 59557)
+++ trunk/debugger/backends/classes/MonoVariableLocation.cs 2006-04-18
00:31:37 UTC (rev 59558)
@@ -44,7 +44,7 @@
address = TargetAddress.Null;
else
address = new TargetAddress (
- target.TargetMemoryInfo.AddressDomain,
contents + regoffset);
+ target.AddressDomain, contents +
regoffset);
if (is_byref && is_regoffset)
address = target.TargetMemoryAccess.ReadAddress
(address);
@@ -102,10 +102,10 @@
long contents;
- if (data.Length >
target.TargetMemoryInfo.TargetIntegerSize)
+ if (data.Length > target.TargetInfo.TargetIntegerSize)
throw new InternalError ();
- if (data.Length <
target.TargetMemoryInfo.TargetIntegerSize) {
+ if (data.Length < target.TargetInfo.TargetIntegerSize) {
switch (data.Length) {
case 1: contents = data[0]; break;
case 2: contents = BitConverter.ToInt16 (data,
0); break;
@@ -114,9 +114,9 @@
throw new InternalError ();
}
}
- else if (target.TargetMemoryInfo.TargetIntegerSize == 4)
+ else if (target.TargetInfo.TargetIntegerSize == 4)
contents = BitConverter.ToInt32 (data, 0);
- else if (target.TargetMemoryInfo.TargetIntegerSize == 8)
+ else if (target.TargetInfo.TargetIntegerSize == 8)
contents = BitConverter.ToInt64 (data, 0);
else
throw new InternalError ();
@@ -135,8 +135,7 @@
TargetAddress the_addr;
if (is_byref)
the_addr = new TargetAddress (
-
target.TargetMemoryInfo.AddressDomain,
- register.Value + regoffset);
+ target.AddressDomain,
register.Value + regoffset);
else
the_addr = address;
Modified: trunk/debugger/backends/classes/TargetReader.cs
===================================================================
--- trunk/debugger/backends/classes/TargetReader.cs 2006-04-18 00:18:22 UTC
(rev 59557)
+++ trunk/debugger/backends/classes/TargetReader.cs 2006-04-18 00:31:37 UTC
(rev 59558)
@@ -85,9 +85,9 @@
{
byte[] data;
TargetBinaryReader reader;
- ITargetMemoryInfo info;
+ ITargetInfo info;
- internal TargetReader (byte[] data, ITargetMemoryInfo info)
+ internal TargetReader (byte[] data, ITargetInfo info)
{
if ((info == null) || (data == null))
throw new ArgumentNullException ();
@@ -96,7 +96,7 @@
this.data = data;
}
- internal TargetReader (TargetBlob data, ITargetMemoryInfo info)
+ internal TargetReader (TargetBlob data, ITargetInfo info)
: this (data.Contents, info)
{ }
Modified: trunk/debugger/classes/StackFrame.cs
===================================================================
--- trunk/debugger/classes/StackFrame.cs 2006-04-18 00:18:22 UTC (rev
59557)
+++ trunk/debugger/classes/StackFrame.cs 2006-04-18 00:31:37 UTC (rev
59558)
@@ -79,7 +79,7 @@
if (addr_on_stack.IsNull)
target.TargetMemoryAccess.SetRegisters
(registers);
- else if (Size ==
target.TargetMemoryInfo.TargetIntegerSize)
+ else if (Size == target.TargetInfo.TargetIntegerSize)
target.TargetMemoryAccess.WriteInteger
(addr_on_stack, (int) value);
else
target.TargetMemoryAccess.WriteLongInteger
(addr_on_stack, value);
Modified: trunk/debugger/interfaces/ITargetMemoryAccess.cs
===================================================================
--- trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-18 00:18:22 UTC
(rev 59557)
+++ trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-18 00:31:37 UTC
(rev 59558)
@@ -45,9 +45,9 @@
}
}
- internal interface ITargetMemoryAccess : ITargetMemoryInfo
+ internal interface ITargetMemoryAccess : ITargetInfo
{
- ITargetMemoryInfo TargetMemoryInfo {
+ Architecture Architecture {
get;
}
Modified: trunk/debugger/languages/mono/MonoArrayObject.cs
===================================================================
--- trunk/debugger/languages/mono/MonoArrayObject.cs 2006-04-18 00:18:22 UTC
(rev 59557)
+++ trunk/debugger/languages/mono/MonoArrayObject.cs 2006-04-18 00:31:37 UTC
(rev 59558)
@@ -23,7 +23,7 @@
reader.Position = 2 *
reader.TargetInfo.TargetAddressSize;
TargetAddress bounds_address = new TargetAddress (
- target.TargetMemoryInfo.AddressDomain,
reader.ReadAddress ());
+ target.AddressDomain, reader.ReadAddress ());
TargetBinaryReader breader =
target.TargetMemoryAccess.ReadMemory (
bounds_address, 8 * Rank).GetReader ();
Modified: trunk/debugger/languages/mono/MonoClassInfo.cs
===================================================================
--- trunk/debugger/languages/mono/MonoClassInfo.cs 2006-04-18 00:18:22 UTC
(rev 59557)
+++ trunk/debugger/languages/mono/MonoClassInfo.cs 2006-04-18 00:31:37 UTC
(rev 59558)
@@ -79,7 +79,7 @@
field_offsets = new int [field_count];
for (int i = 0; i < field_count; i++) {
info.Position = i * builtin.FieldInfoSize +
- 2 *
target.TargetMemoryInfo.TargetAddressSize;
+ 2 * target.TargetInfo.TargetAddressSize;
field_offsets [i] = info.ReadInt32 ();
}
@@ -88,10 +88,10 @@
int method_count =
target.TargetMemoryAccess.ReadInteger (
KlassAddress + builtin.KlassMethodCountOffset);
TargetBlob blob = target.TargetMemoryAccess.ReadMemory (
- method_info, method_count *
target.TargetMemoryInfo.TargetAddressSize);
+ method_info, method_count *
target.TargetInfo.TargetAddressSize);
methods = new Hashtable ();
- TargetReader reader = new TargetReader (blob.Contents,
target.TargetMemoryInfo);
+ TargetReader reader = new TargetReader (blob.Contents,
target.TargetInfo);
for (int i = 0; i < method_count; i++) {
TargetAddress address = reader.ReadAddress ();
@@ -123,7 +123,7 @@
int offset = GetFieldOffset (finfo);
if (!type.IsByRef)
- offset -= 2 *
target.TargetMemoryInfo.TargetAddressSize;
+ offset -= 2 *
target.TargetInfo.TargetAddressSize;
TargetLocation field_loc = location.GetLocationAtOffset
(offset);
if (finfo.Type.IsByRef)
@@ -142,7 +142,7 @@
int offset = GetFieldOffset (finfo);
if (!type.IsByRef)
- offset -= 2 *
target.TargetMemoryInfo.TargetAddressSize;
+ offset -= 2 *
target.TargetInfo.TargetAddressSize;
TargetLocation field_loc = location.GetLocationAtOffset
(offset);
if (finfo.Type.IsByRef)
Modified: trunk/debugger/languages/mono/MonoClassType.cs
===================================================================
--- trunk/debugger/languages/mono/MonoClassType.cs 2006-04-18 00:18:22 UTC
(rev 59557)
+++ trunk/debugger/languages/mono/MonoClassType.cs 2006-04-18 00:31:37 UTC
(rev 59558)
@@ -462,7 +462,7 @@
{
TargetBlob blob = target.TargetMemoryAccess.ReadMemory (
address, language.BuiltinTypes.KlassSize);
- TargetReader reader = new TargetReader (blob,
target.TargetMemoryInfo);
+ TargetReader reader = new TargetReader (blob,
target.TargetInfo);
TargetAddress image = reader.ReadAddress ();
MonoSymbolFile file = language.GetImage (image);
@@ -517,7 +517,7 @@
byval_data_addr,
language.BuiltinTypes.ArrayTypeSize);
TargetReader array_reader = new TargetReader (
- array_data, target.TargetMemoryInfo);
+ array_data, target.TargetInfo);
array_reader.ReadAddress ();
int rank = array_reader.ReadByte ();
Modified: trunk/debugger/languages/mono/MonoLanguageBackend.cs
===================================================================
--- trunk/debugger/languages/mono/MonoLanguageBackend.cs 2006-04-18
00:18:22 UTC (rev 59557)
+++ trunk/debugger/languages/mono/MonoLanguageBackend.cs 2006-04-18
00:31:37 UTC (rev 59558)
@@ -499,7 +499,7 @@
try {
MonoSymbolFile symfile = new
MonoSymbolFile (
- this, process, memory, memory,
address);
+ this, process, memory, address);
image_hash.Add (symfile.MonoImage,
symfile);
symbol_files.Add (symfile);
assembly_hash.Add (symfile.Assembly,
symfile);
Modified: trunk/debugger/languages/mono/MonoSymbolFile.cs
===================================================================
--- trunk/debugger/languages/mono/MonoSymbolFile.cs 2006-04-18 00:18:22 UTC
(rev 59557)
+++ trunk/debugger/languages/mono/MonoSymbolFile.cs 2006-04-18 00:31:37 UTC
(rev 59558)
@@ -209,8 +209,9 @@
internal readonly C.MonoSymbolFile File;
internal readonly ThreadManager ThreadManager;
internal readonly AddressDomain AddressDomain;
- internal readonly ITargetMemoryInfo TargetInfo;
+ internal readonly ITargetInfo TargetInfo;
internal readonly MonoLanguageBackend MonoLanguage;
+ internal readonly Architecture Architecture;
protected readonly Process process;
MonoSymbolTable symtab;
string name;
@@ -228,11 +229,11 @@
Hashtable method_index_hash;
internal MonoSymbolFile (MonoLanguageBackend language, Process
process,
- ITargetMemoryInfo target_info,
ITargetMemoryAccess memory,
- TargetAddress address)
+ ITargetMemoryAccess memory,
TargetAddress address)
{
this.MonoLanguage = language;
- this.TargetInfo = target_info;
+ this.TargetInfo = memory;
+ this.Architecture = memory.Architecture;
this.process = process;
ThreadManager = process.ThreadManager;
@@ -314,10 +315,6 @@
get { return MonoLanguage; }
}
- internal Architecture Architecture {
- get { return TargetInfo.Architecture; }
- }
-
public override bool SymbolsLoaded {
get { return Module.LoadSymbols; }
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
