Author: martin
Date: 2006-04-17 20:34:37 -0400 (Mon, 17 Apr 2006)
New Revision: 59559
Modified:
trunk/debugger/ChangeLog
trunk/debugger/backends/Thread.cs
trunk/debugger/backends/classes/MonoVariableLocation.cs
trunk/debugger/backends/classes/TargetLocation.cs
trunk/debugger/classes/Backtrace.cs
trunk/debugger/classes/StackFrame.cs
trunk/debugger/languages/mono/MonoArrayObject.cs
trunk/debugger/languages/mono/MonoClassInfo.cs
trunk/debugger/languages/mono/MonoClassType.cs
trunk/debugger/languages/mono/MonoObjectObject.cs
Log:
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
* backends/Thread.cs
(Thread.TargetMemoryAccess): Removed; just use `Thread' directly.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2006-04-18 00:31:37 UTC (rev 59558)
+++ trunk/debugger/ChangeLog 2006-04-18 00:34:37 UTC (rev 59559)
@@ -1,5 +1,10 @@
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+ * backends/Thread.cs
+ (Thread.TargetMemoryAccess): Removed; just use `Thread' directly.
+
+2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+
* interfaces/ITargetMemoryAccess.cs
(ITargetMemoryAccess): Only implement `ITargetInfo'.
(ITargetMemoryAccess.TargetMemoryInfo): Removed.
Modified: trunk/debugger/backends/Thread.cs
===================================================================
--- trunk/debugger/backends/Thread.cs 2006-04-18 00:31:37 UTC (rev 59558)
+++ trunk/debugger/backends/Thread.cs 2006-04-18 00:34:37 UTC (rev 59559)
@@ -652,10 +652,6 @@
get { return State == TargetState.STOPPED; }
}
- internal ITargetMemoryAccess TargetMemoryAccess {
- get { return this; }
- }
-
public override ITargetInfo TargetInfo {
get { return target_info; }
}
Modified: trunk/debugger/backends/classes/MonoVariableLocation.cs
===================================================================
--- trunk/debugger/backends/classes/MonoVariableLocation.cs 2006-04-18
00:31:37 UTC (rev 59558)
+++ trunk/debugger/backends/classes/MonoVariableLocation.cs 2006-04-18
00:34:37 UTC (rev 59559)
@@ -47,7 +47,7 @@
target.AddressDomain, contents +
regoffset);
if (is_byref && is_regoffset)
- address = target.TargetMemoryAccess.ReadAddress
(address);
+ address = target.ReadAddress (address);
is_valid = true;
}
@@ -139,7 +139,7 @@
else
the_addr = address;
- target.TargetMemoryAccess.WriteAddress
(the_addr, new_address);
+ target.WriteAddress (the_addr, new_address);
update (target);
} else {
register.WriteRegister (target,
new_address.Address);
Modified: trunk/debugger/backends/classes/TargetLocation.cs
===================================================================
--- trunk/debugger/backends/classes/TargetLocation.cs 2006-04-18 00:31:37 UTC
(rev 59558)
+++ trunk/debugger/backends/classes/TargetLocation.cs 2006-04-18 00:34:37 UTC
(rev 59559)
@@ -27,7 +27,7 @@
internal virtual TargetBlob ReadMemory (Thread target, int size)
{
- return target.TargetMemoryAccess.ReadMemory (Address,
size);
+ return target.ReadMemory (Address, size);
}
// <summary>
@@ -40,12 +40,12 @@
internal virtual void WriteBuffer (Thread target, byte[] data)
{
- target.TargetMemoryAccess.WriteBuffer (Address, data);
+ target.WriteBuffer (Address, data);
}
internal virtual void WriteAddress (Thread target,
TargetAddress address)
{
- target.TargetMemoryAccess.WriteAddress (Address,
address);
+ target.WriteAddress (Address, address);
}
// <summary>
@@ -67,7 +67,7 @@
internal TargetLocation GetDereferencedLocation (Thread target)
{
- TargetAddress address =
target.TargetMemoryAccess.ReadAddress (Address);
+ TargetAddress address = target.ReadAddress (Address);
return new AbsoluteTargetLocation (address);
}
Modified: trunk/debugger/classes/Backtrace.cs
===================================================================
--- trunk/debugger/classes/Backtrace.cs 2006-04-18 00:31:37 UTC (rev 59558)
+++ trunk/debugger/classes/Backtrace.cs 2006-04-18 00:34:37 UTC (rev 59559)
@@ -65,7 +65,7 @@
{
StackFrame new_frame = null;
try {
- new_frame = last_frame.UnwindStack
(target.TargetMemoryAccess, arch);
+ new_frame = last_frame.UnwindStack (target,
arch);
} catch (TargetException) {
}
Modified: trunk/debugger/classes/StackFrame.cs
===================================================================
--- trunk/debugger/classes/StackFrame.cs 2006-04-18 00:31:37 UTC (rev
59558)
+++ trunk/debugger/classes/StackFrame.cs 2006-04-18 00:34:37 UTC (rev
59559)
@@ -78,11 +78,11 @@
this.value = value;
if (addr_on_stack.IsNull)
- target.TargetMemoryAccess.SetRegisters
(registers);
+ target.SetRegisters (registers);
else if (Size == target.TargetInfo.TargetIntegerSize)
- target.TargetMemoryAccess.WriteInteger
(addr_on_stack, (int) value);
+ target.WriteInteger (addr_on_stack, (int)
value);
else
- target.TargetMemoryAccess.WriteLongInteger
(addr_on_stack, value);
+ target.WriteLongInteger (addr_on_stack, value);
}
public bool Valid {
Modified: trunk/debugger/languages/mono/MonoArrayObject.cs
===================================================================
--- trunk/debugger/languages/mono/MonoArrayObject.cs 2006-04-18 00:31:37 UTC
(rev 59558)
+++ trunk/debugger/languages/mono/MonoArrayObject.cs 2006-04-18 00:34:37 UTC
(rev 59559)
@@ -24,7 +24,7 @@
reader.Position = 2 *
reader.TargetInfo.TargetAddressSize;
TargetAddress bounds_address = new TargetAddress (
target.AddressDomain, reader.ReadAddress ());
- TargetBinaryReader breader =
target.TargetMemoryAccess.ReadMemory (
+ TargetBinaryReader breader = target.ReadMemory (
bounds_address, 8 * Rank).GetReader ();
bounds = new ArrayBounds [Rank];
Modified: trunk/debugger/languages/mono/MonoClassInfo.cs
===================================================================
--- trunk/debugger/languages/mono/MonoClassInfo.cs 2006-04-18 00:31:37 UTC
(rev 59558)
+++ trunk/debugger/languages/mono/MonoClassInfo.cs 2006-04-18 00:34:37 UTC
(rev 59559)
@@ -38,14 +38,14 @@
MonoLanguageBackend mono = type.File.MonoLanguage;
int offset = mono.BuiltinTypes.KlassInstanceSizeOffset;
- size = target.TargetMemoryAccess.ReadInteger
(klass_address + offset);
+ size = target.ReadInteger (klass_address + offset);
type.File.MonoLanguage.AddClass (KlassAddress, type);
debugger_info = mono.MonoDebuggerInfo;
if (type.ParentType != null) {
- TargetAddress parent_klass =
target.TargetMemoryAccess.ReadAddress (
+ TargetAddress parent_klass = target.ReadAddress
(
klass_address +
mono.BuiltinTypes.KlassParentOffset);
type.MonoParentType.ClassResolved (target,
parent_klass);
}
@@ -70,10 +70,10 @@
MonoBuiltinTypeInfo builtin =
Type.File.MonoLanguage.BuiltinTypes;
- TargetAddress field_info =
target.TargetMemoryAccess.ReadAddress (
+ TargetAddress field_info = target.ReadAddress (
KlassAddress + builtin.KlassFieldOffset);
int field_count = type.Fields.Length +
type.StaticFields.Length;
- TargetBinaryReader info =
target.TargetMemoryAccess.ReadMemory (
+ TargetBinaryReader info = target.ReadMemory (
field_info, field_count *
builtin.FieldInfoSize).GetReader ();
field_offsets = new int [field_count];
@@ -83,11 +83,11 @@
field_offsets [i] = info.ReadInt32 ();
}
- TargetAddress method_info =
target.TargetMemoryAccess.ReadAddress (
+ TargetAddress method_info = target.ReadAddress (
KlassAddress + builtin.KlassMethodsOffset);
- int method_count =
target.TargetMemoryAccess.ReadInteger (
+ int method_count = target.ReadInteger (
KlassAddress + builtin.KlassMethodCountOffset);
- TargetBlob blob = target.TargetMemoryAccess.ReadMemory (
+ TargetBlob blob = target.ReadMemory (
method_info, method_count *
target.TargetInfo.TargetAddressSize);
methods = new Hashtable ();
@@ -95,7 +95,7 @@
for (int i = 0; i < method_count; i++) {
TargetAddress address = reader.ReadAddress ();
- TargetBlob method_blob =
target.TargetMemoryAccess.ReadMemory (
+ TargetBlob method_blob = target.ReadMemory (
address + 4, 4);
int token = method_blob.GetReader ().ReadInt32
();
if (token == 0)
@@ -237,8 +237,8 @@
// dereferencing it once gives us the vtable,
dereferencing it
// twice the class.
TargetAddress address;
- address = target.TargetMemoryAccess.ReadAddress
(location.Address);
- address = target.TargetMemoryAccess.ReadAddress
(address);
+ address = target.ReadAddress (location.Address);
+ address = target.ReadAddress (address);
TargetType current = type.File.MonoLanguage.GetClass
(target, address);
return (MonoClassObject) current.GetObject (location);
Modified: trunk/debugger/languages/mono/MonoClassType.cs
===================================================================
--- trunk/debugger/languages/mono/MonoClassType.cs 2006-04-18 00:31:37 UTC
(rev 59558)
+++ trunk/debugger/languages/mono/MonoClassType.cs 2006-04-18 00:34:37 UTC
(rev 59559)
@@ -460,7 +460,7 @@
public static TargetType ReadMonoClass (MonoLanguageBackend
language,
Thread target,
TargetAddress address)
{
- TargetBlob blob = target.TargetMemoryAccess.ReadMemory (
+ TargetBlob blob = target.ReadMemory (
address, language.BuiltinTypes.KlassSize);
TargetReader reader = new TargetReader (blob,
target.TargetInfo);
@@ -513,7 +513,7 @@
if (eklass == null)
return null;
- TargetBlob array_data =
target.TargetMemoryAccess.ReadMemory (
+ TargetBlob array_data = target.ReadMemory (
byval_data_addr,
language.BuiltinTypes.ArrayTypeSize);
TargetReader array_reader = new TargetReader (
Modified: trunk/debugger/languages/mono/MonoObjectObject.cs
===================================================================
--- trunk/debugger/languages/mono/MonoObjectObject.cs 2006-04-18 00:31:37 UTC
(rev 59558)
+++ trunk/debugger/languages/mono/MonoObjectObject.cs 2006-04-18 00:34:37 UTC
(rev 59559)
@@ -23,8 +23,8 @@
// dereferencing it once gives us the vtable,
dereferencing it
// twice the class.
TargetAddress address;
- address = target.TargetMemoryAccess.ReadAddress
(Location.Address);
- address = target.TargetMemoryAccess.ReadAddress
(address);
+ address = target.ReadAddress (Location.Address);
+ address = target.ReadAddress (address);
return Type.File.MonoLanguage.GetClass (target,
address);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
