administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Отладчик для Linux: Статические поля

Browse source
This commit is contained in:
Ivan Bondarev 2023-06-04 14:52:36 +02:00
parent f12406b471
commit 1fe0a16183
4 changed files with 82 additions and 219 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
VisualPascalABCNETLinux/IB/Debugger/Debugger.cs
View file

@ -1521,6 +1521,7 @@ namespace VisualPascalABC
}
if (global_lv != null)
{
Console.WriteLine(global_lv.TypeName);
var tr = new Mono.Debugging.Evaluation.TypeValueReference(stackFrame.SourceBacktrace.GetEvaluationContext(stackFrame.Index, Mono.Debugging.Client.EvaluationOptions.DefaultOptions), monoDebuggerSession.GetType(global_lv.TypeName));
var fields = tr.GetChildReferences(Mono.Debugging.Client.EvaluationOptions.DefaultOptions);
foreach (var fi in fields)
@ -1539,6 +1540,15 @@ namespace VisualPascalABC
}
}
Type t = AssemblyHelper.GetTypeForStatic(var);
if (t != null)
{
var tm = monoDebuggerSession.GetType(t.FullName);
Console.WriteLine("type for static " + tm);
var tr = new Mono.Debugging.Evaluation.TypeValueReference(stackFrame.SourceBacktrace.GetEvaluationContext(stackFrame.Index, Mono.Debugging.Client.EvaluationOptions.DefaultOptions), tm);
return new BaseTypeItem(tr, t);
}
nvc = debuggedProcess.SelectedFunction.LocalVariables;
List<NamedValue> val_list = new List<NamedValue>();
@ -1659,7 +1669,7 @@ namespace VisualPascalABC
}
}
Type t = AssemblyHelper.GetTypeForStatic(var);
t = AssemblyHelper.GetTypeForStatic(var);
if (t != null)
{
DebugType dt = DebugUtils.GetDebugType(t);//DebugType.Create(this.debuggedProcess.GetModule(var),(uint)t.MetadataToken);

271
VisualPascalABCNETLinux/IB/Debugger/LocalVars.cs
View file

@ -1036,16 +1036,9 @@ namespace VisualPascalABC
public class BaseTypeItem : ListItem
{
Value val;
DebugType type;
Mono.Debugging.Evaluation.TypeValueReference monoType;
public Value Value
{
get
{
return val;
}
}
public override bool IsLiteral
{
@ -1055,14 +1048,6 @@ namespace VisualPascalABC
}
}
public DebugType DebugType
{
get
{
return type;
}
}
public override int ImageIndex
{
get
@ -1100,7 +1085,7 @@ namespace VisualPascalABC
{
get
{
return DebugUtils.WrapTypeName(type);
return monoType.Name;
}
}
@ -1145,11 +1130,15 @@ namespace VisualPascalABC
// else
this.imageIndex = CodeCompletionProvider.ImagesProvider.IconNumberClass;
}
public BaseTypeItem(Value val, DebugType type)
public BaseTypeItem(Mono.Debugging.Evaluation.TypeValueReference type, Type mt)
{
this.val = val;
this.type = type;
this.monoType = type;
this.managed_type = mt;
// if (mt.IsValueType)
// this.imageIndex = CodeCompletionProvider.ImagesProvider.IconNumberStruct;
// else
this.imageIndex = CodeCompletionProvider.ImagesProvider.IconNumberClass;
}
public bool IsExtern()
@ -1157,174 +1146,55 @@ namespace VisualPascalABC
return !type.Module.SymbolsLoaded;
}
[HandleProcessCorruptedStateExceptionsAttribute]
List<IListItem> GetMembers(BindingFlags flags)
List<IListItem> GetMembers(bool privateMembers)
{
List<IListItem> list = new List<IListItem>();
if (val != null)
var mis = monoType.GetChildReferences(Mono.Debugging.Client.EvaluationOptions.DefaultOptions);
foreach (var mi in mis)
{
NamedValueCollection nvc = val.GetMembers(type, flags);
foreach (NamedValue v in nvc)
{
try
{
if (v is MemberValue && (v as MemberValue).MemberInfo is PropertyInfo && ((v as MemberValue).MemberInfo as PropertyInfo).GetGetMethod().ParameterCount > 0)
continue;
list.Add(new ValueItem(v,this.DebugType));
}
catch (System.Exception)
{
}
}
try
{
if (!mi.Name.Contains("$"))
{
/*if (!privateMembers && ((mi.Flags & Mono.Debugging.Client.ObjectValueFlags.Public) == Mono.Debugging.Client.ObjectValueFlags.Public
|| (mi.Flags & Mono.Debugging.Client.ObjectValueFlags.Internal) == Mono.Debugging.Client.ObjectValueFlags.Internal
|| (mi.Flags & Mono.Debugging.Client.ObjectValueFlags.Protected) == Mono.Debugging.Client.ObjectValueFlags.Protected
|| (mi.Flags & Mono.Debugging.Client.ObjectValueFlags.InternalProtected) == Mono.Debugging.Client.ObjectValueFlags.InternalProtected))
list.Add(new ValueItem(mi.CreateObjectValue(false, Mono.Debugging.Client.EvaluationOptions.DefaultOptions)));
else if (privateMembers && (mi.Flags & Mono.Debugging.Client.ObjectValueFlags.Private) == Mono.Debugging.Client.ObjectValueFlags.Private)
list.Add(new ValueItem(mi.CreateObjectValue(false, Mono.Debugging.Client.EvaluationOptions.DefaultOptions)));*/
list.Add(new ValueItem(mi.CreateObjectValue(false, Mono.Debugging.Client.EvaluationOptions.DefaultOptions)));
}
}
catch (System.Exception e)
{
}
}
else
System.Reflection.BindingFlags bf = System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Static;
if (!privateMembers)
bf |= System.Reflection.BindingFlags.Public;
else
bf |= System.Reflection.BindingFlags.NonPublic;
System.Reflection.FieldInfo[] fis = managed_type.GetFields(bf);
/*for (int i = 0; i < fis.Length; i++)
{
IList<MemberInfo> mis = type.GetMembers(flags);
for (int i=0; i<mis.Count; i++)
{
try
{
if (mis[i].IsStatic && !mis[i].Name.Contains("$"))
{
if (mis[i] is FieldInfo)
{
FieldInfo fi = mis[i] as FieldInfo;
Value v = fi.GetValue(null);
list.Add(new ValueItem(v as NamedValue, this.DebugType));
}
else if (mis[i] is PropertyInfo)
{
PropertyInfo pi = mis[i] as PropertyInfo;
Value v = pi.GetValue(null);
list.Add(new ValueItem(v as NamedValue, this.DebugType));
}
}
}
catch(System.Exception e)
{
}
}
System.Reflection.BindingFlags bf = System.Reflection.BindingFlags.Instance|System.Reflection.BindingFlags.Static;
if ((flags & BindingFlags.Public) == BindingFlags.Public) bf |= System.Reflection.BindingFlags.Public;
else bf |= System.Reflection.BindingFlags.NonPublic;
System.Reflection.FieldInfo[] fis = managed_type.GetFields(bf);
for (int i=0; i<fis.Length; i++)
{
if (fis[i].IsLiteral)
{
Value v = DebugUtils.MakeValue(fis[i].GetRawConstantValue());
list.Add(new ValueItem(v,fis[i].Name,v.Type));
}
}
}
if (fis[i].IsLiteral)
{
Value v = DebugUtils.MakeValue(fis[i].GetRawConstantValue());
list.Add(new ValueItem(v, fis[i].Name, v.Type));
}
}*/
//return new List<ListItem>();
return list;
}
[HandleProcessCorruptedStateExceptionsAttribute]
IList<IListItem> GetSubItemsForCollection()
{
List<IListItem> list = new List<IListItem>();
if (val == null) return list;
try
{
int count = (int)val.GetMember("Count").PrimitiveValue;
if (DebugUtils.IsStack(type) || DebugUtils.IsQueue(type))
{
Value nv = val.GetMember("_array");
NamedValueCollection nvc = nv.GetArrayElements();
count = (count < 10)?count:10;
for (int i=0; i<count; i++)
{
list.Add(new ValueItem(nvc[i],nvc[i].Type));
}
}
else if (DebugUtils.IsDictionary(type))
{
NamedValue nv = val.GetMember("entries");
NamedValueCollection nvc = nv.GetArrayElements();
count = (count < 10)?count:10;
for (int i=0; i<count; i++)
{
nv = nvc[i];
Value key = nv.GetMember("key");
Value _val = nv.GetMember("value");
list.Add(new PairValueItem(key as NamedValue,_val as NamedValue,"["+i.ToString()+"]"));
}
}
else
if (DebugUtils.IsHashtable(type))
{
NamedValue nv = val.GetMember("buckets");
NamedValueCollection nvc = nv.GetArrayElements();
count = 0;
for (int i=0; i<nvc.Count; i++)
{
nv = nvc[i];
Value key = nv.GetMember("key");
Value _val = nv.GetMember("val");
if (!key.IsNull)
{
list.Add(new PairValueItem(key as NamedValue,_val as NamedValue,"["+count.ToString()+"]"));
if (count > 10) break;
count++;
}
}
}
else if (DebugUtils.IsSortedList(type))
{
NamedValue nv_keys = val.GetMember("keys");
NamedValue nv_values = val.GetMember("values");
count = (int)val.GetMember("Count").PrimitiveValue;
NamedValueCollection nvc_keys = nv_keys.GetArrayElements();
NamedValueCollection nvc_values = nv_values.GetArrayElements();
for (int i=0; i<count; i++)
{
list.Add(new PairValueItem(nvc_keys[i],nvc_values[i],"["+i.ToString()+"]"));
if (i > 10) break;
}
}
else if (DebugUtils.IsSortedDictionary(type))
{
NamedValue nv = val.GetMember("_set").GetMember("root");
int i = 0;
while (i<=10 && !nv.IsNull)
{
NamedValue tmp = nv.GetMember("item");
list.Add(new PairValueItem(tmp.GetMember("key"),tmp.GetMember("value"),"["+i.ToString()+"]"));
nv = nv.GetMember("right");
i++;
}
}
else if (DebugUtils.IsLinkedList(type))
{
NamedValue nv = val.GetMember("First");
int i = 0;
while (i<=10 && !nv.IsNull)
{
list.Add(new ValueItem(nv.GetMember("Value"),"["+i.ToString()+"]",nv.Type,true));
nv = nv.GetMember("Next");
i++;
}
}
else
{
MethodInfo mi = type.GetMember("get_Item",BindingFlags.All)[0] as MethodInfo;
count = (count < 100)?count:100;
for (int i=0; i<count; i++)
{
Value v = mi.Invoke(val,new Value[1]{DebugUtils.MakeValue(i)});
list.Add(new ValueItem(v,"["+i.ToString()+"]",v.Type));
}
}
IList<IListItem> raw_items = GetSubItems(true);
list.Add(new FixedItem(-1,PascalABCCompiler.StringResources.Get("DEBUG_VIEW_RAW_VIEW"),string.Empty,string.Empty,true,raw_items));
}
catch (System.Exception e)
{
return null;
}
return list;
return list;
}
[HandleProcessCorruptedStateExceptionsAttribute]
IList<IListItem> GetSubItems(bool is_raw)
@ -1332,7 +1202,7 @@ namespace VisualPascalABC
List<IListItem> list = new List<IListItem>();
try
{
if (DebugUtils.CheckForCollection(type) && !is_raw)
if (DebugUtils.CheckForCollection(monoType) && !is_raw)
{
IList<IListItem> lst = GetSubItemsForCollection();
if (lst != null) return lst;
@ -1341,46 +1211,13 @@ namespace VisualPascalABC
string staticRes = PascalABCCompiler.StringResources.Get("DEBUG_VIEW_STATIC");//StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.StaticMembers}");
string privateStaticRes = PascalABCCompiler.StringResources.Get("DEBUG_VIEW_PRIVATE_STATIC");// StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.PrivateStaticMembers}");
List<IListItem> publicInstance = null;
List<IListItem> privateInstance = null;
List<IListItem> publicStatic = GetMembers(false);
//List<IListItem> privateStatic = GetMembers(true);
if (val != null)
{
publicInstance = GetMembers(BindingFlags.Public | BindingFlags.Instance);
privateInstance = GetMembers(BindingFlags.NonPublic | BindingFlags.Instance);
}
List<IListItem> publicStatic = GetMembers(BindingFlags.Public | BindingFlags.Static);
List<IListItem> privateStatic = GetMembers(BindingFlags.NonPublic | BindingFlags.Static);
if (type.BaseType != null && type.BaseType.FullName != "System.Object" && type.BaseType.FullName != "System.ValueType")
{
list.Add(new BaseTypeItem(val, type.BaseType));
}
if (val != null)
{
list.AddRange(publicInstance);
if (publicStatic.Count > 0)
{
list.Add(new FixedItem(-1, staticRes, String.Empty, String.Empty, true, publicStatic));
}
if (privateInstance.Count > 0 || privateStatic.Count > 0)
{
List<IListItem> nonPublicItems = new List<IListItem>();
if (privateStatic.Count > 0)
{
nonPublicItems.Add(new FixedItem(-1, privateStaticRes, String.Empty, String.Empty, true, privateStatic));
}
nonPublicItems.AddRange(privateInstance);
list.Add(new FixedItem(-1, privateRes, String.Empty, String.Empty, true, nonPublicItems));
}
}
else
{
list.AddRange(publicStatic);
if (privateStatic.Count > 0)
list.Add(new FixedItem(-1, privateRes, String.Empty, String.Empty, true, privateStatic));
}
list.AddRange(publicStatic);
//if (privateStatic.Count > 0)
// list.Add(new FixedItem(-1, privateRes, String.Empty, String.Empty, true, privateStatic));
}
catch (System.Exception e)
{

8
VisualPascalABCNETLinux/IB/Debugger/Utility.cs
View file

@ -43,6 +43,14 @@ namespace VisualPascalABC
return ht[name] != null;
}
public static bool CheckForCollection(Mono.Debugging.Evaluation.TypeValueReference type)
{
string name = type.Name;
int ind = name.IndexOf('<');
if (ind != -1) name = name.Substring(0, ind);
return ht[name] != null;
}
public static NamedValue GetNullBasedArray(Value val)
{
IList<FieldInfo> flds = val.Type.GetFields();

10
VisualPascalABCNETLinux/MonoDebugging/Soft/SoftDebuggerSession.cs
View file

@ -723,7 +723,15 @@ namespace Mono.Debugging.Soft
if (!types.TryGetValue (fullName, out typesList))
aliases.TryGetValue (fullName, out typesList);
if (typesList == null)
return null;
{
var vm_types = vm.GetTypes(fullName, true);
foreach (var vm_type in vm_types)
ProcessType(vm_type);
if (!types.TryGetValue(fullName, out typesList))
aliases.TryGetValue(fullName, out typesList);
if (typesList == null)
return null;
}
if (typesList.Count == 1)
return typesList [0];
//Idea here is... If we have multiple types with same name... they must be in different .dlls