Author: martin
Date: 2006-04-17 20:18:22 -0400 (Mon, 17 Apr 2006)
New Revision: 59557
Modified:
trunk/debugger/ChangeLog
trunk/debugger/arch/CoreFile.cs
trunk/debugger/backends/Inferior.cs
trunk/debugger/backends/classes/TargetReader.cs
trunk/debugger/interfaces/ITargetMemoryAccess.cs
Log:
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
* interfaces/ITargetMemoryAccess.cs
(ITargetMemoryInfo.AddressDomain): Moved into `ITargetInfo'.
(ITargetInfo.AddressDomain): Moved here from `ITargetMemoryInfo'.
* backends/classes/TargetReader.cs
(TargetReader): Don't implement `ITargetMemoryInfo'.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2006-04-18 00:04:58 UTC (rev 59556)
+++ trunk/debugger/ChangeLog 2006-04-18 00:18:22 UTC (rev 59557)
@@ -1,5 +1,14 @@
2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+ * interfaces/ITargetMemoryAccess.cs
+ (ITargetMemoryInfo.AddressDomain): Moved into `ITargetInfo'.
+ (ITargetInfo.AddressDomain): Moved here from `ITargetMemoryInfo'.
+
+ * backends/classes/TargetReader.cs
+ (TargetReader): Don't implement `ITargetMemoryInfo'.
+
+2006-04-18 Martin Baulig <[EMAIL PROTECTED]>
+
* backends/Inferior.cs
(Inferior.GetTargetInfo): New public static method.
Modified: trunk/debugger/arch/CoreFile.cs
===================================================================
--- trunk/debugger/arch/CoreFile.cs 2006-04-18 00:04:58 UTC (rev 59556)
+++ trunk/debugger/arch/CoreFile.cs 2006-04-18 00:18:22 UTC (rev 59557)
@@ -22,7 +22,7 @@
protected CoreFile (ThreadManager manager, ProcessStart start)
: base (manager, start)
{
- info = new TargetMemoryInfo (Inferior.GetTargetInfo (),
manager.AddressDomain);
+ info = new TargetMemoryInfo (Inferior.GetTargetInfo
(manager.AddressDomain));
bfd = BfdContainer.AddFile (
info, start.TargetApplication,
TargetAddress.Null,
Modified: trunk/debugger/backends/Inferior.cs
===================================================================
--- trunk/debugger/backends/Inferior.cs 2006-04-18 00:04:58 UTC (rev 59556)
+++ trunk/debugger/backends/Inferior.cs 2006-04-18 00:18:22 UTC (rev 59557)
@@ -577,7 +577,7 @@
return new ChildEvent (message, arg, data1, data2);
}
- public static TargetInfo GetTargetInfo ()
+ public static TargetInfo GetTargetInfo (AddressDomain domain)
{
int target_int_size, target_long_size,
target_addr_size, is_bigendian;
check_error (mono_debugger_server_get_target_info
@@ -585,7 +585,7 @@
out target_addr_size, out is_bigendian));
return new TargetInfo (target_int_size,
target_long_size,
- target_addr_size, is_bigendian
!= 0);
+ target_addr_size, is_bigendian
!= 0, domain);
}
protected void SetupInferior ()
@@ -602,8 +602,8 @@
g_free (data);
}
- target_info = GetTargetInfo ();
- target_memory_info = new TargetMemoryInfo (target_info,
address_domain);
+ target_info = GetTargetInfo (address_domain);
+ target_memory_info = new TargetMemoryInfo (target_info);
try {
bfd = bfd_container.AddFile (
Modified: trunk/debugger/backends/classes/TargetReader.cs
===================================================================
--- trunk/debugger/backends/classes/TargetReader.cs 2006-04-18 00:04:58 UTC
(rev 59556)
+++ trunk/debugger/backends/classes/TargetReader.cs 2006-04-18 00:18:22 UTC
(rev 59557)
@@ -13,18 +13,17 @@
int target_long_size;
int target_address_size;
bool is_bigendian;
+ AddressDomain address_domain;
- internal TargetInfo (int target_address_size)
- : this (4, 8, target_address_size, false)
- { }
-
internal TargetInfo (int target_int_size, int target_long_size,
- int target_address_size, bool is_bigendian)
+ int target_address_size, bool is_bigendian,
+ AddressDomain domain)
{
this.target_int_size = target_int_size;
this.target_long_size = target_long_size;
this.target_address_size = target_address_size;
this.is_bigendian = is_bigendian;
+ this.address_domain = domain;
}
public int TargetIntegerSize {
@@ -50,19 +49,23 @@
return is_bigendian;
}
}
+
+ public AddressDomain AddressDomain {
+ get {
+ return address_domain;
+ }
+ }
}
[Serializable]
internal class TargetMemoryInfo : TargetInfo, ITargetMemoryInfo
{
Architecture arch;
- AddressDomain address_domain;
- internal TargetMemoryInfo (TargetInfo info, AddressDomain
domain)
+ internal TargetMemoryInfo (TargetInfo info)
: base (info.TargetIntegerSize,
info.TargetLongIntegerSize,
- info.TargetAddressSize, info.IsBigEndian)
+ info.TargetAddressSize, info.IsBigEndian,
info.AddressDomain)
{
- this.address_domain = domain;
}
internal void Initialize (Architecture arch)
@@ -70,12 +73,6 @@
this.arch = arch;
}
- public AddressDomain AddressDomain {
- get {
- return address_domain;
- }
- }
-
public Architecture Architecture {
get {
return arch;
@@ -84,7 +81,7 @@
}
[Serializable]
- internal class TargetReader : ITargetMemoryInfo
+ internal class TargetReader
{
byte[] data;
TargetBinaryReader reader;
@@ -155,18 +152,6 @@
}
}
- public Architecture Architecture {
- get {
- return info.Architecture;
- }
- }
-
- public AddressDomain AddressDomain {
- get {
- return info.AddressDomain;
- }
- }
-
public byte ReadByte ()
{
return reader.ReadByte ();
Modified: trunk/debugger/interfaces/ITargetMemoryAccess.cs
===================================================================
--- trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-18 00:04:58 UTC
(rev 59556)
+++ trunk/debugger/interfaces/ITargetMemoryAccess.cs 2006-04-18 00:18:22 UTC
(rev 59557)
@@ -32,6 +32,10 @@
bool IsBigEndian {
get;
}
+
+ AddressDomain AddressDomain {
+ get;
+ }
}
internal interface ITargetMemoryInfo : ITargetInfo
@@ -39,10 +43,6 @@
Architecture Architecture {
get;
}
-
- AddressDomain AddressDomain {
- get;
- }
}
internal interface ITargetMemoryAccess : ITargetMemoryInfo
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
