Hello community, here is the log from the commit of package mono-debugger for openSUSE:Factory checked in at Tue Feb 22 20:31:55 CET 2011.
-------- --- mono-debugger/mono-debugger.changes 2011-01-07 17:34:12.000000000 +0100 +++ mono-debugger/mono-debugger.changes 2011-02-22 18:17:13.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 22 17:16:52 UTC 2011 - ajorgen...@novell.com + +- Update to 2.10 + * http://www.go-mono.com/archive/2.10 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mono-debugger-2.8.1.tar.bz2 New: ---- mono-debugger-2.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-debugger.spec ++++++ --- /var/tmp/diff_new_pack.EICboT/_old 2011-02-22 20:31:24.000000000 +0100 +++ /var/tmp/diff_new_pack.EICboT/_new 2011-02-22 20:31:24.000000000 +0100 @@ -23,7 +23,7 @@ Group: Development/Languages/Mono Summary: Mono Debugger Url: http://www.mono-project.com/Debugger -Version: 2.8.1 +Version: 2.10 Release: 1 Source0: %{name}-%{version}.tar.bz2 ExclusiveArch: %ix86 x86_64 @@ -62,6 +62,10 @@ %install make install DESTDIR=%{buildroot} +# Unset executable bit on .exe files +# This prevents the dbuginfo macros from scanning them +find %{buildroot} -name '*.exe' -exec chmod a-x '{}' ';' +find %{buildroot} -name '*.dll' -exec chmod a-x '{}' ';' # Remove unnecessary devel files rm -f %{buildroot}%_libdir/*.la rm -f %{buildroot}%_libdir/*.a ++++++ mono-debugger-2.8.1.tar.bz2 -> mono-debugger-2.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/backend/mono/MonoLanguageBackend.cs new/mono-debugger-2.10/backend/mono/MonoLanguageBackend.cs --- old/mono-debugger-2.8.1/backend/mono/MonoLanguageBackend.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/backend/mono/MonoLanguageBackend.cs 2011-01-13 23:41:31.000000000 +0100 @@ -90,21 +90,21 @@ DecimalType = MonoFundamentalType.Create ( corlib, memory, FundamentalKind.Decimal); - Cecil.TypeDefinition decimal_type = corlib.ModuleDefinition.Types ["System.Decimal"]; + Cecil.TypeDefinition decimal_type = corlib.ModuleDefinition.GetType ("System.Decimal"); corlib.AddType (decimal_type, DecimalType); TargetAddress klass = corlib.MonoLanguage.MetadataHelper.GetArrayClass (memory); - Cecil.TypeDefinition array_type = corlib.ModuleDefinition.Types ["System.Array"]; + Cecil.TypeDefinition array_type = corlib.ModuleDefinition.GetType ("System.Array"); ArrayType = mono.CreateCoreType (corlib, array_type, memory, klass); mono.AddCoreType (array_type, ArrayType, ArrayType, klass); klass = corlib.MonoLanguage.MetadataHelper.GetDelegateClass (memory); - Cecil.TypeDefinition delegate_type = corlib.ModuleDefinition.Types ["System.Delegate"]; + Cecil.TypeDefinition delegate_type = corlib.ModuleDefinition.GetType ("System.Delegate"); DelegateType = new MonoClassType (corlib, delegate_type); mono.AddCoreType (delegate_type, DelegateType, DelegateType, klass); klass = corlib.MonoLanguage.MetadataHelper.GetExceptionClass (memory); - Cecil.TypeDefinition exception_type = corlib.ModuleDefinition.Types ["System.Exception"]; + Cecil.TypeDefinition exception_type = corlib.ModuleDefinition.GetType ("System.Exception"); ExceptionType = mono.CreateCoreType (corlib, exception_type, memory, klass); mono.AddCoreType (exception_type, ExceptionType, ExceptionType, klass); } @@ -289,7 +289,7 @@ internal bool TryFindImage (Thread thread, string filename) { - Cecil.AssemblyDefinition ass = Cecil.AssemblyFactory.GetAssembly (filename); + Cecil.AssemblyDefinition ass = Cecil.AssemblyDefinition.ReadAssembly (filename); if (ass == null) return false; @@ -325,7 +325,7 @@ return new MonoArrayType (element_type, array.Rank); } - Cecil.ReferenceType reftype = type as Cecil.ReferenceType; + Cecil.ByReferenceType reftype = type as Cecil.ByReferenceType; if (reftype != null) { TargetType element_type = LookupMonoType (reftype.ElementType); if (element_type == null) @@ -407,7 +407,7 @@ Cecil.TypeDefinition resolve_cecil_type_ref (Cecil.TypeReference type) { - type = type.GetOriginalType (); + type = type.GetElementType (); if (type is Cecil.TypeDefinition) return (Cecil.TypeDefinition) type; @@ -418,12 +418,12 @@ if (assembly == null) return null; - return assembly.MainModule.Types [type.FullName]; + return assembly.MainModule.GetType (type.FullName); } Cecil.ModuleDefinition module = type.Scope as Cecil.ModuleDefinition; if (module != null) - return module.Types [type.FullName]; + return module.GetType (type.FullName); throw new NotImplementedException (); } @@ -1075,7 +1075,7 @@ foreach (MonoSymbolFile symfile in symfile_by_index.Values) { try { - Cecil.TypeDefinitionCollection types = symfile.Assembly.MainModule.Types; + var types = symfile.Assembly.MainModule.Types; // FIXME: Work around an API problem in Cecil. foreach (Cecil.TypeDefinition type in types) { if (type.FullName != name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/backend/mono/MonoSymbolFile.cs new/mono-debugger-2.10/backend/mono/MonoSymbolFile.cs --- old/mono-debugger-2.8.1/backend/mono/MonoSymbolFile.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/backend/mono/MonoSymbolFile.cs 2011-01-13 23:41:31.000000000 +0100 @@ -231,7 +231,7 @@ ImageFile = shadow_location; try { - Assembly = Cecil.AssemblyFactory.GetAssembly (ImageFile); + Assembly = Cecil.AssemblyDefinition.ReadAssembly (ImageFile); } catch (Exception ex) { throw new SymbolTableException ( "Cannot load symbol file `{0}': {1}", ImageFile, ex); @@ -244,7 +244,7 @@ string mdb_file = ImageFile + ".mdb"; try { - File = C.MonoSymbolFile.ReadSymbolFile (Assembly, mdb_file); + File = C.MonoSymbolFile.ReadSymbolFile (ModuleDefinition, mdb_file); if (File == null) Report.Error ("Cannot load symbol file `{0}'", mdb_file); else if (ModuleDefinition.Mvid != File.Guid) { @@ -571,7 +571,7 @@ // This must match mono_type_get_desc() in mono/metadata/debug-helpers.c. protected static string GetTypeSignature (Cecil.TypeReference t) { - Cecil.ReferenceType rtype = t as Cecil.ReferenceType; + Cecil.ByReferenceType rtype = t as Cecil.ByReferenceType; if (rtype != null) return GetTypeSignature (rtype.ElementType) + "&"; @@ -693,7 +693,7 @@ signature = null; } - Cecil.TypeDefinitionCollection types = Assembly.MainModule.Types; + var types = Assembly.MainModule.Types; // FIXME: Work around an API problem in Cecil. foreach (Cecil.TypeDefinition type in types) { if (!method_name.StartsWith (type.FullName)) @@ -773,7 +773,7 @@ { MonoClassType klass = null; - Cecil.TypeDefinitionCollection types = Assembly.MainModule.Types; + var types = Assembly.MainModule.Types; // FIXME: Work around an API problem in Cecil. foreach (Cecil.TypeDefinition type in types) { if (type.FullName != class_name) @@ -822,23 +822,23 @@ if (cname == cgen_attr) { is_compiler_generated = true; } else if (cname == debugger_display_attr) { - string text = (string) cattr.ConstructorParameters [0]; + string text = (string) cattr.ConstructorArguments [0].Value; debugger_display = new DebuggerDisplayAttribute (text); - foreach (DictionaryEntry prop in cattr.Properties) { - string key = (string) prop.Key; + foreach (var named_arg in cattr.Properties) { + string key = named_arg.Name; if (key == "Name") - debugger_display.Name = (string) prop.Value; + debugger_display.Name = (string) named_arg.Argument.Value; else if (key == "Type") - debugger_display.Type = (string) prop.Value; + debugger_display.Type = (string) named_arg.Argument.Value; else { debugger_display = null; break; } } } else if (cname == browsable_attr) { - browsable_state = (DebuggerBrowsableState) cattr.Blob [2]; + browsable_state = (DebuggerBrowsableState) cattr.GetBlob () [2]; } else if (cname == type_proxy_attr) { - string text = (string) cattr.ConstructorParameters [0]; + string text = (string) cattr.ConstructorArguments [0].Value; type_proxy = new DebuggerTypeProxyAttribute (text); } } @@ -1340,7 +1340,7 @@ } } - Cecil.ParameterDefinitionCollection param_info = mdef.Parameters; + var param_info = mdef.Parameters; for (int i = 0; i < param_info.Count; i++) { if (captured_vars.ContainsKey (param_info [i].Name)) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/configure new/mono-debugger-2.10/configure --- old/mono-debugger-2.8.1/configure 2010-11-03 17:10:11.000000000 +0100 +++ new/mono-debugger-2.10/configure 2011-01-13 23:54:25.000000000 +0100 @@ -2582,7 +2582,7 @@ # Define the identity of the package. PACKAGE=mono-debugger - VERSION=2.8.1 + VERSION=2.10 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/configure.in new/mono-debugger-2.10/configure.in --- old/mono-debugger-2.8.1/configure.in 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/configure.in 2011-01-13 23:41:31.000000000 +0100 @@ -2,7 +2,7 @@ AC_INIT(README) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mono-debugger, 2.8.1) +AM_INIT_AUTOMAKE(mono-debugger, 2.10) AM_MAINTAINER_MODE AC_CHECK_TOOL(CC, gcc, gcc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoClassInfo.cs new/mono-debugger-2.10/languages/mono/MonoClassInfo.cs --- old/mono-debugger-2.8.1/languages/mono/MonoClassInfo.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoClassInfo.cs 2011-01-13 23:41:31.000000000 +0100 @@ -42,8 +42,8 @@ throw new InternalError (); Cecil.TypeDefinition typedef; - typedef = (Cecil.TypeDefinition) file.ModuleDefinition.LookupByToken ( - Cecil.Metadata.TokenType.TypeDef, token & 0x00ffffff); + typedef = (Cecil.TypeDefinition) file.ModuleDefinition.LookupToken ( + new Cecil.MetadataToken (Cecil.TokenType.TypeDef, token & 0x00ffffff)); if (typedef == null) throw new InternalError (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoClassType.cs new/mono-debugger-2.10/languages/mono/MonoClassType.cs --- old/mono-debugger-2.8.1/languages/mono/MonoClassType.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoClassType.cs 2011-01-13 23:41:31.000000000 +0100 @@ -204,7 +204,7 @@ return class_info; if (class_info == null) { - int token = (int) type.MetadataToken.ToUInt (); + int token = type.MetadataToken.ToInt32 (); class_info = file.LookupClassInfo (target, token); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoDebuggerSupport.cs new/mono-debugger-2.10/languages/mono/MonoDebuggerSupport.cs --- old/mono-debugger-2.8.1/languages/mono/MonoDebuggerSupport.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoDebuggerSupport.cs 2011-01-13 23:41:31.000000000 +0100 @@ -11,13 +11,13 @@ { public static int GetMethodToken (Cecil.MethodDefinition method) { - return (int) (method.MetadataToken.TokenType + method.MetadataToken.RID); + return method.MetadataToken.ToInt32 (); } public static Cecil.MethodDefinition GetMethod (Cecil.ModuleDefinition module, int token) { - return (Cecil.MethodDefinition) module.LookupByToken ( - Cecil.Metadata.TokenType.Method, token & 0xffffff); + return (Cecil.MethodDefinition) module.LookupToken ( + new Cecil.MetadataToken (Cecil.TokenType.Method, token & 0xffffff)); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoFunctionType.cs new/mono-debugger-2.10/languages/mono/MonoFunctionType.cs --- old/mono-debugger-2.8.1/languages/mono/MonoFunctionType.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoFunctionType.cs 2011-01-13 23:41:31.000000000 +0100 @@ -34,7 +34,7 @@ rtype = mdef.DeclaringType; has_return_type = true; } else { - rtype = mdef.ReturnType.ReturnType; + rtype = mdef.ReturnType; has_return_type = rtype.FullName != "System.Void"; } return_type = klass.File.MonoLanguage.LookupMonoType (rtype); @@ -52,7 +52,7 @@ internal static string GetMethodName (Cecil.MethodDefinition mdef) { - Cecil.GenericParameterCollection gen_params = mdef.GenericParameters; + var gen_params = mdef.GenericParameters; if ((gen_params == null) || (gen_params.Count == 0)) return mdef.Name; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoFundamentalType.cs new/mono-debugger-2.10/languages/mono/MonoFundamentalType.cs --- old/mono-debugger-2.8.1/languages/mono/MonoFundamentalType.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoFundamentalType.cs 2011-01-13 23:41:31.000000000 +0100 @@ -31,104 +31,104 @@ case FundamentalKind.Boolean: klass = corlib.MonoLanguage.MetadataHelper.GetBooleanClass (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.Boolean"], + corlib, corlib.ModuleDefinition.GetType ("System.Boolean"), "bool", kind, 1); break; case FundamentalKind.Char: klass = corlib.MonoLanguage.MetadataHelper.GetCharClass (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.Char"], + corlib, corlib.ModuleDefinition.GetType ("System.Char"), "char", kind, 2); break; case FundamentalKind.SByte: klass = corlib.MonoLanguage.MetadataHelper.GetSByteClass (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.SByte"], + corlib, corlib.ModuleDefinition.GetType ("System.SByte"), "sbyte", kind, 1); break; case FundamentalKind.Byte: klass = corlib.MonoLanguage.MetadataHelper.GetByteClass (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.Byte"], + corlib, corlib.ModuleDefinition.GetType ("System.Byte"), "byte", kind, 1); break; case FundamentalKind.Int16: klass = corlib.MonoLanguage.MetadataHelper.GetInt16Class (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.Int16"], + corlib, corlib.ModuleDefinition.GetType ("System.Int16"), "short", kind, 2); break; case FundamentalKind.UInt16: klass = corlib.MonoLanguage.MetadataHelper.GetUInt16Class (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.UInt16"], + corlib, corlib.ModuleDefinition.GetType ("System.UInt16"), "ushort", kind, 2); break; case FundamentalKind.Int32: klass = corlib.MonoLanguage.MetadataHelper.GetInt32Class (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.Int32"], + corlib, corlib.ModuleDefinition.GetType ("System.Int32"), "int", kind, 4); break; case FundamentalKind.UInt32: klass = corlib.MonoLanguage.MetadataHelper.GetUInt32Class (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.UInt32"], + corlib, corlib.ModuleDefinition.GetType ("System.UInt32"), "uint", kind, 4); break; case FundamentalKind.Int64: klass = corlib.MonoLanguage.MetadataHelper.GetInt64Class (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.Int64"], + corlib, corlib.ModuleDefinition.GetType ("System.Int64"), "long", kind, 8); break; case FundamentalKind.UInt64: klass = corlib.MonoLanguage.MetadataHelper.GetUInt64Class (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.UInt64"], + corlib, corlib.ModuleDefinition.GetType ("System.UInt64"), "ulong", kind, 8); break; case FundamentalKind.Single: klass = corlib.MonoLanguage.MetadataHelper.GetSingleClass (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.Single"], + corlib, corlib.ModuleDefinition.GetType ("System.Single"), "float", kind, 4); break; case FundamentalKind.Double: klass = corlib.MonoLanguage.MetadataHelper.GetDoubleClass (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.Double"], + corlib, corlib.ModuleDefinition.GetType ("System.Double"), "double", kind, 8); break; case FundamentalKind.IntPtr: klass = corlib.MonoLanguage.MetadataHelper.GetIntPtrClass (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.IntPtr"], + corlib, corlib.ModuleDefinition.GetType ("System.IntPtr"), "System.IntPtr", kind, memory.TargetMemoryInfo.TargetAddressSize); break; case FundamentalKind.UIntPtr: klass = corlib.MonoLanguage.MetadataHelper.GetUIntPtrClass (memory); fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.UIntPtr"], + corlib, corlib.ModuleDefinition.GetType ("System.UIntPtr"), "System.UIntPtr", kind, memory.TargetMemoryInfo.TargetAddressSize); break; case FundamentalKind.Decimal: fundamental = new MonoFundamentalType ( - corlib, corlib.ModuleDefinition.Types ["System.Decimal"], + corlib, corlib.ModuleDefinition.GetType ("System.Decimal"), "decimal", kind, Marshal.SizeOf (typeof (Decimal))); return fundamental; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoMember.cs new/mono-debugger-2.10/languages/mono/MonoMember.cs --- old/mono-debugger-2.8.1/languages/mono/MonoMember.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoMember.cs 2011-01-13 23:41:31.000000000 +0100 @@ -124,7 +124,7 @@ case Cecil.MethodAttributes.Family: case Cecil.MethodAttributes.FamANDAssem: return TargetMemberAccessibility.Protected; - case Cecil.MethodAttributes.Assem: + case Cecil.MethodAttributes.Assembly: case Cecil.MethodAttributes.FamORAssem: return TargetMemberAccessibility.Internal; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoObjectType.cs new/mono-debugger-2.10/languages/mono/MonoObjectType.cs --- old/mono-debugger-2.8.1/languages/mono/MonoObjectType.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoObjectType.cs 2011-01-13 23:41:31.000000000 +0100 @@ -28,7 +28,7 @@ int object_size = 2 * memory.TargetMemoryInfo.TargetAddressSize; MonoObjectType type = new MonoObjectType ( - corlib, corlib.ModuleDefinition.Types ["System.Object"], + corlib, corlib.ModuleDefinition.GetType ("System.Object"), object_size); TargetAddress klass = corlib.MonoLanguage.MetadataHelper.GetObjectClass (memory); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoStringType.cs new/mono-debugger-2.10/languages/mono/MonoStringType.cs --- old/mono-debugger-2.8.1/languages/mono/MonoStringType.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoStringType.cs 2011-01-13 23:41:31.000000000 +0100 @@ -26,7 +26,7 @@ int object_size = 2 * memory.TargetMemoryInfo.TargetAddressSize; MonoStringType type = new MonoStringType ( - corlib, corlib.ModuleDefinition.Types ["System.String"], + corlib, corlib.ModuleDefinition.GetType ("System.String"), object_size, object_size + 4); TargetAddress klass = corlib.MonoLanguage.MetadataHelper.GetStringClass (memory); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoStructType.cs new/mono-debugger-2.10/languages/mono/MonoStructType.cs --- old/mono-debugger-2.8.1/languages/mono/MonoStructType.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoStructType.cs 2011-01-13 23:41:31.000000000 +0100 @@ -115,13 +115,8 @@ function_hash.Add (method, func); } - foreach (Cecil.MethodDefinition method in TypeDef.Constructors) { - MonoFunctionType func = new MonoFunctionType (this, method); - function_hash.Add (method, func); - } - int num_methods = 0; - foreach (Cecil.MethodDefinition method in TypeDef.Methods) { + foreach (Cecil.MethodDefinition method in GetMethods (TypeDef, false)) { if ((method.Attributes & Cecil.MethodAttributes.SpecialName) != 0) continue; num_methods++; @@ -130,7 +125,7 @@ methods = new MonoMethodInfo [num_methods]; int pos = 0; - foreach (Cecil.MethodDefinition method in TypeDef.Methods) { + foreach (Cecil.MethodDefinition method in GetMethods (TypeDef, false)) { if ((method.Attributes & Cecil.MethodAttributes.SpecialName) != 0) continue; methods [pos] = MonoMethodInfo.Create (this, pos, method); @@ -139,16 +134,27 @@ } } + static IEnumerable<Cecil.MethodDefinition> GetMethods (Cecil.TypeDefinition type, bool constructor) + { + foreach (var method in type.Methods) { + if (constructor && method.IsConstructor) + yield return method; + + if (!constructor && !method.IsConstructor) + yield return method; + } + } + void get_constructors () { lock (this) { if (constructors != null) return; - constructors = new MonoMethodInfo [TypeDef.Constructors.Count]; + var ctors = new List<Cecil.MethodDefinition> (GetMethods (TypeDef, true)); - for (int i = 0; i < constructors.Length; i++) { - Cecil.MethodDefinition method = TypeDef.Constructors [i]; + for (int i = 0; i < ctors.Count; i++) { + Cecil.MethodDefinition method = ctors [i]; constructors [i] = MonoMethodInfo.Create (this, i, method); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/languages/mono/MonoVoidType.cs new/mono-debugger-2.10/languages/mono/MonoVoidType.cs --- old/mono-debugger-2.8.1/languages/mono/MonoVoidType.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/languages/mono/MonoVoidType.cs 2011-01-13 23:41:31.000000000 +0100 @@ -22,7 +22,7 @@ public static MonoVoidType Create (MonoSymbolFile corlib, TargetMemoryAccess memory) { MonoVoidType type = new MonoVoidType ( - corlib, corlib.ModuleDefinition.Types ["System.Void"]); + corlib, corlib.ModuleDefinition.GetType ("System.Void")); TargetAddress klass = corlib.MonoLanguage.MetadataHelper.GetVoidClass (memory); type.create_type (memory, klass); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/symbolwriter/MdbSymbolReader.cs new/mono-debugger-2.10/symbolwriter/MdbSymbolReader.cs --- old/mono-debugger-2.8.1/symbolwriter/MdbSymbolReader.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/symbolwriter/MdbSymbolReader.cs 2011-01-13 23:41:31.000000000 +0100 @@ -174,8 +174,8 @@ if (method == null) throw new MonoSymbolFileException ("Cannot get method {0}.", i+1); - Cecil.MethodDefinition mdef = (Cecil.MethodDefinition) Assembly.MainModule.LookupByToken ( - Cecil.Metadata.TokenType.Method, method.Token & 0xffffff); + Cecil.MethodDefinition mdef = (Cecil.MethodDefinition) Assembly.MainModule.LookupToken ( + new Cecil.MetadataToken (Cecil.TokenType.Method, method.Token & 0xffffff)); if ((mdef == null) || (mdef.Body == null)) throw new MonoSymbolFileException ("Method {0} (token {1:x}) not found in assembly.", method.Index, method.Token); @@ -215,8 +215,8 @@ if (method == null) throw new MonoSymbolFileException ("Cannot get method {0}.", i+1); - Cecil.MethodDefinition mdef = (Cecil.MethodDefinition) Assembly.MainModule.LookupByToken ( - Cecil.Metadata.TokenType.Method, method.Token & 0xffffff); + Cecil.MethodDefinition mdef = (Cecil.MethodDefinition) Assembly.MainModule.LookupToken ( + new Cecil.MetadataToken (Cecil.TokenType.Method, method.Token & 0xffffff)); if ((mdef == null) || (mdef.Body == null)) throw new MonoSymbolFileException ("Method {0} (token {1:x}) not found in assembly.", method.Index, method.Token); @@ -328,7 +328,7 @@ protected static string GetTypeSignature (Cecil.TypeReference t) { - Cecil.ReferenceType rtype = t as Cecil.ReferenceType; + Cecil.ByReferenceType rtype = t as Cecil.ByReferenceType; if (rtype != null) return GetTypeSignature (rtype.ElementType) + "&"; @@ -440,8 +440,8 @@ protected void CheckMethod (MethodEntry method) { - Cecil.MethodDefinition mdef = (Cecil.MethodDefinition) Assembly.MainModule.LookupByToken ( - Cecil.Metadata.TokenType.Method, method.Token & 0xffffff); + Cecil.MethodDefinition mdef = (Cecil.MethodDefinition) Assembly.MainModule.LookupToken ( + new Cecil.MetadataToken (Cecil.TokenType.Method, method.Token & 0xffffff)); if ((mdef == null) || (mdef.Body == null)) throw new MonoSymbolFileException ("Method {0} (token {1:x}) not found in assembly.", method.Index, method.Token); @@ -551,8 +551,8 @@ Mono.Cecil.AssemblyDefinition asm; try { - asm = Mono.Cecil.AssemblyFactory.GetAssembly (filename); - file = MonoSymbolFile.ReadSymbolFile (asm, filename + ".mdb"); + asm = Mono.Cecil.AssemblyDefinition.ReadAssembly (filename); + file = MonoSymbolFile.ReadSymbolFile (asm.MainModule, filename + ".mdb"); } catch (Exception ex) { Console.WriteLine ("Can't read {0}: {1}", filename, ex.Message); return -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mono-debugger-2.8.1/symbolwriter/MonoSymbolFile.cs new/mono-debugger-2.10/symbolwriter/MonoSymbolFile.cs --- old/mono-debugger-2.8.1/symbolwriter/MonoSymbolFile.cs 2010-11-03 16:58:03.000000000 +0100 +++ new/mono-debugger-2.10/symbolwriter/MonoSymbolFile.cs 2011-01-13 23:41:31.000000000 +0100 @@ -449,16 +449,22 @@ } #if CECIL - protected MonoSymbolFile (string filename, Mono.Cecil.AssemblyDefinition assembly) : this (filename) + protected MonoSymbolFile (string filename, Mono.Cecil.ModuleDefinition module) + : this (filename) { - Guid mvid = assembly.MainModule.Mvid; + CheckGuidMatch (module.Mvid, filename, module.FullyQualifiedName); + } - CheckGuidMatch (mvid, filename, assembly.MainModule.Image.FileInformation.FullName); + public static MonoSymbolFile ReadSymbolFile (Mono.Cecil.ModuleDefinition module) + { + return ReadSymbolFile (module, module.FullyQualifiedName); } - public static MonoSymbolFile ReadSymbolFile (Mono.Cecil.AssemblyDefinition assembly, string filename) + public static MonoSymbolFile ReadSymbolFile (Mono.Cecil.ModuleDefinition module, string filename) { - return new MonoSymbolFile (filename, assembly); + string name = filename + ".mdb"; + + return new MonoSymbolFile (name, module); } #else protected MonoSymbolFile (string filename, Assembly assembly) : this (filename) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
