Browse Source

Merge pull request #194 from KevinCathcart/master

A couple of small IL improvements
pull/196/merge
Daniel Grunwald 14 years ago
parent
commit
bf4f8a04ed
  1. 6
      ICSharpCode.Decompiler/Disassembler/DisassemblerHelpers.cs
  2. 7
      ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs
  3. 1
      ILSpy/TextView/ILAsm-Mode.xshd

6
ICSharpCode.Decompiler/Disassembler/DisassemblerHelpers.cs

@ -110,8 +110,12 @@ namespace ICSharpCode.Decompiler.Disassembler @@ -110,8 +110,12 @@ namespace ICSharpCode.Decompiler.Disassembler
public static void WriteTo(this MethodReference method, ITextOutput writer)
{
if (method.HasThis)
if (method.ExplicitThis) {
writer.Write("instance explicit ");
}
else if (method.HasThis) {
writer.Write("instance ");
}
method.ReturnType.WriteTo(writer, ILNameSyntax.SignatureNoNamedTypeParameters);
writer.Write(' ');
if (method.DeclaringType != null) {

7
ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs

@ -94,6 +94,7 @@ namespace ICSharpCode.Decompiler.Disassembler @@ -94,6 +94,7 @@ namespace ICSharpCode.Decompiler.Disassembler
{ MethodImplAttributes.NoOptimization, "nooptimization" },
{ MethodImplAttributes.PreserveSig, "preservesig" },
{ MethodImplAttributes.InternalCall, "internalcall" },
{ MethodImplAttributes.ForwardRef, "forwardref" },
};
public void DisassembleMethod(MethodDefinition method)
@ -153,9 +154,11 @@ namespace ICSharpCode.Decompiler.Disassembler @@ -153,9 +154,11 @@ namespace ICSharpCode.Decompiler.Disassembler
output.WriteLine();
output.Indent();
if (method.HasThis)
if (method.ExplicitThis) {
output.Write("instance explicit ");
} else if (method.HasThis) {
output.Write("instance ");
}
//call convention
WriteEnum(method.CallingConvention & (MethodCallingConvention)0x1f, callingConvention);

1
ILSpy/TextView/ILAsm-Mode.xshd

@ -348,6 +348,7 @@ @@ -348,6 +348,7 @@
<Word>tls</Word>
<Word>true</Word>
<Word>false</Word>
<Word>strict</Word>
</Keywords>
<Keywords color="Directives">
<Word>.class</Word>

Loading…
Cancel
Save