pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

ObjectVariable.cs refactored to use MetaData wrapper 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@194 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 20 years ago
parent
d36c857e14
commit
b53e606f1b
2 changed files with 36 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs
  2. 143
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ObjectVariable.cs

9
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs
Unescape View File

@ -29,6 +29,13 @@ namespace DebuggerLibrary @@ -29,6 +29,13 @@ namespace DebuggerLibrary
return metaDataInterface;
}
}
internal MetaData MetaData {
get {
return new MetaData(metaDataInterface);
}
}
public ISymbolReader SymReader {
get {
return symReader;
@ -126,7 +133,7 @@ namespace DebuggerLibrary @@ -126,7 +133,7 @@ namespace DebuggerLibrary
SymBinder symBinder = new SymBinder();
try {
symReader = symBinder.GetReader(Marshal.GetIUnknownForObject(metaDataInterface), fullPath, string.Empty);
} catch (System.Exception e) {
} catch (System.Exception) {
symReader = null;
}
}

143
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/ObjectVariable.cs
Unescape View File

@ -17,23 +17,21 @@ namespace DebuggerLibrary @@ -17,23 +17,21 @@ namespace DebuggerLibrary
{
ICorDebugClass corClass;
ICorDebugModule corModule;
IMetaDataImport metaData;
MetaData metaData;
ICorDebugModule corModuleSuperclass;
ObjectVariable baseClass;
uint classToken;
uint superCallsToken;
uint typeDefFlags;
string type;
TypeDefProps classProps;
public override object Value {
get{
return "{" + type + "}";
return "{" + Type + "}";
}
}
public override string Type {
get{
return type;
return classProps.Name;
}
}
@ -52,30 +50,12 @@ namespace DebuggerLibrary @@ -52,30 +50,12 @@ namespace DebuggerLibrary
void InitObjectVariable ()
{
uint classToken;
corClass.GetToken(out classToken);
corClass.GetModule(out corModule);
metaData = new Module(corModule).MetaDataInterface; //TODO
uint pStringLenght = 0; // Terminating character included in pStringLenght
IntPtr pString = IntPtr.Zero;
// Get length of string 'type'
metaData.GetTypeDefProps(classToken,
pString,
pStringLenght,
out pStringLenght,
out typeDefFlags,
out superCallsToken);
// Allocate string buffer
pString = Marshal.AllocHGlobal((int)pStringLenght * 2);
// Get properties
metaData.GetTypeDefProps(classToken,
pString,
pStringLenght,
out pStringLenght,
out typeDefFlags,
out superCallsToken);
type = Marshal.PtrToStringUni(pString);
Marshal.FreeHGlobal(pString);
metaData = new Module(corModule).MetaData;
classProps = metaData.GetTypeDefProps(classToken);
corModuleSuperclass = corModule;
}
@ -85,66 +65,20 @@ namespace DebuggerLibrary @@ -85,66 +65,20 @@ namespace DebuggerLibrary
{
VariableCollection subVariables = new VariableCollection();
IntPtr fieldsEnumPtr = IntPtr.Zero;
for(;;)
{
uint fieldToken;
uint fieldCount;
metaData.EnumFields(ref fieldsEnumPtr, classToken, out fieldToken, 1, out fieldCount);
if (fieldCount == 0)
{
metaData.CloseEnum(fieldsEnumPtr);
break;
}
foreach(FieldProps field in metaData.EnumFields(classProps.Token)) {
uint unused;
IntPtr unusedPtr = IntPtr.Zero;
uint pStringLenght = 0; // Terminating character included in pStringLenght
IntPtr pString = IntPtr.Zero;
uint attrib;
metaData.GetFieldProps(fieldToken,
out unused,
pString,
pStringLenght,
out pStringLenght, // real string lenght
out attrib,
IntPtr.Zero,
out unused,
out unused,
out unusedPtr,
out unused);
// Allocate string buffer
pString = Marshal.AllocHGlobal((int)pStringLenght * 2);
metaData.GetFieldProps(fieldToken,
out unused,
pString,
pStringLenght,
out pStringLenght, // real string lenght
out attrib,
IntPtr.Zero,
out unused,
out unused,
out unusedPtr,
out unused);
string name = Marshal.PtrToStringUni(pString);
Marshal.FreeHGlobal(pString);
ICorDebugValue innerValue;
if ((attrib & (uint)ClassFieldAttribute.fdStatic)!=0)
{
if ((attrib & (uint)ClassFieldAttribute.fdLiteral)!=0) continue; // Get next field
corClass.GetStaticFieldValue(fieldToken, null, out innerValue);
}
else
{
ICorDebugValue filedValue;
if (field.IsStatic) {
if (field.IsLiteral) continue; // Try next field
corClass.GetStaticFieldValue(field.Token, null, out filedValue);
} else {
if (corValue == null) continue; // Try next field
((ICorDebugObjectValue)corValue).GetFieldValue(corClass, fieldToken, out innerValue);
((ICorDebugObjectValue)corValue).GetFieldValue(corClass, field.Token, out filedValue);
}
subVariables.Add(VariableFactory.CreateVariable(debugger, innerValue, name));
subVariables.Add(VariableFactory.CreateVariable(debugger, filedValue, field.Name));
}
return subVariables;
@ -170,36 +104,18 @@ namespace DebuggerLibrary @@ -170,36 +104,18 @@ namespace DebuggerLibrary
string fullTypeName = "<>";
// If referencing to external assembly
if ((superCallsToken & 0x01000000) != 0)
{
uint unused;
uint pStringLenght = 0; // Terminating character included in pStringLenght
IntPtr pString = IntPtr.Zero;
metaData.GetTypeRefProps(superCallsToken,
out unused,
pString,
pStringLenght,
out pStringLenght); // real string lenght
// Allocate string buffer
pString = Marshal.AllocHGlobal((int)pStringLenght * 2);
metaData.GetTypeRefProps(superCallsToken,
out unused,
pString,
pStringLenght,
out pStringLenght); // real string lenght
fullTypeName = Marshal.PtrToStringUni(pString);
Marshal.FreeHGlobal(pString);
superCallsToken = 0;
if ((classProps.SuperClassToken & 0x01000000) != 0) {
fullTypeName = metaData.GetTypeRefProps(classProps.SuperClassToken).Name;
classProps.SuperClassToken = 0;
foreach (Module m in debugger.Modules)
{
// TODO: Does not work for nested
// see FindTypeDefByName in dshell.cpp
// TODO: preservesig
try {
m.MetaDataInterface.FindTypeDefByName(fullTypeName, 0, out superCallsToken);
m.MetaDataInterface.FindTypeDefByName(fullTypeName, 0, out classProps.SuperClassToken);
}
catch {
continue;
@ -207,18 +123,15 @@ namespace DebuggerLibrary @@ -207,18 +123,15 @@ namespace DebuggerLibrary
corModuleSuperclass = m.CorModule;
break;
}
if (superCallsToken == 0) throw new DebuggerException("Unable to get base class: " + fullTypeName);
if (classProps.SuperClassToken == 0) throw new DebuggerException("Unable to get base class: " + fullTypeName);
}
// If it has no base class
if ((superCallsToken & 0x00FFFFFF) == 0)
{
if ((classProps.SuperClassToken & 0x00FFFFFF) == 0) {
return null;
}
else
{
} else {
ICorDebugClass superClass;
corModuleSuperclass.GetClassFromToken(superCallsToken, out superClass);
corModuleSuperclass.GetClassFromToken(classProps.SuperClassToken, out superClass);
return new ObjectVariable(debugger, corValue, Name, superClass);
}
}

Write Preview
Loading…
Cancel
Save