← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to contrib/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs
674
674
                public void DisassembleField(FieldDefinition field)
675
675
                {
676
676
                        output.WriteDefinition(".field ", field);
 
677
                        if (field.HasLayoutInfo) {
 
678
                                output.Write("[" + field.Offset + "] ");
 
679
                        }
677
680
                        WriteEnum(field.Attributes & FieldAttributes.FieldAccessMask, fieldVisibility);
678
681
                        const FieldAttributes hasXAttributes = FieldAttributes.HasDefault | FieldAttributes.HasFieldMarshal | FieldAttributes.HasFieldRVA;
679
682
                        WriteFlags(field.Attributes & ~(FieldAttributes.FieldAccessMask | hasXAttributes), fieldAttributes);
809
812
                        { TypeAttributes.SpecialName, "specialname" },
810
813
                        { TypeAttributes.Import, "import" },
811
814
                        { TypeAttributes.Serializable, "serializable" },
 
815
                        { TypeAttributes.WindowsRuntime, "windowsruntime" },
812
816
                        { TypeAttributes.BeforeFieldInit, "beforefieldinit" },
813
817
                        { TypeAttributes.HasSecurity, null },
814
818
                };
1075
1079
                
1076
1080
                public void WriteAssemblyHeader(AssemblyDefinition asm)
1077
1081
                {
1078
 
                        output.Write(".assembly " + DisassemblerHelpers.Escape(asm.Name.Name));
 
1082
                        output.Write(".assembly ");
 
1083
                        if (asm.Name.IsWindowsRuntime)
 
1084
                                output.Write("windowsruntime ");
 
1085
                        output.Write(DisassemblerHelpers.Escape(asm.Name.Name));
1079
1086
                        OpenBlock(false);
1080
1087
                        WriteAttributes(asm.CustomAttributes);
1081
1088
                        WriteSecurityDeclarations(asm);
1103
1110
                                output.WriteLine(".module extern {0}", DisassemblerHelpers.Escape(mref.Name));
1104
1111
                        }
1105
1112
                        foreach (var aref in module.AssemblyReferences) {
1106
 
                                output.Write(".assembly extern {0}", DisassemblerHelpers.Escape(aref.Name));
 
1113
                                output.Write(".assembly extern ");
 
1114
                                if (aref.IsWindowsRuntime)
 
1115
                                        output.Write("windowsruntime ");
 
1116
                                output.Write(DisassemblerHelpers.Escape(aref.Name));
1107
1117
                                OpenBlock(false);
1108
1118
                                if (aref.PublicKeyToken != null) {
1109
1119
                                        output.Write(".publickeytoken = ");