+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
//
// System.Reflection.Emit/ModuleBuilder.cs
//
using System.Diagnostics.SymbolStore;
using System.IO;
using System.Resources;
-using Mono.CSharp.Debugger;
using System.Globalization;
namespace System.Reflection.Emit {
#endregion
private TypeBuilder global_type;
private Type global_type_created;
- internal IMonoSymbolWriter symbol_writer;
Hashtable name_cache;
Hashtable us_string_cache = new Hashtable ();
private int[] table_indexes;
this.fqname = fullyqname;
this.assembly = this.assemblyb = assb;
this.transient = transient;
- guid = Guid.NewGuid().ToByteArray ();
+ // to keep mcs fast we do not want CryptoConfig wo be involved to create the RNG
+ guid = Guid.FastNewGuidArray ();
+ // guid = Guid.NewGuid().ToByteArray ();
table_idx = get_next_table_index (this, 0x00, true);
name_cache = new Hashtable ();
- if (emitSymbolInfo)
- GetSymbolWriter (fullyqname);
basic_init (this);
- }
-
- internal void GetSymbolWriter (string filename)
- {
- Assembly assembly;
- try {
- assembly = Assembly.Load ("Mono.CSharp.Debugger");
- } catch (FileNotFoundException) {
- return;
- }
-
- Type type = assembly.GetType ("Mono.CSharp.Debugger.MonoSymbolWriter");
- if (type == null)
- return;
- // First get the constructor.
- {
- Type[] arg_types = new Type [1];
- arg_types [0] = typeof (ModuleBuilder);
- ConstructorInfo constructor = type.GetConstructor (arg_types);
-
- object[] args = new object [1];
- args [0] = this;
-
- if (constructor == null)
- return;
-
- Object instance = constructor.Invoke (args);
- if (instance == null)
- return;
-
- if (!(instance is IMonoSymbolWriter))
- return;
-
- symbol_writer = (IMonoSymbolWriter) instance;
- }
+ CreateGlobalType ();
}
public override string FullyQualifiedName {get { return fqname;}}
return DefineGlobalMethod (name, attributes, callingConvention, returnType, null, null, parameterTypes, null, null);
}
-#if BOOTSTRAP_NET_2_0//NET_2_0 | BOOTSTRAP_NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
public
#else
internal
}
private TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, Type[] interfaces, PackingSize packsize, int typesize) {
+ if (name_cache.Contains (name))
+ throw new ArgumentException ("Duplicate type name within an assembly.");
+
TypeBuilder res = new TypeBuilder (this, name, attr, parent, interfaces, packsize, typesize, null);
if (types != null) {
if (types.Length == num_types) {
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private static extern Type create_modified_type (TypeBuilder tb, string modifiers);
- static char[] type_modifiers = {'&', '[', '*'};
+ static readonly char [] type_modifiers = {'&', '[', '*'};
private TypeBuilder GetMaybeNested (TypeBuilder t, string className) {
int subt;
}
public ISymbolWriter GetSymWriter () {
- return symbol_writer;
+ return null;
}
public ISymbolDocumentWriter DefineDocument (string url, Guid language, Guid languageVendor, Guid documentType) {
- if (symbol_writer == null)
- throw new InvalidOperationException ();
-
- return symbol_writer.DefineDocument (url, language, languageVendor, documentType);
+ return null;
}
public override Type [] GetTypes ()
if (types == null)
return new TypeBuilder [0];
- int n = types.Length;
+ int n = num_types;
TypeBuilder [] copy = new TypeBuilder [n];
Array.Copy (types, copy, n);
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private static extern int getToken (ModuleBuilder mb, object obj);
+ [MethodImplAttribute(MethodImplOptions.InternalCall)]
+ private static extern int getMethodToken (ModuleBuilder mb, MethodInfo method,
+ Type[] opt_param_types);
+
internal int GetToken (string str) {
if (us_string_cache.Contains (str))
return (int)us_string_cache [str];
return getToken (this, member);
}
+ internal int GetToken (MethodInfo method, Type[] opt_param_types) {
+ return getMethodToken (this, method, opt_param_types);
+ }
+
internal int GetToken (SignatureHelper helper) {
return getToken (this, helper);
}
private static extern void build_metadata (ModuleBuilder mb);
[MethodImplAttribute(MethodImplOptions.InternalCall)]
- private static extern int getDataChunk (ModuleBuilder mb, byte[] buf, int offset);
+ private extern void WriteToFile (IntPtr handle);
internal void Save ()
{
- if (transient)
+ if (transient && !is_main)
return;
+ if (types != null) {
+ for (int i = 0; i < num_types; ++i)
+ if (!types [i].is_created)
+ throw new NotSupportedException ("Type '" + types [i].FullName + "' was not completed.");
+ }
+
if ((global_type != null) && (global_type_created == null))
global_type_created = global_type.CreateType ();
build_metadata (this);
- if (symbol_writer != null) {
- string res_name;
- if (is_main)
- res_name = "MonoSymbolFile";
- else
- res_name = "MonoSymbolFile:" + fqname;
- byte[] data = symbol_writer.CreateSymbolFile (assemblyb);
- assemblyb.EmbedResource (res_name, data, ResourceAttributes.Public);
- }
-
string fileName = fqname;
if (assemblyb.AssemblyDir != null)
- fileName = System.IO.Path.Combine (assemblyb.AssemblyDir, fileName);
-
- byte[] buf = new byte [65536];
- FileStream file;
- int count, offset;
-
- file = new FileStream (fileName, FileMode.Create, FileAccess.Write);
-
- offset = 0;
- while ((count = getDataChunk (this, buf, offset)) != 0) {
- file.Write (buf, 0, count);
- offset += count;
- }
- file.Close ();
-
+ fileName = Path.Combine (assemblyb.AssemblyDir, fileName);
+
+ using (FileStream file = new FileStream (fileName, FileMode.Create, FileAccess.Write))
+ WriteToFile (file.Handle);
+
//
// The constant 0x80000000 is internal to Mono, it means `make executable'
//
is_main = value;
}
}
+
+ internal void CreateGlobalType () {
+ if (global_type == null)
+ global_type = new TypeBuilder (this, 0);
+ }
+
+ internal static Guid Mono_GetGuid (ModuleBuilder mb)
+ {
+ return new Guid (mb.guid);
+ }
}
internal class ModuleBuilderTokenGenerator : TokenGenerator {
return mb.GetToken (member);
}
+ public int GetToken (MethodInfo method, Type[] opt_param_types) {
+ return mb.GetToken (method, opt_param_types);
+ }
+
public int GetToken (SignatureHelper helper) {
return mb.GetToken (helper);
}
projects / mono.git / blobdiff