Author: martin
Date: 2005-09-23 16:00:55 -0400 (Fri, 23 Sep 2005)
New Revision: 50622
Removed:
trunk/debugger/languages/native/NativeFundamentalObject.cs
trunk/debugger/languages/native/NativeFundamentalType.cs
Modified:
trunk/debugger/ChangeLog
trunk/debugger/arch/DwarfReader.cs
trunk/debugger/languages/TargetFundamentalObject.cs
trunk/debugger/languages/native/NativeLanguage.cs
trunk/debugger/languages/native/NativeStringObject.cs
trunk/debugger/languages/native/NativeStringType.cs
Log:
2005-09-23 Martin Baulig <[EMAIL PROTECTED]>
* languages/native/NativeFundamentalType.cs: Removed; use
`TargetFundamentalType' instead.
* languages/native/NativeFundamentalObject.cs: Removed; use
`TargetFundamentalObject' instead.
Modified: trunk/debugger/ChangeLog
===================================================================
--- trunk/debugger/ChangeLog 2005-09-23 19:56:51 UTC (rev 50621)
+++ trunk/debugger/ChangeLog 2005-09-23 20:00:55 UTC (rev 50622)
@@ -1,5 +1,13 @@
2005-09-23 Martin Baulig <[EMAIL PROTECTED]>
+ * languages/native/NativeFundamentalType.cs: Removed; use
+ `TargetFundamentalType' instead.
+
+ * languages/native/NativeFundamentalObject.cs: Removed; use
+ `TargetFundamentalObject' instead.
+
+2005-09-23 Martin Baulig <[EMAIL PROTECTED]>
+
* languages/mono/MonoFundamentalType.cs: Moved to
languages/TargetFundamentalType.cs
(MonoFundamentalType): Renamed to `TargetFundamentalType'.
Modified: trunk/debugger/arch/DwarfReader.cs
===================================================================
--- trunk/debugger/arch/DwarfReader.cs 2005-09-23 19:56:51 UTC (rev 50621)
+++ trunk/debugger/arch/DwarfReader.cs 2005-09-23 20:00:55 UTC (rev 50622)
@@ -2615,7 +2615,7 @@
if (obj.Type != Type)
throw new InvalidOperationException ();
- NativeFundamentalObject var_object = GetObject
(frame) as NativeFundamentalObject;
+ TargetFundamentalObject var_object = GetObject
(frame) as TargetFundamentalObject;
if (var_object == null)
return;
@@ -2780,7 +2780,7 @@
if (kind == FundamentalKind.Unknown)
return new NativeOpaqueType (language,
Name, byte_size);
- return new NativeFundamentalType (language,
Name, kind, byte_size);
+ return new TargetFundamentalType (language,
Name, kind, byte_size);
}
protected FundamentalKind GetMonoType
(DwarfBaseTypeEncoding encoding,
@@ -2869,7 +2869,7 @@
if (ref_type == null)
return null;
- NativeFundamentalType fundamental = ref_type as
NativeFundamentalType;
+ TargetFundamentalType fundamental = ref_type as
TargetFundamentalType;
if ((fundamental != null) &&
(fundamental.FundamentalKind ==
FundamentalKind.Char))
return new NativeStringType (language,
byte_size);
Modified: trunk/debugger/languages/TargetFundamentalObject.cs
===================================================================
--- trunk/debugger/languages/TargetFundamentalObject.cs 2005-09-23 19:56:51 UTC
(rev 50621)
+++ trunk/debugger/languages/TargetFundamentalObject.cs 2005-09-23 20:00:55 UTC
(rev 50622)
@@ -76,7 +76,7 @@
}
}
- void ITargetFundamentalObject.SetObject (ITargetObject obj)
+ public void SetObject (ITargetObject obj)
{
Type.SetObject (location, (TargetObject) obj);
}
Deleted: trunk/debugger/languages/native/NativeFundamentalObject.cs
===================================================================
--- trunk/debugger/languages/native/NativeFundamentalObject.cs 2005-09-23
19:56:51 UTC (rev 50621)
+++ trunk/debugger/languages/native/NativeFundamentalObject.cs 2005-09-23
20:00:55 UTC (rev 50622)
@@ -1,121 +0,0 @@
-using System;
-
-namespace Mono.Debugger.Languages.Native
-{
- internal class NativeFundamentalObject : TargetObject,
ITargetFundamentalObject
- {
- public NativeFundamentalObject (TargetType type, TargetLocation
location)
- : base (type, location)
- { }
-
- protected override long GetDynamicSize (TargetBlob blob,
TargetLocation location,
- out TargetLocation
dynamic_location)
- {
- throw new InvalidOperationException ();
- }
-
- internal void SetObject (object obj)
- {
- }
-
- public virtual object GetObject (ITargetAccess target)
- {
- TargetBlob blob = location.ReadMemory (Type.Size);
-
- switch (((NativeFundamentalType) type).FundamentalKind)
{
- case FundamentalKind.Boolean:
- return blob.Contents [0] != 0;
-
- case FundamentalKind.Char:
- return BitConverter.ToChar (blob.Contents, 0);
-
- case FundamentalKind.SByte:
- return (sbyte) blob.Contents [0];
-
- case FundamentalKind.Byte:
- return (byte) blob.Contents [0];
-
- case FundamentalKind.Int16:
- return BitConverter.ToInt16 (blob.Contents, 0);
-
- case FundamentalKind.UInt16:
- return BitConverter.ToUInt16 (blob.Contents, 0);
-
- case FundamentalKind.Int32:
- return BitConverter.ToInt32 (blob.Contents, 0);
-
- case FundamentalKind.UInt32:
- return BitConverter.ToUInt32 (blob.Contents, 0);
-
- case FundamentalKind.Int64:
- return BitConverter.ToInt64 (blob.Contents, 0);
-
- case FundamentalKind.UInt64:
- return BitConverter.ToUInt64 (blob.Contents, 0);
-
- case FundamentalKind.Single:
- return BitConverter.ToSingle (blob.Contents, 0);
-
- case FundamentalKind.Double:
- return BitConverter.ToDouble (blob.Contents, 0);
-
- default:
- throw new InvalidOperationException ();
- }
- }
-
- protected byte[] CreateObject (object obj)
- {
- switch (((NativeFundamentalType) type).FundamentalKind)
{
- case FundamentalKind.Boolean:
- return BitConverter.GetBytes (Convert.ToBoolean
(obj));
-
- case FundamentalKind.Char:
- return BitConverter.GetBytes (Convert.ToChar
(obj));
-
- case FundamentalKind.SByte:
- return BitConverter.GetBytes (Convert.ToSByte
(obj));
-
- case FundamentalKind.Byte:
- return BitConverter.GetBytes (Convert.ToByte
(obj));
-
- case FundamentalKind.Int16:
- return BitConverter.GetBytes (Convert.ToInt16
(obj));
-
- case FundamentalKind.UInt16:
- return BitConverter.GetBytes (Convert.ToUInt16
(obj));
-
- case FundamentalKind.Int32:
- return BitConverter.GetBytes (Convert.ToInt32
(obj));
-
- case FundamentalKind.UInt32:
- return BitConverter.GetBytes (Convert.ToUInt32
(obj));
-
- case FundamentalKind.Int64:
- return BitConverter.GetBytes (Convert.ToInt64
(obj));
-
- case FundamentalKind.UInt64:
- return BitConverter.GetBytes (Convert.ToUInt64
(obj));
-
- case FundamentalKind.Single:
- return BitConverter.GetBytes (Convert.ToSingle
(obj));
-
- case FundamentalKind.Double:
- return BitConverter.GetBytes (Convert.ToDouble
(obj));
-
- default:
- throw new InvalidOperationException ();
- }
- }
-
- public override string Print (ITargetAccess target)
- {
- return GetObject (target).ToString ();
- }
-
- public void SetObject (ITargetObject obj)
- {
- throw new NotImplementedException ();
- }
- }
-}
Deleted: trunk/debugger/languages/native/NativeFundamentalType.cs
===================================================================
--- trunk/debugger/languages/native/NativeFundamentalType.cs 2005-09-23
19:56:51 UTC (rev 50621)
+++ trunk/debugger/languages/native/NativeFundamentalType.cs 2005-09-23
20:00:55 UTC (rev 50622)
@@ -1,58 +0,0 @@
-using System;
-
-namespace Mono.Debugger.Languages.Native
-{
- internal class NativeFundamentalType : TargetType,
ITargetFundamentalType
- {
- string name;
- int size;
- FundamentalKind fundamental_kind;
-
- public NativeFundamentalType (ILanguage language, string name,
- FundamentalKind kind, int size)
- : base (language, TargetObjectKind.Fundamental)
- {
- this.name = name;
- this.size = size;
- this.fundamental_kind = kind;
- }
-
- public override string Name {
- get { return name; }
- }
-
- public override int Size {
- get { return size; }
- }
-
- public override bool HasFixedSize {
- get { return true; }
- }
-
- public override bool IsByRef {
- get {
- switch (fundamental_kind) {
- case FundamentalKind.Object:
- case FundamentalKind.String:
- case FundamentalKind.IntPtr:
- case FundamentalKind.UIntPtr:
- return true;
-
- default:
- return false;
- }
- }
- }
-
- public FundamentalKind FundamentalKind {
- get {
- return fundamental_kind;
- }
- }
-
- public override TargetObject GetObject (TargetLocation location)
- {
- return new NativeFundamentalObject (this, location);
- }
- }
-}
Modified: trunk/debugger/languages/native/NativeLanguage.cs
===================================================================
--- trunk/debugger/languages/native/NativeLanguage.cs 2005-09-23 19:56:51 UTC
(rev 50621)
+++ trunk/debugger/languages/native/NativeLanguage.cs 2005-09-23 20:00:55 UTC
(rev 50622)
@@ -8,8 +8,8 @@
internal class NativeLanguage : MarshalByRefObject, ILanguage
{
BfdContainer bfd_container;
- NativeFundamentalType integer_type;
- NativeFundamentalType long_type;
+ TargetFundamentalType integer_type;
+ TargetFundamentalType long_type;
NativePointerType pointer_type;
NativeOpaqueType void_type;
ITargetInfo info;
@@ -19,8 +19,8 @@
this.bfd_container = bfd_container;
this.info = info;
- integer_type = new NativeFundamentalType (this, "int",
FundamentalKind.Int32, 4);
- long_type = new NativeFundamentalType (this, "long",
FundamentalKind.Int64, 8);
+ integer_type = new TargetFundamentalType (this, "int",
FundamentalKind.Int32, 4);
+ long_type = new TargetFundamentalType (this, "long",
FundamentalKind.Int64, 8);
pointer_type = new NativePointerType (this, "void *",
info.TargetAddressSize);
void_type = new NativeOpaqueType (this, "void", 0);
}
Modified: trunk/debugger/languages/native/NativeStringObject.cs
===================================================================
--- trunk/debugger/languages/native/NativeStringObject.cs 2005-09-23
19:56:51 UTC (rev 50621)
+++ trunk/debugger/languages/native/NativeStringObject.cs 2005-09-23
20:00:55 UTC (rev 50622)
@@ -3,9 +3,9 @@
namespace Mono.Debugger.Languages.Native
{
- internal class NativeStringObject : NativeFundamentalObject
+ internal class NativeStringObject : TargetFundamentalObject
{
- public NativeStringObject (TargetType type, TargetLocation
location)
+ public NativeStringObject (NativeStringType type,
TargetLocation location)
: base (type, location)
{ }
Modified: trunk/debugger/languages/native/NativeStringType.cs
===================================================================
--- trunk/debugger/languages/native/NativeStringType.cs 2005-09-23 19:56:51 UTC
(rev 50621)
+++ trunk/debugger/languages/native/NativeStringType.cs 2005-09-23 20:00:55 UTC
(rev 50622)
@@ -2,7 +2,7 @@
namespace Mono.Debugger.Languages.Native
{
- internal class NativeStringType : NativeFundamentalType
+ internal class NativeStringType : TargetFundamentalType
{
static int max_string_length = 100;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
