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

Use Cecil instead of my own code to parse the signatures 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4340 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 17 years ago
parent
3a9080c49d
commit
87498ad3a7
4 changed files with 112 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
  2. 77
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs
  3. 4
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Mono.Cecil/Mono.Cecil.Metadata/Utilities.cs
  4. 38
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs

47
src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
Unescape View File

@ -232,6 +232,46 @@
<Compile Include="Src\Metadata\MemberInfo.cs" /> <Compile Include="Src\Metadata\MemberInfo.cs" />
<Compile Include="Src\Metadata\MethodInfo.cs" /> <Compile Include="Src\Metadata\MethodInfo.cs" />
<Compile Include="Src\Metadata\PropertyInfo.cs" /> <Compile Include="Src\Metadata\PropertyInfo.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Binary\ImageFormatException.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Metadata\CodedIndex.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Metadata\ElementType.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Metadata\MetadataFormatException.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Metadata\MetadataToken.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Metadata\TokenType.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Metadata\Utilities.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\Array.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\ArrayShape.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\BaseSignatureVisitor.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\Class.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\Constraint.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\CustomMod.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\FieldSig.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\FnPtr.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\GenericArg.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\GenericInst.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\GenericInstSignature.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\InputOutputItem.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\ISignatureVisitable.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\ISignatureVisitor.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\LocalVarSig.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\MethodDefSig.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\MethodRefSig.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\MethodSig.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\MethodSpec.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\MVar.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\Param.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\PropertySig.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\Ptr.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\RetType.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\Signature.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\SignatureReader.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\SigType.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\SzArray.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\TypeSpec.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\ValueType.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\Var.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil\MethodCallingConvention.cs" />
<Compile Include="Src\Mono.Cecil\Mono.Cecil\ReflectionException.cs" />
<Compile Include="Src\Util\HighPrecisionTimer.cs" /> <Compile Include="Src\Util\HighPrecisionTimer.cs" />
<Compile Include="Src\Values\ArrayDimension.cs" /> <Compile Include="Src\Values\ArrayDimension.cs" />
<Compile Include="Src\Values\ArrayDimensions.cs" /> <Compile Include="Src\Values\ArrayDimensions.cs" />
@ -417,5 +457,12 @@
<Install>false</Install> <Install>false</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Src\Mono.Cecil" />
<Folder Include="Src\Mono.Cecil\Mono.Cecil" />
<Folder Include="Src\Mono.Cecil\Mono.Cecil.Binary" />
<Folder Include="Src\Mono.Cecil\Mono.Cecil.Metadata" />
<Folder Include="Src\Mono.Cecil\Mono.Cecil.Signatures" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project> </Project>

77
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata/DebugType.cs
Unescape View File

@ -10,6 +10,8 @@ using System.Collections.Generic;
using Debugger.Wrappers.CorDebug; using Debugger.Wrappers.CorDebug;
using Debugger.Wrappers.MetaData; using Debugger.Wrappers.MetaData;
using Mono.Cecil.Signatures;
namespace Debugger.MetaData namespace Debugger.MetaData
{ {
public enum DebugTypeKind { Array, Class, ValueType, Primitive, Pointer, Void }; public enum DebugTypeKind { Array, Class, ValueType, Primitive, Pointer, Void };
@ -357,83 +359,64 @@ namespace Debugger.MetaData
return Create(module.Process, GetCorClass(module, token)); return Create(module.Process, GetCorClass(module, token));
} else if (tokenType == CorTokenType.TypeSpec) { } else if (tokenType == CorTokenType.TypeSpec) {
Blob typeSpecBlob = module.MetaData.GetTypeSpecFromToken(token); Blob typeSpecBlob = module.MetaData.GetTypeSpecFromToken(token);
Queue<byte> sig = new Queue<byte>(typeSpecBlob.GetData()); return Create(module, typeSpecBlob.GetData(), signatureContext);
return Create(module, sig, signatureContext);
} else { } else {
throw new DebuggerException("Unknown token type"); throw new DebuggerException("Unknown token type");
} }
} }
public static DebugType Create(Module module, Queue<byte> sig) public static DebugType Create(Module module, byte[] sig)
{ {
return Create(module, sig, null); return Create(module, sig, null);
} }
/// <param name="signatureContext">Type definition to use to resolve numbered generic references</param> /// <param name="signatureContext">Type definition to use to resolve numbered generic references</param>
public static DebugType Create(Module module, Queue<byte> sig, DebugType signatureContext) public static DebugType Create(Module module, byte[] sig, DebugType signatureContext)
{ {
CorElementType corType = (CorElementType)sig.Dequeue(); SignatureReader sigReader = new SignatureReader(sig);
int start;
SigType sigType = sigReader.ReadType(sig, 0, out start);
System.Type sysType = CorElementTypeToManagedType(corType); return Create(module, sigType, signatureContext);
}
static DebugType Create(Module module, SigType sigType, DebugType signatureContext)
{
System.Type sysType = CorElementTypeToManagedType((CorElementType)(uint)sigType.ElementType);
if (sysType != null) { if (sysType != null) {
return Create(module.Process, module.AppDomainID, sysType.FullName); return Create(module.Process, module.AppDomainID, sysType.FullName);
} }
if (corType == CorElementType.CLASS || corType == CorElementType.VALUETYPE) { if (sigType is CLASS) {
uint typeDefOrRef = ReadTypeDefOrRefEncoded(sig); ICorDebugClass corClass = GetCorClass(module, ((CLASS)sigType).Type.ToUInt());
ICorDebugClass corClass = GetCorClass(module, typeDefOrRef); return Create(module.Process, corClass);
}
if (sigType is VALUETYPE) {
ICorDebugClass corClass = GetCorClass(module, ((VALUETYPE)sigType).Type.ToUInt());
return Create(module.Process, corClass); return Create(module.Process, corClass);
} }
// Numbered generic reference // Numbered generic reference
if (corType == CorElementType.VAR) { if (sigType is VAR) {
uint genArgIndex = ReadCompressedInt(sig);
if (signatureContext == null) throw new DebuggerException("Signature context is needed"); if (signatureContext == null) throw new DebuggerException("Signature context is needed");
return signatureContext.GenericArguments[(int)genArgIndex]; return signatureContext.GenericArguments[((VAR)sigType).Index];
} }
if (corType == CorElementType.GENERICINST) { if (sigType is GENERICINST) {
CorElementType classOrValueType = (CorElementType)sig.Dequeue(); GENERICINST genInst = (GENERICINST)sigType;
CorElementType classOrValueType = genInst.ValueType ? CorElementType.VALUETYPE : CorElementType.CLASS;
uint typeDefOrRef = ReadTypeDefOrRefEncoded(sig); ICorDebugClass corClass = GetCorClass(module, genInst.Type.ToUInt());
ICorDebugClass corClass = GetCorClass(module, typeDefOrRef); ICorDebugType[] genArgs = new ICorDebugType[genInst.Signature.Arity];
uint genArgsCount = ReadCompressedInt(sig);
ICorDebugType[] genArgs = new ICorDebugType[genArgsCount];
for(int i = 0; i < genArgs.Length; i++) { for(int i = 0; i < genArgs.Length; i++) {
genArgs[i] = Create(module, sig, signatureContext).CorType; genArgs[i] = Create(module, genInst.Signature.Types[i].Type, signatureContext).CorType;
} }
ICorDebugType genInstance = corClass.CastTo<ICorDebugClass2>().GetParameterizedType((uint)classOrValueType, genArgs); ICorDebugType genInstance = corClass.CastTo<ICorDebugClass2>().GetParameterizedType((uint)classOrValueType, genArgs);
return Create(module.Process, genInstance); return Create(module.Process, genInstance);
} }
throw new NotImplementedException(); throw new NotImplementedException(sigType.ElementType.ToString());
}
static uint ReadTypeDefOrRefEncoded(Queue<byte> sig)
{
uint i = ReadCompressedInt(sig);
uint table = i & 0x3;
uint index = i >> 2;
CorTokenType[] tables = new CorTokenType[] {CorTokenType.TypeDef, CorTokenType.TypeRef, CorTokenType.TypeSpec};
uint token = (uint)tables[table] | index;
return token;
}
static uint ReadCompressedInt(Queue<byte> sig)
{
if ((sig.Peek() & 0x80) == 0x00) { // 1 bit
return (uint)sig.Dequeue();
} else if ((sig.Peek() & 0xC0) == 0x80) { // 2 bit
return (((uint)sig.Dequeue() & 0x3F) << 8) + (uint)sig.Dequeue();
} else if ((sig.Peek() & 0xE0) == 0xC0) { // 4 bit
return (((uint)sig.Dequeue() & 0x1F) << 24) + ((uint)sig.Dequeue() << 16) + ((uint)sig.Dequeue() << 8) + (uint)sig.Dequeue();
} else {
throw new DebuggerException("Unexpected value in signature");
}
} }
public static DebugType Create(Process process, uint? domainID, string fullTypeName) public static DebugType Create(Process process, uint? domainID, string fullTypeName)

4
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Mono.Cecil/Mono.Cecil.Metadata/Utilities.cs
Unescape View File

@ -465,6 +465,8 @@ namespace Mono.Cecil.Metadata {
throw new MetadataFormatException ("Non valid CodedIndex"); throw new MetadataFormatException ("Non valid CodedIndex");
} }
} }
/*
internal static Type GetCorrespondingTable (TokenType t) internal static Type GetCorrespondingTable (TokenType t)
{ {
@ -641,5 +643,7 @@ namespace Mono.Cecil.Metadata {
codedIndexCache [ci] = res; codedIndexCache [ci] = res;
return res; return res;
} }
*/
} }
} }

38
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs
Unescape View File

@ -38,6 +38,17 @@ namespace Mono.Cecil.Signatures {
internal sealed class SignatureReader : BaseSignatureVisitor { internal sealed class SignatureReader : BaseSignatureVisitor {
byte [] m_blobData;
IDictionary m_signatures;
public SignatureReader (byte [] blobData)
{
m_blobData = blobData;
m_signatures = new Hashtable ();
}
/*
MetadataRoot m_root; MetadataRoot m_root;
ReflectionReader m_reflectReader; ReflectionReader m_reflectReader;
byte [] m_blobData; byte [] m_blobData;
@ -57,6 +68,8 @@ namespace Mono.Cecil.Signatures {
m_signatures = new Hashtable (); m_signatures = new Hashtable ();
} }
*/
public FieldSig GetFieldSig (uint index) public FieldSig GetFieldSig (uint index)
{ {
@ -136,6 +149,8 @@ namespace Mono.Cecil.Signatures {
} }
return lv; return lv;
} }
/*
public CustomAttrib GetCustomAttrib (uint index, MethodReference ctor) public CustomAttrib GetCustomAttrib (uint index, MethodReference ctor)
{ {
@ -157,6 +172,8 @@ namespace Mono.Cecil.Signatures {
BinaryReader br = new BinaryReader (new MemoryStream (data)); BinaryReader br = new BinaryReader (new MemoryStream (data));
return ReadCustomAttrib (br, data, ctor, resolve); return ReadCustomAttrib (br, data, ctor, resolve);
} }
*/
public Signature GetMemberRefSig (TokenType tt, uint index) public Signature GetMemberRefSig (TokenType tt, uint index)
{ {
@ -179,6 +196,8 @@ namespace Mono.Cecil.Signatures {
} }
return null; return null;
} }
/*
public MarshalSig GetMarshalSig (uint index) public MarshalSig GetMarshalSig (uint index)
{ {
@ -190,18 +209,19 @@ namespace Mono.Cecil.Signatures {
} }
return ms; return ms;
} }
*/
public MethodSig GetStandAloneMethodSig (uint index) public MethodSig GetStandAloneMethodSig (uint index)
{ {
byte [] data = m_root.Streams.BlobHeap.Read (index);
int start; int start;
if ((data [0] & 0x5) > 0) { if ((m_blobData [index] & 0x5) > 0) {
MethodRefSig mrs = new MethodRefSig (index); MethodRefSig mrs = new MethodRefSig (index);
ReadMethodRefSig (mrs, data, 0, out start); ReadMethodRefSig (mrs, m_blobData, (int)index, out start);
return mrs; return mrs;
} else { } else {
MethodDefSig mds = new MethodDefSig (index); MethodDefSig mds = new MethodDefSig (index);
ReadMethodDefSig (mds, data, 0, out start); ReadMethodDefSig (mds, m_blobData, (int)index, out start);
return mds; return mds;
} }
} }
@ -209,13 +229,13 @@ namespace Mono.Cecil.Signatures {
public override void VisitMethodDefSig (MethodDefSig methodDef) public override void VisitMethodDefSig (MethodDefSig methodDef)
{ {
int start; int start;
ReadMethodDefSig (methodDef, m_root.Streams.BlobHeap.Read (methodDef.BlobIndex), 0, out start); ReadMethodDefSig (methodDef, m_blobData, (int)methodDef.BlobIndex, out start);
} }
public override void VisitMethodRefSig (MethodRefSig methodRef) public override void VisitMethodRefSig (MethodRefSig methodRef)
{ {
int start; int start;
ReadMethodRefSig (methodRef, m_root.Streams.BlobHeap.Read (methodRef.BlobIndex), 0, out start); ReadMethodRefSig (methodRef, m_blobData, (int)methodRef.BlobIndex, out start);
} }
public override void VisitFieldSig (FieldSig field) public override void VisitFieldSig (FieldSig field)
@ -445,7 +465,7 @@ namespace Mono.Cecil.Signatures {
return p; return p;
} }
SigType ReadType (byte [] data, int pos, out int start) public SigType ReadType (byte [] data, int pos, out int start)
{ {
start = pos; start = pos;
ElementType element = (ElementType) Utilities.ReadCompressedInteger (data, start, out start); ElementType element = (ElementType) Utilities.ReadCompressedInteger (data, start, out start);
@ -576,6 +596,8 @@ namespace Mono.Cecil.Signatures {
(uint) Utilities.ReadCompressedInteger (data, start, out start)); (uint) Utilities.ReadCompressedInteger (data, start, out start));
return cm; return cm;
} }
/*
CustomAttrib ReadCustomAttrib (int pos, MethodReference ctor, bool resolve) CustomAttrib ReadCustomAttrib (int pos, MethodReference ctor, bool resolve)
{ {
@ -957,5 +979,7 @@ namespace Mono.Cecil.Signatures {
// COMPACT FRAMEWORK NOTE: Encoding.GetString (byte[]) is not supported. // COMPACT FRAMEWORK NOTE: Encoding.GetString (byte[]) is not supported.
return Encoding.UTF8.GetString (data, pos, length); return Encoding.UTF8.GetString (data, pos, length);
} }
*/
} }
} }

Write Preview
Loading…
Cancel
Save