Author: martin
Date: 2006-04-17 20:39:09 -0400 (Mon, 17 Apr 2006)
New Revision: 59560
Modified:
trunk/debugger/ChangeLog
trunk/debugger/arch/Architecture.cs
trunk/debugger/arch/Architecture_I386.cs
trunk/debugger/arch/Architecture_X86_64.cs
trunk/debugger/arch/CoreFile.cs
trunk/debugger/backends/Inferior.cs
trunk/debugger/backends/SingleSteppingEngine.cs
trunk/debugger/backends/classes/TargetReader.cs
trunk/debugger/interfaces/ITargetMemoryAccess.cs
Log:
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
* interfaces/ITargetMemoryAccess.cs
(ITargetMemoryInfo): Removed.
* backends/classes/TargetReader.cs
(TargetMemoryInfo): Removed.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2006-04-18 00:34:37 UTC (rev 59559)
+++ trunk/debugger/ChangeLog 2006-04-18 00:39:09 UTC (rev 59560)
@@ -1,5 +1,13 @@
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+ * interfaces/ITargetMemoryAccess.cs
+ (ITargetMemoryInfo): Removed.
+
+ * backends/classes/TargetReader.cs
+ (TargetMemoryInfo): Removed.
+
+2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+
* backends/Thread.cs
(Thread.TargetMemoryAccess): Removed; just use `Thread' directly.
Modified: trunk/debugger/arch/Architecture.cs
===================================================================
--- trunk/debugger/arch/Architecture.cs 2006-04-18 00:34:37 UTC (rev 59559)
+++ trunk/debugger/arch/Architecture.cs 2006-04-18 00:39:09 UTC (rev 59560)
@@ -118,7 +118,7 @@
internal abstract StackFrame TrySpecialUnwind (StackFrame
last_frame,
ITargetMemoryAccess memory);
- internal abstract StackFrame CreateFrame (Thread thread,
ITargetMemoryInfo info,
+ internal abstract StackFrame CreateFrame (Thread thread,
ITargetInfo info,
Registers regs);
internal StackFrame CreateFrame (Thread thread, TargetAddress
address,
Modified: trunk/debugger/arch/Architecture_I386.cs
===================================================================
--- trunk/debugger/arch/Architecture_I386.cs 2006-04-18 00:34:37 UTC (rev
59559)
+++ trunk/debugger/arch/Architecture_I386.cs 2006-04-18 00:39:09 UTC (rev
59560)
@@ -663,7 +663,7 @@
inferior.SetRegisters (regs);
}
- internal override StackFrame CreateFrame (Thread thread,
ITargetMemoryInfo info,
+ internal override StackFrame CreateFrame (Thread thread,
ITargetInfo info,
Registers regs)
{
TargetAddress address = new TargetAddress (
Modified: trunk/debugger/arch/Architecture_X86_64.cs
===================================================================
--- trunk/debugger/arch/Architecture_X86_64.cs 2006-04-18 00:34:37 UTC (rev
59559)
+++ trunk/debugger/arch/Architecture_X86_64.cs 2006-04-18 00:39:09 UTC (rev
59560)
@@ -749,7 +749,7 @@
inferior.SetRegisters (regs);
}
- internal override StackFrame CreateFrame (Thread thread,
ITargetMemoryInfo info,
+ internal override StackFrame CreateFrame (Thread thread,
ITargetInfo info,
Registers regs)
{
TargetAddress address = new TargetAddress (
Modified: trunk/debugger/arch/CoreFile.cs
===================================================================
--- trunk/debugger/arch/CoreFile.cs 2006-04-18 00:34:37 UTC (rev 59559)
+++ trunk/debugger/arch/CoreFile.cs 2006-04-18 00:39:09 UTC (rev 59560)
@@ -8,7 +8,7 @@
{
internal class CoreFile : Process
{
- TargetMemoryInfo info;
+ TargetInfo info;
Bfd bfd, core_bfd;
string core_file;
string application;
@@ -22,14 +22,12 @@
protected CoreFile (ThreadManager manager, ProcessStart start)
: base (manager, start)
{
- info = new TargetMemoryInfo (Inferior.GetTargetInfo
(manager.AddressDomain));
+ info = Inferior.GetTargetInfo (manager.AddressDomain);
bfd = BfdContainer.AddFile (
info, start.TargetApplication,
TargetAddress.Null,
start.LoadNativeSymbolTable, true);
- info.Initialize (bfd.Architecture);
-
core_file = start.CoreFile;
application = bfd.FileName;
@@ -137,10 +135,6 @@
get { return info; }
}
- public ITargetMemoryInfo TargetMemoryInfo {
- get { return info; }
- }
-
protected class CoreFileThread : TargetAccess
{
public readonly int PID;
@@ -211,7 +205,7 @@
get {
if (current_frame == null)
current_frame =
CoreFile.Architecture.CreateFrame (
- Thread,
CoreFile.TargetMemoryInfo, Registers);
+ Thread,
CoreFile.TargetInfo, Registers);
return current_frame;
}
@@ -266,12 +260,12 @@
get { return CoreFile.TargetInfo.IsBigEndian; }
}
- public override Architecture Architecture {
- get { return
CoreFile.TargetMemoryInfo.Architecture; }
+ public override AddressDomain AddressDomain {
+ get { return CoreFile.TargetInfo.AddressDomain;
}
}
- public override AddressDomain AddressDomain {
- get { return
CoreFile.TargetMemoryInfo.AddressDomain; }
+ public override Architecture Architecture {
+ get { return CoreFile.Architecture; }
}
public override byte ReadByte (TargetAddress address)
Modified: trunk/debugger/backends/Inferior.cs
===================================================================
--- trunk/debugger/backends/Inferior.cs 2006-04-18 00:34:37 UTC (rev 59559)
+++ trunk/debugger/backends/Inferior.cs 2006-04-18 00:39:09 UTC (rev 59560)
@@ -41,7 +41,6 @@
bool initialized;
TargetInfo target_info;
- TargetMemoryInfo target_memory_info;
Architecture arch;
bool has_signals;
@@ -272,7 +271,6 @@
inferior.has_signals = has_signals;
inferior.target_info = target_info;
- inferior.target_memory_info = target_memory_info;
inferior.bfd = bfd;
inferior.arch = inferior.bfd.Architecture;
@@ -603,7 +601,6 @@
}
target_info = GetTargetInfo (address_domain);
- target_memory_info = new TargetMemoryInfo (target_info);
try {
bfd = bfd_container.AddFile (
@@ -622,7 +619,6 @@
bfd_container.SetupInferior (this, bfd);
arch = bfd.Architecture;
- target_memory_info.Initialize (arch);
bfd_disassembler = bfd.GetDisassembler (this);
}
@@ -707,12 +703,6 @@
}
}
- public ITargetMemoryInfo TargetMemoryInfo {
- get {
- return target_memory_info;
- }
- }
-
IntPtr read_buffer (TargetAddress address, int size)
{
IntPtr data = Marshal.AllocHGlobal (size);
Modified: trunk/debugger/backends/SingleSteppingEngine.cs
===================================================================
--- trunk/debugger/backends/SingleSteppingEngine.cs 2006-04-18 00:34:37 UTC
(rev 59559)
+++ trunk/debugger/backends/SingleSteppingEngine.cs 2006-04-18 00:39:09 UTC
(rev 59560)
@@ -2852,7 +2852,7 @@
if (!class_type.IsByRef) {
TargetLocation new_loc =
instance.Location.GetLocationAtOffset (
- 2 *
inferior.TargetMemoryInfo.TargetAddressSize);
+ 2 *
inferior.TargetInfo.TargetAddressSize);
instance = (TargetClassObject)
class_type.GetObject (new_loc);
}
Modified: trunk/debugger/backends/classes/TargetReader.cs
===================================================================
--- trunk/debugger/backends/classes/TargetReader.cs 2006-04-18 00:34:37 UTC
(rev 59559)
+++ trunk/debugger/backends/classes/TargetReader.cs 2006-04-18 00:39:09 UTC
(rev 59560)
@@ -58,29 +58,6 @@
}
[Serializable]
- internal class TargetMemoryInfo : TargetInfo, ITargetMemoryInfo
- {
- Architecture arch;
-
- internal TargetMemoryInfo (TargetInfo info)
- : base (info.TargetIntegerSize,
info.TargetLongIntegerSize,
- info.TargetAddressSize, info.IsBigEndian,
info.AddressDomain)
- {
- }
-
- internal void Initialize (Architecture arch)
- {
- this.arch = arch;
- }
-
- public Architecture Architecture {
- get {
- return arch;
- }
- }
- }
-
- [Serializable]
internal class TargetReader
{
byte[] data;
Modified: trunk/debugger/interfaces/ITargetMemoryAccess.cs
===================================================================
--- trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-18 00:34:37 UTC
(rev 59559)
+++ trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-18 00:39:09 UTC
(rev 59560)
@@ -38,13 +38,6 @@
}
}
- internal interface ITargetMemoryInfo : ITargetInfo
- {
- Architecture Architecture {
- get;
- }
- }
-
internal interface ITargetMemoryAccess : ITargetInfo
{
Architecture Architecture {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
