Compare commits

..
178 Commits
Author SHA1 Message Date
Zoltan Varga 470791b186 2009-01-09 Zoltan Varga <[email protected]>
Backport of r122907.
	
	* CustomAttributeData.cs (ToString): Applied patch from Leszek Ciesielski
	<[email protected]>. Use DeclaringType.FullName instead of DeclaringType.Name.
	Fixes #464830.

svn path=/branches/mono-2-2/mcs/; revision=122909
2009-01-09 16:05:52 +00:00
Marek Habersack 3887d81f8e Backport of r122891.
svn path=/branches/mono-2-2/mcs/; revision=122892
2009-01-09 14:38:26 +00:00
Geoff Norton 11072be5ed 2009-01-08 Geoff Norton <[email protected]>
* processes.c: Fix the osx version check to properly detect 10.5 v 10.4

svn path=/branches/mono-2-2/mono/; revision=122853
2009-01-09 02:32:27 +00:00
Marek Habersack 4291f2a73b Backport of r122839.
svn path=/branches/mono-2-2/mcs/; revision=122841
2009-01-08 23:51:36 +00:00
Rusty Howell 5b8bf83ccd simple checkin to trigger build
svn path=/branches/mono-2-2/mono/; revision=122733
2009-01-08 02:15:25 +00:00
Zoltan Varga 1fd0386f87 2008-12-16 Zoltan Varga <[email protected]>
* class.c (mono_class_get_fields): Handle loading errors.

svn path=/branches/mono-2-2/mono/; revision=122714
2009-01-07 21:00:16 +00:00
Zoltan Varga 9de1e8b272 2009-01-07 Zoltan Varga <[email protected]>
Backport of 122702.
	
	* mini-arm.c (mono_arch_flush_icache): Use __GNUC_PREREQ instead of checking
	__GNUC_MINOR__ which can break when the major version changes.

svn path=/branches/mono-2-2/mono/; revision=122704
2009-01-07 20:10:21 +00:00
Zoltan Varga c02bd27e8f 2009-01-07 Zoltan Varga <[email protected]>
Backport of r122700.
	
	* RxInterpreter.cs: Add support for constant strings in anchors. Fixes
	#464135.

svn path=/branches/mono-2-2/mcs/; revision=122701
2009-01-07 19:51:33 +00:00
Rodrigo Kumpera c146e4e4fd In metadata:
Backport of r122672 - r122675.

	* file-io.c (ves_icall_System_IO_MonoIO_GetCurrentDirectory): Double check the
	return value of GetCurrentDirectory to never access unitialized memory.

	* file-io.c (ves_icall_System_IO_MonoIO_GetCurrentDirectory): Properly check the
	return value of GetCurrentDirectory and expand the buffer if needed.

	Fixes #459094.

2009-01-07 Rodrigo Kumpera  <[email protected]>

In io-layer:
2009-01-07 Rodrigo Kumpera  <[email protected]>

	Backport of r122672 - r122675.

	* io.c (GetCurrentDirectory): Avoid calling g_get_current_dir straight
	away as it doesn't handle ENAMETOOLONG correctly. As a bonus we avoid
	allocating memory in the common path.

In tests:
2009-01-07 Rodrigo Kumpera  <[email protected]>

	Backport of r122672 - r122675.

	* bug-459094	.cs: New regression test.

	* Makefile.am: Test added.


svn path=/branches/mono-2-2/mono/; revision=122678
2009-01-07 17:18:06 +00:00
Rodrigo Kumpera 331427f067 In metadata:
2009-01-07 Rodrigo Kumpera  <[email protected]>

	Backport of r122579 - r122585.

	* verify.c (mono_class_interface_implements_interface): Verify parents as we can't rely on
	interfaces_packed here.

	Fixes part of #463294.

	* verify.c (is_array_type_compatible): Ignore bounds and sizes when checking array compatibility.

	Fixes part of #463294.

	* verify.c (stack_slot_is_complex_type_not_reference_type): Check if the type
	is a boxed complex as well.

	Fixes part of #463294.

In tests/verifier:
2009-01-07 Rodrigo Kumpera <[email protected]>

	Backport of r122579 - r122585.

	* valid_iface_constant_with_parent_implementing_it.il:
	Regression test for #461200.

	* valid_array_compat_with_bonds_and_sizes.il:
	* valid_array_compat_with_bounds.il:
	* valid_array_compat_with_sizes.il: Regression tests for 
	#461200.

	* valid_ceq_with_boxed_vt.il: Regression test for #461200.


svn path=/branches/mono-2-2/mono/; revision=122650
2009-01-07 12:48:50 +00:00
Geoff Norton 37bbac467f 2009-01-07 Geoff Norton <[email protected]>
* processes.c: Only use open -W on OSX 10.5+.  Patch from
        Miguel

svn path=/branches/mono-2-2/mono/; revision=122619
2009-01-07 06:32:03 +00:00
Rodrigo Kumpera 5161c62e10 2009-01-07 Rodrigo Kumpera <[email protected]>
* Vector*.cs: Use explicit layout to avoid the runtime
	miscalculating the size of vector types.

	Backported from trunk.


svn path=/branches/mono-2-2/mcs/; revision=122608
2009-01-07 04:10:17 +00:00
Gonzalo Paniagua Javier 9458c03da1 ignore test. Bug 464013
svn path=/branches/mono-2-2/mcs/; revision=122603
2009-01-07 02:54:15 +00:00
Zoltan Varga 6179d4a924 2009-01-07 Zoltan Varga <[email protected]>
* AsyncTest.cs: Disable these tests, they fail randomly (bug #463999).

svn path=/branches/mono-2-2/mcs/; revision=122600
2009-01-07 01:21:25 +00:00
Marek Safar 58216b41fb Put back temporary disabled fix.
svn path=/branches/mono-2-2/mcs/; revision=122578
2009-01-06 21:32:06 +00:00
Marek Safar 30a744498e Try to revert major Banshee bug fix.
svn path=/branches/mono-2-2/mcs/; revision=122501
2009-01-05 23:23:19 +00:00
Marek Safar c253f26bc3 Update.
svn path=/branches/mono-2-2/mcs/; revision=122473
2009-01-05 17:58:21 +00:00
Zoltan Varga 6017bcd4ae 2009-01-05 Zoltan Varga <[email protected]>
* branch-opts.c (mono_if_conversion): Fix another assert introduced by
	the last change.

svn path=/branches/mono-2-2/mono/; revision=122472
2009-01-05 17:32:03 +00:00
Zoltan Varga 561cb241d9 2009-01-05 Zoltan Varga <[email protected]>
Backport of r122452.
	
	* mini.c (mono_allocate_stack_slots_full2): Use mono_class_from_mono_type
	instead of directly accessing type->data.klass. Fixes #462016.
	(mono_allocate_stack_slots_full): Ditto.

svn path=/branches/mono-2-2/mono/; revision=122453
2009-01-05 13:22:31 +00:00
Federico Di Gregorio 1fcf34271b Added missing property Extend to Mono.Cairo.Pattern
svn path=/branches/mono-2-2/mcs/; revision=122441
2009-01-05 12:09:40 +00:00
Marek Safar f2de867101 2009-01-05 Marek Safar <[email protected]>
A fix for bug #457257
	* decl.cs: Fixed incorrect member declaring type comparison.


svn path=/branches/mono-2-2/mcs/; revision=122439
2009-01-05 11:49:57 +00:00
Zoltan Varga 992e22f306 2009-01-05 Zoltan Varga <[email protected]>
* configure.in: Disable sigaltstack on freebsd as it doesn't seem to work.

svn path=/branches/mono-2-2/mono/; revision=122422
2009-01-05 09:12:31 +00:00
Zoltan Varga 0c65fe81ed 2009-01-05 Zoltan Varga <[email protected]>
Backport of r122416.
	
	* mini-arm.c (mono_arch_flush_icache): Applied patch from Riku Voipio 
	<[email protected]>. Fix cache flush on kernels without OLDABI compat option.

svn path=/branches/mono-2-2/mono/; revision=122417
2009-01-05 09:00:19 +00:00
Zoltan Varga 6887168dc2 2009-01-04 Zoltan Varga <[email protected]>
Backport of r122392.
	
	* branch-opts.c (mono_if_conversion): Fix an assert introduced by the last
	change.

svn path=/branches/mono-2-2/mono/; revision=122393
2009-01-04 18:48:29 +00:00
Zoltan Varga 87b0e91eff 2009-01-04 Zoltan Varga <[email protected]>
Backport of r122386.
	
	* branch-opts.c (mono_if_conversion): Use branch->inst_true_bb/inst_false_bb
	instead of bblock->out_bb [0]/[1], the two might not be the same. Fixes
	#463357.

	* iltests.il.in: Add a regression test.

svn path=/branches/mono-2-2/mono/; revision=122387
2009-01-04 01:54:44 +00:00
Zoltan Varga 883c60f9a9 2008-11-27 Mark Probst <[email protected]>
Backport of r120164.
	
	* marshal.c (mono_string_builder_to_utf8): Fixed a wrong
	invocation to g_utf16_to_utf8().

svn path=/branches/mono-2-2/mono/; revision=122373
2009-01-03 18:38:36 +00:00
Rodrigo Kumpera 1fc3eea4d1 2009-01-04 Rodrigo Kumpera <[email protected]>
Backport of r122364.

	* basic-simd.cs: Add a regression test for #462457.




svn path=/branches/mono-2-2/mono/; revision=122367
2009-01-03 15:16:52 +00:00
Rodrigo Kumpera ce5e64372c 2009-01-04 Rodrigo Kumpera <[email protected]>
Backport of r122363.

	* mini-ops.h: Add a definition of XPHI.

	* mini.h (MONO_IS_PHI): Make is aware of simd instrincs. 

	* ssa.c (op_phi_to_move): Handle XPHI.

	* ssa.c (mono_ssa_compute): Generate a XPHI for simd intrinsics instead of VPHI.

	Fixes #462457


svn path=/branches/mono-2-2/mono/; revision=122366
2009-01-03 15:16:21 +00:00
Marek Safar eb766b843d 2009-01-02 Marek Safar <[email protected]>
A fix for bug #463121
	* nullable.cs: Fixed nullable user quality operator comparison.


svn path=/branches/mono-2-2/mcs/; revision=122346
2009-01-02 17:48:33 +00:00
Marek Safar dbb88b930b 2009-01-02 Marek Safar <[email protected]>
A fix for bug #462592
	* pending.cs: Emit type arguments for generic proxy method.


svn path=/branches/mono-2-2/mcs/; revision=122331
2009-01-02 12:58:07 +00:00
Massimiliano Mantione 701ec25f87 Merged the profiler documentation from trunk (r122288).
svn path=/branches/mono-2-2/mono/; revision=122290
2008-12-31 11:19:53 +00:00
Massimiliano Mantione 56157b091b Make the profiler like r122287 on trunk.
svn path=/branches/mono-2-2/mono/; revision=122289
2008-12-31 11:19:08 +00:00
Marek Safar 91506c541c 2008-12-30 Marek Safar <[email protected]>
* expression.cs (As): Mutate all type arguments.


svn path=/branches/mono-2-2/mcs/; revision=122233
2008-12-30 11:41:14 +00:00
Marek Safar 5deb2e0f97 2008-12-29 Marek Safar <[email protected]>
A fix for bug #462622
	* anonymous.cs: Resolve anonymous type GetHashCode in unchecked
	context.


svn path=/branches/mono-2-2/mcs/; revision=122179
2008-12-29 11:24:29 +00:00
Marek Safar f0bac9e0b7 2008-12-29 Marek Safar <[email protected]>
A fix for bug #450782
	* ecore.cs: Consider more variables of form V.I to be fixed.


svn path=/branches/mono-2-2/mcs/; revision=122178
2008-12-29 09:34:02 +00:00
Zoltan Varga 6d9fa806ea 2008-12-29 Zoltan Varga <[email protected]>
Backport of r122170.

	* mini.c (mono_jit_compile_method_inner): Avoid holding the domain lock
	while loading AOT methods.

svn path=/branches/mono-2-2/mono/; revision=122171
2008-12-29 01:14:57 +00:00
Zoltan Varga 2ee594eee6 2008-12-29 Zoltan Varga <[email protected]>
Backport of r122168.
	
	* mini-exceptions.c: Check jit_tls->class_cast_from instead of class_cast_to
	since only the former is nulled out after a successful cast. This prevents
	crashes with rethrown exceptions when using --debug=casts.

svn path=/branches/mono-2-2/mono/; revision=122169
2008-12-29 00:57:10 +00:00
Rodrigo Kumpera fd92d87ed0 2008-12-26 Rodrigo Kumpera <[email protected]>
Backport of r122134.

	* bug-461261.cs: New regression test.

	* Makefile.am: Test added.


svn path=/branches/mono-2-2/mono/; revision=122137
2008-12-26 19:44:13 +00:00
Rodrigo Kumpera 2bc209f4f4 2008-12-26 Rodrigo Kumpera <[email protected]>
Backport of r122133.

	* class.c (get_implicit_generic_array_interfaces): If the internal
	enumerator is an interface inflate System.Object instead of itself.

	Fixes #461261.


svn path=/branches/mono-2-2/mono/; revision=122136
2008-12-26 19:36:34 +00:00
Mark Probst f73e839351 2008-12-24 Mark Probst <[email protected]>
Backport of r122086.

	* mini.h: New macro for checking whether a method is final,
	i.e. whether the method or its class is marked final.

	* method-to-ir.c: Use the new macro for all final-checks
	consistently.  Fixes the crash in the System.ServiceModel tests.

2008-12-24  Mark Probst  <[email protected]>

	Backport of r122086.

	* generic-sealed-virtual.2.cs: Test case for final generic
	methods.

	* Makefile.am: Test added.

svn path=/branches/mono-2-2/mono/; revision=122087
2008-12-24 11:43:01 +00:00
Mark Probst f6e12de276 2008-12-24 Mark Probst <[email protected]>
* mini-ppc.c (mono_arch_build_imt_thunk): Fix the build.

svn path=/branches/mono-2-2/mono/; revision=122079
2008-12-24 09:19:42 +00:00
Rodrigo Kumpera e5af45cdb3 2008-12-24 Rodrigo Kumpera <[email protected]>
Backport of r122071.

	* bug-461941.cs: New regression test.

	* Makefile.am: Test added.


svn path=/branches/mono-2-2/mono/; revision=122076
2008-12-24 05:00:44 +00:00
Rodrigo Kumpera 2491b3dbb2 2008-12-24 Rodrigo Kumpera <[email protected]>
Backport of r122070.

	* object.c (mono_runtime_invoke_array): Don't assert with
	byref nullable types.

	* marshal.c (mono_marshal_get_runtime_invoke): To handle
	byref nullables we unbox the object and store it on the
	stack. 
	We can't use the boxed object since it is the T of Nullable<T>
	and the boxed representation of a nullable it's underlying type
	or null.
	We could cheat and create a boxed nullable and use the same
	machinery of other byref VTs but this feels like a hack and
	using the stack has the bonus of reducing heap pressure.

	Fixes #461941.


svn path=/branches/mono-2-2/mono/; revision=122075
2008-12-24 04:58:24 +00:00
Mark Probst ef11247772 2008-12-23 Mark Probst <[email protected]>
Backport of r122034.

	* mini-ppc.c (mono_arch_build_imt_thunk): Save and restore r11.
	Clobbering it is not allowed because the caller might use it as
	the vtable register in the interface call.

svn path=/branches/mono-2-2/mono/; revision=122058
2008-12-23 20:54:22 +00:00
Mark Probst 370bf41989 2008-12-23 Mark Probst <[email protected]>
* mini-exceptions.c (get_exception_catch_class): Removed another
	overly strict assertion.  Fixes #461198.

2008-12-23  Mark Probst  <[email protected]>

	* bug-461198.2.cs: New generic sharing test.

	* Makefile.am: Test added.

svn path=/branches/mono-2-2/mono/; revision=122040
2008-12-23 16:10:40 +00:00
Rodrigo Kumpera 9e79a22008 2008-12-23 Rodrigo Kumpera <[email protected]>
Backport of r122036.

	* bug-461867.cs: New regression test.

	* Makefile.am: Test added.


svn path=/branches/mono-2-2/mono/; revision=122039
2008-12-23 15:37:32 +00:00
Rodrigo Kumpera da54730380 2008-12-23 Rodrigo Kumpera <[email protected]>
Backport of r122035.

 	* marshal.c (mono_marshal_emit_managed_wrapper): Handle char
 	return value.
 
 	Fixes #461867.


svn path=/branches/mono-2-2/mono/; revision=122038
2008-12-23 15:37:02 +00:00
Ivan Zlatev 3a433af16e 2008-12-22 Ivan N. Zlatev <[email protected]>
* ReferenceConverter.cs: Implemented.
	* ReferenceConverterTest.cs: Added.
	[Fixes bug #381435]

svn path=/branches/mono-2-2/mcs/; revision=122033
2008-12-23 10:52:51 +00:00
Veerapuram Varadhan 6fdda55b42 * SqlXmlTest.cs: Available only in 2.0 and above
svn path=/branches/mono-2-2/mcs/; revision=122008
2008-12-22 20:50:59 +00:00
Jonathan Pobst cdc69e8e9e Backport Ivan's patch to 2.2.
2008-11-30  Ivan N. Zlatev  <[email protected]>

	* GroupBoxRenderer.cs: Fix when VisualStyles disabled:
	   - No caption text is drawn because Color.Empty is used.
	   - Fix top and height off by 1.
	[Fixes bug #448764]

svn path=/branches/mono-2-2/mcs/; revision=121993
2008-12-22 18:30:50 +00:00
Veerapuram Varadhan d67fd7ce3a Add new SqlXmlTest
svn path=/branches/mono-2-2/mcs/; revision=121960
2008-12-21 03:45:53 +00:00
Veerapuram Varadhan d195b62b9d * SqlXml.cs (CreateReader): Better use
ConformanceLevel.Fragment while creating the reader as column
        values are not really Xml documents.  Also, throw
        SqlNullValueException when data is null.
        (.ctor): Take good care of empty XmlReaders.



svn path=/branches/mono-2-2/mcs/; revision=121959
2008-12-21 03:41:39 +00:00
Miguel de Icaza 3e90298aa1 Backport
svn path=/branches/mono-2-2/mcs/; revision=121935
2008-12-20 19:19:00 +00:00
Miguel de Icaza 8ae9f4eace Backport to 2.2
svn path=/branches/mono-2-2/mcs/; revision=121933
2008-12-20 19:15:12 +00:00
Mark Probst 08038cbf3b 2008-12-19 Mark Probst <[email protected]>
* mini-exceptions.c (get_exception_catch_class): Removed overly
	strict assertion.

2008-12-19  Mark Probst  <[email protected]>

	* bug-459285.2.cs: New generic sharing test.

	* Makefile.am: Test added.

svn path=/branches/mono-2-2/mono/; revision=121840
2008-12-19 12:42:38 +00:00
Mark Probst 7e7c65d58f 2008-12-19 Mark Probst <[email protected]>
Backport of r121292.

        * method-to-ir.c: Removed an unnecessary assertion.

2008-12-19  Mark Probst  <[email protected]>

        Backport of r121292.

        * metadata/generic-sharing.c: Look for constraints in all type
        arguments, not just the first one.

2008-12-19  Mark Probst  <[email protected]>

        Backport of r121292.

        * generic-marshalbyref.2.cs: Test for calls to marshal-by-ref
        objects.

        * Makefile.am: Test added.

svn path=/branches/mono-2-2/mono/; revision=121836
2008-12-19 10:39:22 +00:00
Gonzalo Paniagua Javier 4bf06608d3 2008-11-18 Gonzalo Paniagua Javier <[email protected]>
* HttpConnection.cs: remove CWL. When reusing, BeginReadRequest might
	throw if the client closes.
	* HttpListenerResponse.cs: close the connection for 1.0 clients.

	Backported from HEAD. Fixes bug #459432.

svn path=/branches/mono-2-2/mcs/; revision=121830
2008-12-19 04:38:03 +00:00
Marek Habersack 3aad6c2f07 Backport of r121819.
svn path=/branches/mono-2-2/mcs/; revision=121820
2008-12-18 23:39:41 +00:00
Marek Safar 26f04c283d 2008-12-18 Marek Safar <[email protected]>
A fix for bug #457087
	* generic.cs: Don't crash when constraint comes from type
	declaration.


svn path=/branches/mono-2-2/mcs/; revision=121769
2008-12-18 10:57:12 +00:00
Marek Habersack e03981495b Backport of r121752.
svn path=/branches/mono-2-2/mcs/; revision=121753
2008-12-18 01:19:10 +00:00
Veerapuram Varadhan 0f766fceaf * OciDefineHandle.cs (GetValue): Use connection's environment
handle instead of Parent handle.


svn path=/branches/mono-2-2/mcs/; revision=121734
2008-12-17 23:09:58 +00:00
Geoff Norton cd51852dd8 2008-12-17 Geoff Norton <[email protected]>
* threadpool.c: Ensure that the io_queue_lock is initialized
        in all circumstances, as we always attempt to cleanup against it.

svn path=/branches/mono-2-2/mono/; revision=121724
2008-12-17 20:10:09 +00:00
Miguel de Icaza 0a5a292db4 Backport 2008-12-17 Miguel de Icaza <[email protected]>
* icall.c (ves_icall_System_Environment_get_Platform): For
	compatibility reasons for existing client code we will keep
	returning 4 for a while.   

	For how long will depend on the documentation being updated, and
	for us to give client code a chance to be updated.

	This reverts the original decison on #433108 since we did not
	catch roughly 33 instances of the broken code in our own source
	code base, we did not catch failures on the buildbots, and QA did
	not bring this as a problem.

	Only today I found some customer's code breaking due to our own
	class libraries not being fully updated and tracked it down to
	this change.  I am reverting it because if we could not even get
	our story straight in our own code base, how can we hope that our
	end user code be fixed?

	As of this morning, our Wiki page that documents how to detect
	Unix had not been fixed.    

svn path=/branches/mono-2-2/mono/; revision=121716
2008-12-17 18:14:40 +00:00
Rolf Bjarne Kvinge b3c5bdfa7f 2008-12-12 Rolf Bjarne Kvinge <[email protected]>
* Makefile.am, vbnc.1: Remove vbnc.1. It's living in the
	  mono-basic module now.

	  [Backport of r121406.]


svn path=/branches/mono-2-2/mono/; revision=121678
2008-12-17 12:08:43 +00:00
Martin Baulig fc77b903af 2008-12-16 Martin Baulig <[email protected]>
Backport of r120438.

	* method-to-ir.c (mono_method_to_ir): Disable debugging
	information for the init locals block to make the debugger stop
	after all locals have been initalized.


svn path=/branches/mono-2-2/mono/; revision=121640
2008-12-16 22:08:59 +00:00
Martin Baulig ff74079dc1 2008-12-02 Martin Baulig <[email protected]>
Backport of r120419.

	* mini.c (mini_method_compile): Disable MONO_OPT_DEADCE when
	running inside the debugger.


svn path=/branches/mono-2-2/mono/; revision=121639
2008-12-16 22:06:18 +00:00
Martin Baulig ed3174a8b7 2008-12-16 Martin Baulig <[email protected]>
Backport of r120407 from Zoltan Varga.

	* mini.c (mini_method_compile): Only run local deadce if MONO_OPT_DEADCE
	is enabled.

	* method-to-ir.c (mono_method_to_ir): Fix invalid code generated by the 
	alu->alu imm optimization which only shows if deadce is disabled.


svn path=/branches/mono-2-2/mono/; revision=121638
2008-12-16 22:03:08 +00:00
Marek Habersack 4485172658 Backport of r121636.
svn path=/branches/mono-2-2/mcs/; revision=121637
2008-12-16 22:01:42 +00:00
Martin Baulig 7ca53d801a 2008-11-29 Martin Baulig <[email protected]>
Backport of r120260.

	* mini-exceptions.c (mono_handle_native_sigsegv): Check
	mono_debug_using_mono_debugger() in addition to the
	`no_gdb_backtrace' flag in the `MonoDebugOptions'.


svn path=/branches/mono-2-2/mono/; revision=121635
2008-12-16 21:51:34 +00:00
Marek Habersack b34dcd83c4 Backport of r121629.
svn path=/branches/mono-2-2/mono/; revision=121630
2008-12-16 21:06:06 +00:00
Gonzalo Paniagua Javier 07d8da1481 revert
svn path=/branches/mono-2-2/mcs/; revision=121628
2008-12-16 20:38:58 +00:00
Marek Habersack ae5b023940 Backport of r121621.
svn path=/branches/mono-2-2/mcs/; revision=121622
2008-12-16 19:00:52 +00:00
Zoltan Varga 9fa4d42782 2008-12-14 Zoltan Varga <[email protected]>
Backport of r120389.
	
	* method-to-ir.c (mono_method_to_ir): Set the type of the value pushed on
	the stack in CEE_LDFLDA. Fixes #450542.

	* generics.cs: Add a new test.

svn path=/branches/mono-2-2/mono/; revision=121564
2008-12-16 00:11:01 +00:00
Marek Habersack 98bcd46dd1 Backport of r121557.
svn path=/branches/mono-2-2/mono/; revision=121560
2008-12-15 22:44:51 +00:00
Zoltan Varga c373ddd111 2008-12-14 Zoltan Varga <[email protected]>
Backport of r121496.
	
	* liveness.c (mono_analyze_liveness): Avoid eliminating the 'this' var in
	gshared code. Fixes #458947.

	* generics.cs: Add a test.

svn path=/branches/mono-2-2/mono/; revision=121497
2008-12-14 09:50:57 +00:00
Zoltan Varga b93c12250d 2008-12-12 Zoltan Varga <[email protected]>
Backport of r121457.
	
	* mini-arm.c tramp-arm.c: Fix calls to mono_arch_flush_icache.

svn path=/branches/mono-2-2/mono/; revision=121458
2008-12-12 19:51:40 +00:00
Dean Brettle 67a9b038c5 Changes approved via private email from Marek Habersack <[email protected]> on 2008-10-05.
In System.Web.Configuration_2.0:
2008-12-11  Owen Brady <[email protected]>
	* nBrowser/File.cs, nBrowser/Identification.cs, nBrowser/Node.cs, nBrowser/NodeTypes.cs,
	nBrowser/Result.cs, nBrowser/Build.cs, nBrowser/Exception.cs, CapabilitiesBuild.cs, 
	CapabilitiesResult.cs: Updated Copyright information to include updated contact information.
	
	* nBrowser/Build.cs: Removed LoadDefaultEmbeddedResource function, the embeded resource
	it is referring too was never included in Mono. And was designed for a free standing 
	browser identification libary.

	* nBrowser/Exception.cs: Removed Compile Attributes and related comments which were left
	in from the original free standing browser libary.
	
	* CapabilitiesBuild.cs: Removed Header Checksum related coding since it is not required
	for the Mono implementation.

	* CapabilitiesResult.cs: Updated Copyright information to include updated contact information. 
	Removed functions which were designed to make use of features of a embeded browser file which
	is not present in Mono.
	
	* CapabilitiesChecksum.cs, RandomRoboBotKeywords.txt: Deleted

In .:
2008-12-11  Dean Brettle  <[email protected]>

	* System.Web.dll.sources: deleted
	System.Web.Configuration_2.0/CapabilitiesChecksum.cs
	
	* Makefile (RESOURCE_FILES_2): deleted
	System.Web.Configuration_2.0/RandomRoboBotKeywords.txt


svn path=/branches/mono-2-2/mcs/; revision=121384
2008-12-12 00:52:06 +00:00
Rodrigo Kumpera dc330f3d57 In tests:
2008-12-08  Rodrigo Kumpera  <[email protected]>

	* bug457574.il: New regression test.

	* Makefile.am: Test added.

	Backported from trunk r121174.

In mini:
2008-12-10  Rodrigo Kumpera  <[email protected]>

	* ssa.c (fold_ins): branch opt can kill dummy switch ops so we can't
	expect that an OP_BR_REG will be there.

	* branch-opts.c (remove_block_if_useless): Use MONO_IS_BRANCH_OP instead of checking
	for the many branch ops. The original check miss OP_BR_REG.

	Fixes #457574.

	Backported from trunk r121173 and r121175


svn path=/branches/mono-2-2/mono/; revision=121210
2008-12-10 13:09:08 +00:00
Zoltan Varga 9fe47f55e3 2008-12-09 Zoltan Varga <[email protected]>
Backport of r121150.
	
	* aot-runtime.c (load_method): Avoid calling decode_exception_debug_info
	while holding the aot lock.

svn path=/branches/mono-2-2/mono/; revision=121152
2008-12-09 20:14:00 +00:00
Andrés G. Aragoneses 657e5df419 fix changelog
svn path=/branches/mono-2-2/mcs/; revision=121118
2008-12-09 17:08:37 +00:00
Zoltan Varga 1511ce89c6 2008-12-09 Zoltan Varga <[email protected]>
Backport of r121103.
	
	* aot-runtime.c (decode_exception_debug_info): Acquire the domain
	lock when calling mono_domain_alloc (). Hopefully fixes #415608.

svn path=/branches/mono-2-2/mono/; revision=121104
2008-12-09 16:07:01 +00:00
Marek Habersack 05e0f11430 Backport of r121064.
svn path=/branches/mono-2-2/mcs/; revision=121065
2008-12-08 23:44:55 +00:00
Zoltan Varga 06cddce9b0 2008-12-08 Zoltan Varga <[email protected]>
Backport of r120999.
	
	* mini-exceptions.c (mono_print_thread_dump): Mark threadpool threads
	as such. Fixes #456669.

svn path=/branches/mono-2-2/mono/; revision=121000
2008-12-08 15:03:39 +00:00
Zoltan Varga 3e3c9edc91 2008-12-08 Zoltan Varga <[email protected]>
Backport of r120995.
	
	* SQLite3.cs: Avoid IntPtr.ToInt32 () to convert between IntPtr's and integers
	since it is not 64 bit safe. Fixes #457038.

svn path=/branches/mono-2-2/mcs/; revision=120996
2008-12-08 14:50:59 +00:00
Marek Habersack 24d7fea4ca Backport of r120988.
svn path=/branches/mono-2-2/mcs/; revision=120989
2008-12-08 12:04:01 +00:00
Marek Habersack 691a2cf225 Backport of r120880
svn path=/branches/mono-2-2/mono/; revision=120883
2008-12-05 20:37:26 +00:00
Marek Habersack 296607e9b1 Fix a test run issue for 1.1
svn path=/branches/mono-2-2/mcs/; revision=120860
2008-12-05 18:05:44 +00:00
Gonzalo Paniagua Javier ee79b6f908 2008-12-05 Gonzalo Paniagua Javier <[email protected]>
* Tds70.cs: support parameter names with or without a leading '@'.


svn path=/branches/mono-2-2/mcs/; revision=120855
2008-12-05 17:18:56 +00:00
Marek Habersack 9844a237ea Backport of r120823.
svn path=/branches/mono-2-2/mcs/; revision=120825
2008-12-05 12:01:37 +00:00
Marek Habersack 9a817effa9 Backport of r120822.
svn path=/branches/mono-2-2/mcs/; revision=120824
2008-12-05 12:00:14 +00:00
Miguel de Icaza 9a2e1ccef4 Backport ReaderWriterLockSlim for MEF
svn path=/branches/mono-2-2/mcs/; revision=120768
2008-12-04 22:03:09 +00:00
Zoltan Varga fbfb1742ed 2008-12-04 Zoltan Varga <[email protected]>
Backport of r120756.
	
	* aot-compiler.c (add_wrappers): Add pinvoke wrappers.

	* mini.c (mono_resolve_patch_target): Allow pinvoke methods in 
	MONO_PATCH_INFO_ICALL_ADDR.

svn path=/branches/mono-2-2/mono/; revision=120757
2008-12-04 21:04:20 +00:00
Zoltan Varga 547f83ca27 2008-12-04 Zoltan Varga <[email protected]>
* marshal.c (mono_marshal_emit_native_wrapper): Add AOT support for pinvoke
	wrappers by emitting the function address using a CEE_MONO_ICALL_ADDR 
	instruction instead of a pointer constant.

svn path=/branches/mono-2-2/mono/; revision=120750
2008-12-04 20:48:32 +00:00
Marek Safar 73bd2d2941 2008-12-03 Marek Safar <[email protected]>
* typemanager.cs, namespace.cs, driver.cs: Allow ExtensionAttribute
	to be imported from any assembly.


svn path=/branches/mono-2-2/mcs/; revision=120629
2008-12-03 19:49:33 +00:00
Gonzalo Paniagua Javier e6a317bc40 2008-12-03 Gonzalo Paniagua Javier <[email protected]>
* UdpClientTest.cs: test closing a UDP socket while receiving.


svn path=/branches/mono-2-2/mcs/; revision=120605
2008-12-03 15:35:50 +00:00
Gonzalo Paniagua Javier bfdcf61509 2008-12-03 Gonzalo Paniagua Javier <[email protected]>
* UdpClient.cs: don't Poll() in Receive(), the call to ReceiveFrom
	will block anyway. Fixes bug #455894.

2008-11-12 Gonzalo Paniagua Javier <[email protected]>

	* Socket.cs: mark the socket as not connected when there is a pending
	error or exception about to be thrown.
	Bug #443346 fixed.


svn path=/branches/mono-2-2/mcs/; revision=120602
2008-12-03 15:33:28 +00:00
Mark Probst a1f8c0800d 2008-12-03 Mark Probst <[email protected]>
Backport of r120589.

	* method-to-ir.c (mono_method_to_ir): Handle ldtoken of an open
	generic type (via a typedef or typeref) correctly.

2008-12-03  Mark Probst  <[email protected]>

	Backport of r120589.

	* generic-typedef.2.cs: New test for ldtoken of open generic
	types.

	* Makefile.am: Test added.

svn path=/branches/mono-2-2/mono/; revision=120595
2008-12-03 14:22:24 +00:00
Marek Habersack 861c4f8f12 Backport of r120592.
svn path=/branches/mono-2-2/mcs/; revision=120593
2008-12-03 13:55:22 +00:00
Marek Habersack 7af8c9351d Backport of r120590.
svn path=/branches/mono-2-2/mcs/; revision=120591
2008-12-03 13:33:22 +00:00
Rodrigo Kumpera 7155c65bfd 2008-12-03 Rodrigo Kumpera <[email protected]>
* mono-property-hash.c (mono_property_hash_destroy): Release
	the root hashtable as well.

	Backported from trunk.


svn path=/branches/mono-2-2/mono/; revision=120587
2008-12-03 12:31:09 +00:00
Gonzalo Paniagua Javier f20c4ece0c 2008-12-02 Gonzalo Paniagua Javier <[email protected]>
* AspParser.cs: reset to the next character in a partial match in case
	of failure. Fixes bug #314688.

svn path=/branches/mono-2-2/mcs/; revision=120552
2008-12-03 00:17:54 +00:00
Gonzalo Paniagua Javier 45efaf51b3 2008-12-02 Gonzalo Paniagua Javier <[email protected]>
* Page.cs: make sure we don't return null in Title.


svn path=/branches/mono-2-2/mcs/; revision=120551
2008-12-03 00:17:25 +00:00
Marek Habersack de0321f109 Backport of r120545.
svn path=/branches/mono-2-2/mono/; revision=120546
2008-12-02 23:13:43 +00:00
Zoltan Varga 71864e55c4 2008-12-03 Zoltan Varga <[email protected]>
Backport of r120543.
	
	* mini-trampolines.c (mono_magic_trampoline): Add some debugging code to help
	diagnose an assertion failure.

svn path=/branches/mono-2-2/mono/; revision=120544
2008-12-02 23:04:35 +00:00
Miguel de Icaza 92aa367629 backport the fix for erase/delete for OSX
svn path=/branches/mono-2-2/mcs/; revision=120539
2008-12-02 21:57:01 +00:00
Marek Habersack a7e3109c66 Backport of r120485.
svn path=/branches/mono-2-2/mcs/; revision=120486
2008-12-02 14:28:23 +00:00
Marek Habersack 0c68cd806a Backport of r120442.
svn path=/branches/mono-2-2/mcs/; revision=120444
2008-12-02 01:36:46 +00:00
Marek Habersack 8098dbe758 Backport of r120436.
svn path=/branches/mono-2-2/mcs/; revision=120437
2008-12-02 01:08:01 +00:00
Rodrigo Kumpera 50619fe4f4 2008-12-01 Rodrigo Kumpera <[email protected]>
* main.c (get_uninitialized_data_type): Make crappy static analyzers happy.

	Backported from trunk.


svn path=/branches/mono-2-2/mono/; revision=120417
2008-12-01 23:28:37 +00:00
Marek Habersack b4c5181a77 Backport of r120376.
svn path=/branches/mono-2-2/mcs/; revision=120377
2008-12-01 19:33:50 +00:00
Marek Habersack f20b93ecf7 Backport of r120353.
svn path=/branches/mono-2-2/mcs/; revision=120354
2008-12-01 14:45:31 +00:00
Marek Habersack 2023460027 Backport of r120345.
svn path=/branches/mono-2-2/mcs/; revision=120346
2008-12-01 12:35:03 +00:00
Zoltan Varga d44a27c9e1 2008-11-29 Zoltan Varga <[email protected]>
Backport of r120273.
	
	* mini.h aot-runtime.c: Fix building with DISABLE_AOT.

svn path=/branches/mono-2-2/mono/; revision=120283
2008-11-29 20:28:25 +00:00
Zoltan Varga cf1ccdc254 2008-11-29 Zoltan Varga <[email protected]>
Backport of r120273.
	
	* mini.h aot-runtime.c: Fix building with DISABLE_AOT.

svn path=/branches/mono-2-2/mono/; revision=120274
2008-11-29 17:00:46 +00:00
Marek Habersack ce427d5af1 Backport of r120199
svn path=/branches/mono-2-2/mcs/; revision=120200
2008-11-28 01:44:16 +00:00
Marek Habersack a78027248b Backport of r120047
svn path=/branches/mono-2-2/mcs/; revision=120107
2008-11-27 02:04:58 +00:00
Gonzalo Paniagua Javier 7d3335da20 2008-11-25 Gonzalo Paniagua Javier <[email protected]>
* pedump.c: initialize perf. counters. Fixes a segv.


svn path=/branches/mono-2-2/mono/; revision=119980
2008-11-25 17:41:38 +00:00
Marek Safar a21f8151eb 2008-11-25 Marek Safar <[email protected]>
A fix for bug #447027
	* anonymous.cs (HoistedVariable): Cache also outer access to deal
	with context variables stored as expression instances.


svn path=/branches/mono-2-2/mcs/; revision=119967
2008-11-25 16:29:53 +00:00
Gonzalo Paniagua Javier ddb21259f1 2008-11-13 Gonzalo Paniagua Javier <[email protected]>
* FtpWebRequestTest.cs: the upload test now passes with the MS
	runtime. Added another test for download.



svn path=/branches/mono-2-2/mcs/; revision=119913
2008-11-25 02:13:22 +00:00
Gonzalo Paniagua Javier 2664cc24dc 2008-11-13 Gonzalo Paniagua Javier <[email protected]>
* FtpDataStream.cs: use the socket for reading until the end of a
	stream that wasn't read entirely. Remove unused ManualResetEvent.
	* FtpWebRequest.cs: set the file_name when downloading. Update the
	response status after every SendCommand. Send a "OPTS utf8 on" as MS
	does (the control cnc reader should do something with UTF8)


svn path=/branches/mono-2-2/mcs/; revision=119912
2008-11-25 02:10:49 +00:00
Marek Habersack f445544ba8 those need to be in there as well
svn path=/branches/mono-2-2/mcs/; revision=119911
2008-11-25 01:47:27 +00:00
Marek Habersack fe7bbc9da1 This needs to be here too :P
svn path=/branches/mono-2-2/mcs/; revision=119910
2008-11-25 01:46:30 +00:00
Marek Habersack 1b3d62f26e This needs to be here too :P
svn path=/branches/mono-2-2/mcs/; revision=119909
2008-11-25 01:44:55 +00:00
Marek Habersack 1b578615c6 Backport of r119699
svn path=/branches/mono-2-2/mcs/; revision=119908
2008-11-25 01:28:55 +00:00
Marek Habersack 54c0e1e47f Backport of r119893
svn path=/branches/mono-2-2/mcs/; revision=119906
2008-11-25 01:27:45 +00:00
Marek Habersack cd105f51c1 Backport of r119800
svn path=/branches/mono-2-2/mcs/; revision=119905
2008-11-25 01:27:24 +00:00
Marek Habersack af1e7f3096 Backport of r119673
svn path=/branches/mono-2-2/mcs/; revision=119904
2008-11-25 01:26:37 +00:00
Marek Habersack 544c381f9f Backport of r119661
svn path=/branches/mono-2-2/mcs/; revision=119902
2008-11-25 01:23:35 +00:00
Marek Habersack 64c2b9fea8 Backport of r119126
svn path=/branches/mono-2-2/mcs/; revision=119901
2008-11-25 01:22:48 +00:00
Marek Habersack ad443c3edf Backport of r119378
svn path=/branches/mono-2-2/mcs/; revision=119898
2008-11-25 01:10:41 +00:00
Marek Habersack f83478e9f0 Backport of r119269
svn path=/branches/mono-2-2/mcs/; revision=119897
2008-11-25 01:10:13 +00:00
Marek Habersack 6ff666ba9f Backport of r119233
svn path=/branches/mono-2-2/mcs/; revision=119896
2008-11-25 01:09:43 +00:00
Marek Habersack 5a4faa0dbe Backport of r119130
svn path=/branches/mono-2-2/mcs/; revision=119895
2008-11-25 01:09:06 +00:00
Marek Habersack 560afb2c8c Backport of r118917
svn path=/branches/mono-2-2/mcs/; revision=119894
2008-11-25 01:08:29 +00:00
Marek Habersack df6dcb4bc3 Backport of r119827
svn path=/branches/mono-2-2/mcs/; revision=119829
2008-11-24 18:48:26 +00:00
Jonathan Pobst ae55ffa9b3 2008-11-24 Jonathan Pobst <[email protected]>
* Form.cs: Don't change min/max size if it is empty.
	[Fixes bug #447873]

2008-11-23  Jonathan Pobst  <[email protected]>

	* FormTest.cs: Add test for bug #447873.

svn path=/branches/mono-2-2/mcs/; revision=119813
2008-11-24 17:05:25 +00:00
Jonathan Pobst 3fd6b5713d 2008-11-21 Jonathan Pobst <[email protected]>
* XPlatUI.cs: Take new Platform.MacOSX into account.
	[Fixes bug #447663]

svn path=/branches/mono-2-2/mcs/; revision=119638
2008-11-21 17:07:43 +00:00
Rodrigo Kumpera 71fbfc7a0a 2008-11-21 Rodrigo Kumpera <[email protected]>
* icall.c (mono_method_get_equivalent_method): Make sure
	method->klass->methods is inited before looping over it.

	Backported from trunk.


svn path=/branches/mono-2-2/mono/; revision=119613
2008-11-21 14:15:07 +00:00
Andreia Gaita 2d97201acc * Mono.Mozilla/DOM/ContentListener.cs: Added (oops)
2008-11-21  Andreia Gaita <[email protected]>

svn path=/branches/mono-2-2/mcs/; revision=119612
2008-11-21 14:06:56 +00:00
Andreia Gaita d6717fd548 * System.Drawing/Image.cs: On win32, when cloning images initialized from
resources, also clone the underlying stream, since it needs to stay
  around for the life of the image (gdi doesn't clone the underlying
  stream when cloning images, so when the gc disposes the original, it
  will also dispose the stream, which invalidates the clone).

* System.Drawing/Bitmap.cs: Save the underlying stream when creating bitmaps from a
  clone under win32

* System.Drawing.Imaging/Metafile.cs: Save the underlying stream when creating from a
  clone under win32

[fixes #438886, Backported from r119580]

2008-11-21  Andreia Gaita  <[email protected]>

svn path=/branches/mono-2-2/mcs/; revision=119581
2008-11-21 05:50:55 +00:00
Jonathan Pobst 4e17e21b2a 2008-11-20 Jonathan Pobst <[email protected]>
* ComboBox.cs: Call HideWindow instead of Hide when closing the dropdown
	through DroppedDown so the proper events get called and state gets reset.
	[Fixes bug #446805]

svn path=/branches/mono-2-2/mcs/; revision=119561
2008-11-21 00:23:09 +00:00
Andreia Gaita 3dc556e23b * Mono.WebBrowser/IWebBrowser.cs, Mono.Mozilla/WebBrowser.cs: Support script
execution directly in the browser object
  [Backported, r118685]

2008-11-20  Andreia Gaita <[email protected]>

svn path=/branches/mono-2-2/mcs/; revision=119494
2008-11-20 19:19:56 +00:00
Andreia Gaita 24b03dbeb3 * Mono.Mozilla/DOM/Node.cs, Mono.Mozilla/DOM/Window.cs: Fix equality
operators
  [Backported, r118684, r119336]

2008-11-20  Andreia Gaita <[email protected]>

svn path=/branches/mono-2-2/mcs/; revision=119493
2008-11-20 19:19:51 +00:00
Andreia Gaita ce37fb5dfb * Mono.WebBrowser.dll.sources, Mono.WebBrowser2K5.csproj,
Mono.Mozilla/interfaces/nsIURIContentListener.cs,
  Mono.Mozilla/DOM/ContentListener.cs: New class added to listen for load
  requests and handle content types
* Mono.WebBrowser/IWebBrowser.cs, Mono.Mozilla/WebBrowser.cs: New
  NavigationRequested event to catch load requests

[Backported, r118617]

2008-11-20  Andreia Gaita <[email protected]>

svn path=/branches/mono-2-2/mcs/; revision=119492
2008-11-20 19:19:47 +00:00
Zoltan Varga f4bb6280cd 2008-11-20 Zoltan Varga <[email protected]>
Backport of r119444.
	
	* arm/Makefile.am (libmonoarch_arm_la_SOURCES): Don't build tramp.c, it is only
	used by the interpreter.

svn path=/branches/mono-2-2/mono/; revision=119445
2008-11-20 14:30:04 +00:00
Zoltan Varga bc76b7d785 2008-11-20 Zoltan Varga <[email protected]>
Backport of r119398.
	
	* pinvoke2.cs: Add a test for passing/receiving generic struct instances.

svn path=/branches/mono-2-2/mono/; revision=119400
2008-11-20 00:22:29 +00:00
Zoltan Varga e538bc771d 2008-11-20 Zoltan Varga <[email protected]>
Backport of r119397.
	
	* marshal.c: Add support for MONO_TYPE_GENERICINST to some functions.
	Fixes #444715. Fix a warning.

svn path=/branches/mono-2-2/mono/; revision=119399
2008-11-20 00:21:27 +00:00
Jonathan Pryor 5334d00d47 * Makefile.am (EXTRA_DIST): Add mono-file-formats{.config,.source} and
mono-tools{.config,.source} (fixes the build).

svn path=/branches/mono-2-2/mono/; revision=119304
2008-11-19 13:09:00 +00:00
Jonathan Pryor e43c207e12 * docs.make, Makefile.am: Build mono-file-formats{.tree,.zip},
mono-tool{.tree,.zip} files.
	* mono-file-formats.config, mono-tools.config: Alter paths to man
	  pages so that they're valid for building from mono/docs.
	* monoapi.make: Rename to docs.make.

svn path=/branches/mono-2-2/mono/; revision=119260
2008-11-19 02:27:54 +00:00
Jonathan Pryor ea6508481f * docs/Makefile: Don't build mono-file-formats.*, mono-tools.*
* docs/mono-file-formats.config, docs/mono-file-formats.source, 
	  docs/mono-tools.config, docs/mono-tools.source: Removed (now located 
	  in mono/docs).

svn path=/branches/mono-2-2/mcs/; revision=119259
2008-11-19 02:27:31 +00:00
Jonathan Pryor 6ed0b0bd5d These files need to move into mono/docs to fix
https://bugzilla.novell.com/show_bug.cgi?id=445156

svn path=/branches/mono-2-2/mono/; revision=119256
2008-11-19 02:22:52 +00:00
Bill Holmes 2514e975c3 2008-11-17 Bill Holmes <[email protected]>
Backport of 119064 and 119081.

	* marshal.h : cominterop_ccw_getfreethreadedmarshaler added to return the
	  free threaded marshaler when QueryInterface is called on a COM callable
	  wrapper requesting the IMarshal interface.

	Code is contributed under MIT/X11 license.

svn path=/branches/mono-2-2/mono/; revision=119088
2008-11-17 21:05:37 +00:00
Rodrigo Kumpera 882ffb10b4 2008-11-17 Rodrigo Kumpera <[email protected]>
* FieldInfoTest.cs: Test FieldInfo::GetValue on a constant of an open
	generic type.

	Backported from trunk.


svn path=/branches/mono-2-2/mcs/; revision=119079
2008-11-17 18:55:56 +00:00
Rodrigo Kumpera a1a664dbcd 2008-11-17 Rodrigo Kumpera <[email protected]>
* MonoField.cs (GetValue): Don't check for open generic types if the field
	is a constant.

	Backported from trunk.


svn path=/branches/mono-2-2/mcs/; revision=119078
2008-11-17 18:55:16 +00:00
Rodrigo Kumpera 9ff5304841 2008-11-17 Rodrigo Kumpera <[email protected]>
* simd-intrinsics.c (vector2l_intrinsics): CompareGreaterThan requires sse 4.2
	and not 4.1. 

	Backported from trunk.


svn path=/branches/mono-2-2/mono/; revision=119065
2008-11-17 18:00:08 +00:00
Rodrigo Kumpera bac3152d94 2008-11-17 Rodrigo Kumpera <[email protected]>
* Vector2l.cs (CompareGreaterThan): This method requires sse 4.2
	and 4.1.

	Backported from trunk.


svn path=/branches/mono-2-2/mcs/; revision=119062
2008-11-17 17:22:18 +00:00
Marek Safar 02f76440bb 2008-11-17 Marek Safar <[email protected]>
A fix for bug #445303
	* location.cs (IsConditionalDefined): Handle undefined global
	defines.


svn path=/branches/mono-2-2/mcs/; revision=119040
2008-11-17 15:39:41 +00:00
Marek Safar bb0e7fc708 2008-11-17 Marek Safar <[email protected]>
A fix for bug #444678
	* expression.cs (TryReduceConstant): Always create new constant
	instance.


svn path=/branches/mono-2-2/mcs/; revision=119028
2008-11-17 14:45:40 +00:00
Marek Safar 800ae747f2 2008-11-17 Marek Safar <[email protected]>
A fix for bug #444673
	* ecore.cs: Ignore open generic types when used as generic type
	instance fields.


svn path=/branches/mono-2-2/mcs/; revision=119016
2008-11-17 13:19:46 +00:00
Zoltan Varga 6d986cfd7a 2008-11-17 Zoltan Varga <[email protected]>
Merge r118977 from HEAD.

	* mini-amd64.h: Change the monitor fastpath defines to check for
	!PLATFORM_WIN32 so they work on *bsd too.

svn path=/branches/mono-2-2/mono/; revision=118978
2008-11-17 00:39:13 +00:00
Gonzalo Paniagua Javier 88068708ab 2008-11-14 Gonzalo Paniagua Javier <[email protected]>
* DefaultWsdlHelpGenerator.aspx: use javascript instead of
	HttpWebRequest to avoid a deadlock if the web service uses Session.
	Bug #444343 fixed.
	re: miguel


svn path=/branches/mono-2-2/mono/; revision=118834
2008-11-14 06:31:29 +00:00
Marek Habersack 7a9e96f166 Backport of r118813
svn path=/branches/mono-2-2/mcs/; revision=118815
2008-11-14 02:09:17 +00:00
Marek Habersack e7ec701595 Backport of r118799
svn path=/branches/mono-2-2/mcs/; revision=118800
2008-11-14 00:41:19 +00:00
Veerapuram Varadhan eed1a21d6d reset the connection on timeout exception from TDS
svn path=/branches/mono-2-2/mcs/; revision=118762
2008-11-13 20:22:23 +00:00
Veerapuram Varadhan 7246c849af instead of executing sp_reset_connection, set reset connection bit.
svn path=/branches/mono-2-2/mcs/; revision=118760
2008-11-13 20:17:48 +00:00
Veerapuram Varadhan d39d766bf9 Tests ported from trunk.
svn path=/branches/mono-2-2/mcs/; revision=118759
2008-11-13 20:15:34 +00:00
Bill Holmes 3a2bd00f10 2008-11-13 Bill Holmes <[email protected]>
Backport of r118724.

	* process.h : Adding method declaration for
	  ves_icall_System_Diagnostics_Process_WaitForInputIdle_internal.

	* process.c : Adding implementation for
	  ves_icall_System_Diagnostics_Process_WaitForInputIdle_internal.

	* icall-def.h : Registering ICALL Processs.WaitForInputIdle_internal
	  to ves_icall_System_Diagnostics_Process_WaitForInputIdle_internal.

	* wait.h : Adding method declaration for WaitForInputIdle.

	* wait.c : Adding implementation for WaitForInputIdle.

	* Process.cs : Adding an implementation for WaitForInputIdle
	  to call the an internal call.  The internal call is only
	  implemented properly on Windows.

	Code is contributed under MIT/X11 license.   


svn path=/branches/mono-2-2/mcs/; revision=118743
2008-11-13 18:00:06 +00:00
Bill Holmes 9341400101 2008-11-13 Bill Holmes <[email protected]>
Backport of r118724.

	* process.h : Adding method declaration for
	  ves_icall_System_Diagnostics_Process_WaitForInputIdle_internal.

	* process.c : Adding implementation for
	  ves_icall_System_Diagnostics_Process_WaitForInputIdle_internal.

	* icall-def.h : Registering ICALL Processs.WaitForInputIdle_internal
	  to ves_icall_System_Diagnostics_Process_WaitForInputIdle_internal.

	* wait.h : Adding method declaration for WaitForInputIdle.

	* wait.c : Adding implementation for WaitForInputIdle.

	* Process.cs : Adding an implementation for WaitForInputIdle
	  to call the an internal call.  The internal call is only
	  implemented properly on Windows.

	Code is contributed under MIT/X11 license.   


svn path=/branches/mono-2-2/mono/; revision=118743
2008-11-13 18:00:06 +00:00
Veerapuram Varadhan 42b1712b66 Backported fix for bug#428139 from trunk
svn path=/branches/mono-2-2/mcs/; revision=118738
2008-11-13 17:31:07 +00:00
Zoltan Varga 1f16a62cf9 2008-11-13 Zoltan Varga <[email protected]>
Backport r118729 from HEAD.
	
	* RxInterpreter.cs: Fix pc computation in various opcodes. Fixes #443841.

svn path=/branches/mono-2-2/mcs/; revision=118732
2008-11-13 17:15:35 +00:00
Marek Safar 7f4be72fcc 2008-11-13 Marek Safar <[email protected]>
A fix for bug #444271
	* anonymous.cs: Rescan parent storeys when best candidate was
	undone.


svn path=/branches/mono-2-2/mcs/; revision=118720
2008-11-13 15:30:22 +00:00
Rodrigo Kumpera e521732831 2008-11-11 Rodrigo Kumpera <[email protected]>
* ModuleTest.cs : Add test for ResolveMethod with a methodspec
	token.

	Backported from trunk.


svn path=/branches/mono-2-2/mcs/; revision=118545
2008-11-11 20:18:38 +00:00
Rodrigo Kumpera fc81aabdab 2008-11-11 Rodrigo Kumpera <[email protected]>
* Module.cs (ResolveMethod): Use internal method 
	GetMethodFromHandleNoGenericCheck to avoid the generic type
	limitation of GetMethodFromHandle.

	Fixes #443763.

	Backported from trunk.


svn path=/branches/mono-2-2/mcs/; revision=118544
2008-11-11 20:18:13 +00:00
Rodrigo Kumpera fcfc9108ba 2008-11-11 Rodrigo Kumpera <[email protected]>
* ConstructorOnTypeBuilderInstTest.cs: Add test for
	MetadataToken under compilation context.

	Backported from trunk.


svn path=/branches/mono-2-2/mcs/; revision=118519
2008-11-11 17:15:57 +00:00
Rodrigo Kumpera b462d915a2 Wrong date in the changelog
svn path=/branches/mono-2-2/mcs/; revision=118518
2008-11-11 17:15:29 +00:00
Rodrigo Kumpera e8d73281a2 2008-11-12 Rodrigo Kumpera <[email protected]>
* ConstructorOnTypeBuilderInst.cs (MetadataToken): Make this
        * property
        work under compiler context. Same hack as the one applied to
        MethodOnTypeBuilderInst.

        Fixes #442610.

        Backported from trunk.



svn path=/branches/mono-2-2/mcs/; revision=118517
2008-11-11 17:14:31 +00:00
Zoltan Varga ff0399cfbe 2008-11-11 Zoltan Varga <[email protected]>
Backport r118484 from HEAD.
	
	* CILCompiler.cs: Implement Reference opcode.

svn path=/branches/mono-2-2/mcs/; revision=118485
2008-11-11 11:21:15 +00:00
Andrew Jorgensen a30aa5462d Bump versions to 2.2
svn path=/branches/mono-2-2/mono/; revision=118446
2008-11-11 00:24:15 +00:00
7788 changed files with 389290 additions and 1177307 deletions

No files matched your search

-31
View File
@@ -1,31 +0,0 @@
/Makefile
/Makefile.in
/_tmpinst
/aclocal.m4
/autom4te.cache
/config.cache
/config.guess
/config.h
/config.h.in
/config.h.in
/config.log
/config.status
/config.sub
/configure
/libtool
/ltconfig
/ltmain.sh
/mono-*.tar.gz
/*.pc
/mono.spec
/semantic.cache
/stamp-h
/stamp-h.in
/stamp-h1
/tmpinst-dir.stamp
/missing
/compile
/depcomp
/install-sh
/doltlibtool
/doltcompile
-3041
View File
File diff suppressed because it is too large. Load diff
+1 -402
View File
@@ -1,357 +1,7 @@
2009-08-18 Zoltan Varga <[email protected]>
* scripts/Makefile.am: Applied patch from Hib Eris ([email protected]).
Add $(SCRIPT_SUFFIX) to the name of the 'mod' tool.
2009-08-04 Miguel de Icaza <[email protected]>
* Start the split between PLATFORM_WIN32 and TARGET_WIN32.
PLATFORM_WIN32 should be used to configure the runtime while
building it. TARGET_WIN32 is used for target execution.
This is used by Mono's AOT cross compiler when running on Windows,
but targetting a different operating system. So we have to tell
those two apart.
2009-07-24 Jb Evain <[email protected]>
* scripts/Makefile.am: generate a dmcs script for the 4.0 compiler
when building the net_4_0 profile.
2009-07-24 Jb Evain <[email protected]>
* configure.in
* runtime/Makefile.am
* data/Makefile.am: create a and populate a configuration folder
for the net_4_0 profile.
2009-07-21 Jb Evain <[email protected]>
* configure.in: add a --with-monotouch option.
* runtime/Makefile.am: use it to trigger the mcs monotouch build.
2009-07-14 Zoltan Varga <[email protected]>
* configure.in: Add more libraries needed by the llvm backend.
2009-07-02 Jb Evain <[email protected]>
* scripts/Makefile.am: monolinker is now a 2.0 assembly.
2009-07-02 jonas echterhoff <[email protected]>
* configure.in: Add linker flag on Mac OS X to allow access to other
processes, needed for debugging. Enable debugging on OS X.
2009-06-21 Zoltan Varga <[email protected]>
* configure.in (TARGET_BYTE_ORDER): New define containing the byte order of
the target.
2009-06-18 Marek Habersack <[email protected]>
* data/browscap.ini: applied Mono modifications to the upstream
version. Fixes three tests failing in System.Web. Fixes bug #513965
Added ecmascriptversion, msdomversion and w3cdomversion to the IE
8.0 entry. Fixes bug #513965
2009-06-16 Raja R Harinath <[email protected]>
* configure.in (--with-profile2): Simplify slightly.
(--with-profile4, --with-moonlight): Likewise.
2009-06-15 Miguel de Icaza <[email protected]>
* configure.in: Changed the default to not build the 4.0 profile
unless explicitly enabled.
2009-06-15 Zoltan Varga <[email protected]>
* CMakeLists.txt: Add mips support.
2009-06-14 Zoltan Varga <[email protected]>
* scripts/CMakeLists.txt: New file.
* samples/CMakeLists.txt: New file, currently empty.
2009-06-12 Andreia Gaita <[email protected]>
* data/config.in: add libcups dllmap entry
2009-06-11 Zoltan Varga <[email protected]>
* configure.in: Disable dtrace support if dtrace doesn't support the
-h option.
2009-06-10 Marek Safar <[email protected]>
* runtime/Makefile.am, configure.in: Make net_4_0 profile optional.
2009-06-07 Marek Safar <[email protected]>
* runtime/Makefile.am: Enabled net_4_0 for compilation.
2009-05-27 Zoltan Varga <[email protected]>
* configure.in: Disable USE_MUNMAP on ppc to work around #504411.
2009-05-26 Zoltan Varga <[email protected]>
* CMakeLists.txt: Implement AC_OUTPUT, creation of config.make, etc.
* CMakeLists.txt: implement arm fpu detection, add vfp detection as
well.
* CMakeLists.txt: Add arm support.
2009-05-24 Miguel de Icaza <[email protected]>
* Disable mono/docs build if we disabled the mcs build.
2009-05-24 Zoltan Varga <[email protected]>
* */CMakeLists.txt: Add beginnings of a cmake based build system.
2009-05-22 Zoltan Varga <[email protected]>
* acinclude.m4 (dolt_supported): Enable dolt on sparc linux.
2009-05-17 Zoltan Varga <[email protected]>
* configure.in: Add TARGET_POWERPC/POWERPC64 defines.
2009-05-09 Miguel de Icaza <[email protected]>
* configure.in: Instead of reporting the various disabled features
in a loop, where a keyword might fail, report the actual disabled
features in the sections that handle them
2009-05-08 Zoltan Varga <[email protected]>
* acinclude.m4 (dolt_supported): Add powerpc64.
2009-05-07 Rodrigo Kumpera <[email protected]>
* runtime/Makefile.am (mcs-compileall): Pass --security=validil
to the runtime so the assemblies are not required to be verifiable.
2009-05-06 Raja R Harinath <[email protected]>
* Makefile.am (compiler-tests): Rewrite to re-build the moon
assemblies after mcs/ is built.
* runtime/Makefile.am (build_profiles) [INSTALL_2_1]: Build only
the net_2_1_raw profile.
(test_profiles): New. Mention net_2_1 profile.
(moon-do-build): New.
2009-05-05 Miguel de Icaza <[email protected]>
* configure.in: Fix the bug reported on the mailing list by
Koushik K Dutta: do not build docs when --disable-mcs-builds is
passed.
2009-05-05 Miguel de Icaza <[email protected]>
* configure.in: Reduce configure-time dependencies by using
pkg-config the way it was originally intended to be used, and not
with the incredibly lame and painful inducing pkg.m4 file.
I am on a quest to remove this gratuitous dep on pkg.m4 that is
making people's lives miserable around the globe, just because
someone can not be bothered to learn the shell if construct.
2009-04-28 Zoltan Varga <[email protected]>
* configure.in: Add an option to disable the solaris tar check.
* configure.in: Define a TARGET_<ARCH> preprocessor symbol for some
architectures.
2009-04-23 Jb Evain <[email protected]>
* scripts/Makefile.am: add a pdb2mdb script.
2009-04-22 Jeffrey Stedfast <[email protected]>
* configure.in: Check for a stable version of glib-2.0 as opposed
to an unstable development version (we don't want people
unfamiliar with glib versioning to install an unstable development
version of glib).
2009-04-13 Zoltan Varga <[email protected]>
* configure.in: Quiet 'copying selected object files' messages from
newer libtool versions as well.
* configure.in: Disable AC_PROG_CXX for now to fix the windows build.
In mono/mini:
* Makefile.am: Comment out the cpp files as f@#%$ automake complains even
if they are inside a conditional.
2009-04-03 Zoltan Varga <[email protected]>
* scripts/patch-quiet.sh: Process LTCXXCOMPILE too.
2009-04-02 Zoltan Varga <[email protected]>
* configure.in: Move the call to AC_PROG_CXX earlier and enable it again.
* configure.in: Disable the call to AC_PROG_CXX for now.
2009-04-02 Marek Habersack <[email protected]>
* data/Makefile.am: added system.web.mvc.pc{.in}
* configure.in: added data/system.web.mvc.pc to AC_OUTPUT
* data/system.web.mvc.pc.in: added
2009-04-02 Zoltan Varga <[email protected]>
* configure.in: Add an ENABLE_LLVM autoconf define.
* configure.in: Add --enable-llvm argument to enable the experimental
LLVM back end.
2009-03-31 Jb Evain <[email protected]>
* scripts: Remove smcs, which is handled by moon now.
* data: ditto.
2009-03-20 Zoltan Varga <[email protected]>
* mono/os: Remove this now empty directory.
* mono/Makefile.am (SUBDIRS): Remove 'os'.
2009-03-16 Atsushi Enomoto <[email protected]>
* scripts/Makefile.am : mono-xmltool uses 2.0.
2009-03-12 Jonathan Pryor <[email protected]>
* scripts/Makefile.am: Add sqlmetal.
2009-03-10 Zoltan Varga <[email protected]>
* README: Remove the comment about --with-moonlight being pre-alpha.
2009-03-10 Atsushi Enomoto <[email protected]>
* scripts/Makefile.am : added svcutil.
2009-02-26 Marek Habersack <[email protected]>
* data/mono.web.pc.in: added. Fixes bug #479760
* data/Makefile.am: added mono.pc{.in} wherever necessary
2009-02-07 Gonzalo Paniagua Javier <[email protected]>
* configure.in: include stdio so that NULL is defined when checking
for ifreq.
2009-02-06 Miguel De Icaza <[email protected]>
* Disable parallel marking on OSX as it hangs during collections
in the bootstrap stage of Mono.
As we find more platforms that hang, we should disable it there as
well.
2009-02-03 Miguel de Icaza <[email protected]>
* configure.in (PLATFORM_NO_SYMLINKS): New define that replaces
PLATFORM_WIN32.
2009-02-02 Rodrigo Kumpera <[email protected]>
* configure.in: Add --with-mcs-docs to make it possible to disable building of documentation under mcs.
2009-01-29 Zoltan Varga <[email protected]>
* configure.in: Remove -Wcast-align from the warning list, it leads to a lot of
useless warnings which can only be fixed by casting a pointer to (void*).
2009-01-29 Miguel de Icaza <[email protected]>
* configure.in: Add a couple of new AM conditionals for POSIX and
DARWIN, these are used to conditionally include some files in
mono/mini.
2009-01-27 Jb Evain <[email protected]>
* configure.in: bump Mono's version to 2.5 now that 2.4
has been branched.
2009-01-25 Zoltan Varga <[email protected]>
* acinclude.m4 (dolt_supported): Handle ARM as well.
2009-01-23 Zoltan Varga <[email protected]>
* configure.in: Make --enable-parallel-mark=yes the default.
2009-01-17 Zoltan Varga <[email protected]>
* configure.in: Complete the OPROFILE checks.
2009-01-16 Zoltan Varga <[email protected]>
* configure.in: Avoid error messages in the quiet code if libgc/Makefile
does not exist yet. Fixes #466814.
2009-01-09 Zoltan Varga <[email protected]>
* configure.in: Check for the existence of the gettext executables.
2008-01-08 Christian Prochnow <[email protected]>
* configure.in: Check for sys/statfs.h and sys/mount.h
2009-01-07 Geoff Norton <[email protected]>
* configure.in: Provide platform information to the mcs build tree
2009-01-06 Jb Evain <[email protected]>
* scripts/Makefile.am: don't generate a script for the now
dead mono-api-diff.
2008-12-05 Jonathan Pryor <[email protected]>
* scripts/mdassembler, scripts/monodocer, scripts/monodocs2html:
Properly quote parameters as they may contain spaces.
2008-12-05 Jonathan Pryor <[email protected]>
* man/mdoc-update.1: Document -fno-assembly-versions.
2009-01-05 Zoltan Varga <[email protected]>
* configure.in: Disable sigaltstack on freebsd as it doesn't seem to work.
2008-12-16 Marek Habersack <[email protected]>
* data/system.web.extensions.design_1.0.pc.in: added
* data/Makefile.am (EXTRA_DIST): added
system.web.extensions.design_1.0.pc.in. Also added to
pkgconfig_DATA
* configure.in: added data/system.web.extensions_1.0.pc to
AC_OUTPUT
2008-12-16 Bill Holmes <[email protected]>
* winconfig.h : Defining the SIZEOF_REGISTER variable for the MSVC builds.
Code is contributed under MIT/X11 license.
2008-12-15 Marek Habersack <[email protected]>
* data/Makefile.am (EXTRA_DIST): added
@@ -366,62 +16,11 @@
* configure.in: added data/system.web.extensions_1.0.pc to AC_OUTPUT
2008-12-11 Mark Mason <[email protected]>
* configure.in: introduce SIZEOF_REGISTER - usually ==SIZEOF_VOID_P, except on mips/n32
2008-12-05 Marek Habersack <[email protected]>
* configure.in: check whether round (3) and rint (3) are present
in the C library.
2008-12-05 Jonathan Pryor <[email protected]>
* man/mdoc-update.1: Document new parameters such as --exceptions.
2008-12-04 Mark Probst <[email protected]>
* configure.in: Disabling the sibling call optimization doesn't
work, so we're using -mminimal-toc.
2008-12-03 Mark Probst <[email protected]>
* configure.in: Disable sibling call optimization on PPC64 as it
seems to trip up GCC on the build bot.
2008-11-28 Atsushi Enomoto <[email protected]>
* data/mono-nunit.pc.in : add new 2.4.8 files.
2008-11-21 Jb Evain <[email protected]>
* scripts/Makefile.am: use only one mono-api-info pointing to the cecil one
which is mscorlib agnostic.
2008-11-21 Zoltan Varga <[email protected]>
* configure.in: Only enable AOT on linux. Fixes #447265.
2008-11-19 Jonathan Pryor <[email protected]>
* configure.in: Remove mono/monoburg/Makefile; fixes the build.
2008-11-14 Andreas Färber <[email protected]>
* configure.in: Add preprocessor defines for ppc(64).
Suggested by Paolo and Mark.
Contributed under MIT/X11 license.
2008-11-12 Zoltan Varga <[email protected]>
* configure.in: Add an ENABLE_AOT variable to config.make, currently only
enabled for AMD64.
2008-11-11 Zoltan Varga <[email protected]>
* configure.in: Bump version to 2.3.
Mon Nov 10 17:37:08 CET 2008 Paolo Molaro <[email protected]>
* configure.in: check for sys/user.h and struct kinfo_proc members.
+2 -2
View File
@@ -37,8 +37,8 @@ For comments, corrections and updates, please contact [email protected]
We consider non-LGPL use instances where you use this on an
embedded system where the end user is not able to upgrade the
Mono VM or Moonlight installation or distribution that is part
of your product (Section 6 and 7), you would have to obtain a
Moonlight installation or distribution that is part of your
product (Section 6 and 7), you would have to obtain a
commercial license from Novell (consider software burned into
a ROM, systems where end users would not be able to upgrade,
an embedded console, a game console that imposes limitations
+6 -39
View File
@@ -1,13 +1,13 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I .
SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc $(docs_dir)
SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc docs
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc docs
EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs
EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in dtrace-prelink.sh build-mingw32.sh LICENSE mkinstalldirs
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
@@ -35,7 +35,9 @@ get-monolite-latest:
cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
cd $(mcslib) && mv -f monolite-* monolite
compiler-tests: build-test-mono-mcs-moon
compiler-tests: mcs-do-clean
$(MAKE) all
$(MAKE) mcs-do-compiler-tests
compiler-tests-net_2_0:
-rm -f $(mcs_topdir)/build/common/Consts.cs.save
@@ -44,7 +46,7 @@ compiler-tests-net_2_0:
cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 clean
-mv -f $(mcs_topdir)/build/common/Consts.cs.save $(mcs_topdir)/build/common/Consts.cs
$(MAKE) all
$(MAKE) test_profiles=net_2_0 mcs-do-compiler-tests
$(MAKE) build_profiles=net_2_0 mcs-do-compiler-tests
bootstrap-world: compiler-tests
$(MAKE) install
@@ -53,18 +55,6 @@ bootstrap-world-net_2_0: compiler-tests-net_2_0
$(MAKE) install
# internal targets
.PHONY: build-test-mono-mcs-moon
build-test-mono-mcs-moon: do-build-moon-maybe
$(MAKE) mcs-do-compiler-tests
.PHONY: do-build-mono-mcs
do-build-mono-mcs: mcs-do-clean
$(MAKE) all
.PHONY: do-build-moon-maybe
do-build-moon-maybe: do-build-mono-mcs
cd runtime && $(MAKE) moon-do-build
mcs-do-clean:
cd runtime && $(MAKE) clean-local
cd mono/tests && $(MAKE) clean
@@ -96,26 +86,3 @@ bootstrap: all
patch-quiet:
find mono -name Makefile -exec scripts/patch-quiet.sh {} \;
find libgc -name Makefile -exec scripts/patch-quiet.sh {} \;
update-csproj:
-rm msvc/scripts/order
-mkdir msvc/scripts/inputs
(cd runtime; make V=1 extra_targets=csproj-local)
package-inputs:
echo '<?xml version="1.0" encoding="utf-8"?>' > msvc/scripts/order.xml
echo '<root>' >> msvc/scripts/order.xml
for i in `cat msvc/scripts/order`; do \
set `echo $$i | sed -e 's/:/ /' -e 's/.input//'`; \
cat msvc/scripts/inputs/$$2.input | \
(echo " <project dir=\"$$1\" library=\"$$2\">"; \
read boot; echo " <boot>$$boot</boot>"; \
read mcs; echo " <mcs>$$mcs</mcs>"; \
read flags; echo " <flags>$$flags</flags>"; \
read output; echo " <output>$$output</output>"; \
read built; echo " <built_sources>$$built</built_sources>"; \
read libou; echo " <library_output>$$libou</library_output>"; \
read resp; echo " <response>$$resp</response>"; \
echo " </project>") >> msvc/scripts/order.xml; \
done
echo "</root>" >> msvc/scripts/order.xml
+7 -28
View File
@@ -267,12 +267,10 @@ This is Mono.
This defaults to `yes'.
--with-profile2=yes,no
--with-preview=yes,no
Whether you want to build the 2.x libraries (support
for Generics and the 2.0/3.5 APIS).
It defaults to `yes'.
Whether you want to build libraries that are still not
completed (The 2.0 APIs). It defaults to `yes'.
--with-moonlight=yes,no
@@ -281,10 +279,12 @@ This is Mono.
(1.1 and 2.0 APIs).
This will produce the `smcs' compiler which will reference
the Silverlight modified assemblies (mscorlib.dll,
the Silvelright modified assemblies (mscorlib.dll,
System.dll, System.Code.dll and System.Xml.Core.dll) and turn
on the LINQ extensions for the compiler.
This option defaults to `no' and it is considered pre-alpha.
--with-libgdiplus=installed,sibling,<path>
This is used to configure where should Mono look for
@@ -324,11 +324,6 @@ This is Mono.
Disables support for the Ahead of Time
compilation.
attach:
Support for the Mono.Management assembly and the
VMAttach API (allowing code to be injected into
a target VM)
com:
Disables COM support.
@@ -338,12 +333,6 @@ This is Mono.
decimal:
Disables support for System.Decimal.
full_messages:
By default Mono comes with a full table
of messages for error codes. This feature
turns off uncommon error messages and reduces
the runtime size.
generics:
Generics support. Disabling this will not
allow Mono to run any 2.0 libraries or
@@ -366,11 +355,6 @@ This is Mono.
disabling this will drop support for any
libraries using DllImport.
portability:
Removes support for MONO_IOMAP, the environment
variables for simplifying porting applications that
are case-insensitive and that mix the Unix and Windows path separators.
profiler:
Disables support for the default profiler.
@@ -382,11 +366,6 @@ This is Mono.
assemblies (AssemblyBuilderAccess.Save) in
System.Reflection.Emit.
shadow_copy:
Disables support for AppDomain's shadow copies
(you can disable this if you do not plan on
using appdomains).
simd:
Disables support for the Mono.SIMD intrinsics
library.
@@ -521,5 +500,5 @@ This is Mono.
If the directory ../olive is present (as an
independent checkout) from the Mono module, that
directory is automatically configured to share the
same prefix than this module gets.
same prefix than this module gets
+2 -2
View File
@@ -22,8 +22,8 @@ if test x$GCC != xyes; then
dolt_supported=no
fi
case $host in
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*)
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*)
pic_options='-fPIC'
;;
i?86-apple-darwin*)
+64
View File
@@ -0,0 +1,64 @@
#!/bin/sh
ASPEN_ROOT=/Developer/Platforms/iPhoneOS.platform/Developer
ASPEN_SDK=$ASPEN_ROOT/SDKs/iPhoneOS2.0.sdk/
ORIG_PATH=$PATH
GLIB_FLAGS=`pkg-config --cflags --libs glib-2.0`
if [ -z "$GLIB_FLAGS" ]; then
echo "pkg-config could not locate glib-2.0 needed for the monoburg step"
exit;
fi
setenv () {
export PATH=$ASPEN_ROOT/usr/bin:$PATH
export C_INCLUDE_PATH="$ASPEN_SDK/usr/lib/gcc/arm-apple-darwin9/4.0.1/include:$ASPEN_SDK/usr/include"
export CPLUS_INCLUDE_PATH="$ASPEN_SDK/usr/lib/gcc/arm-apple-darwin9/4.0.1/include:$ASPEN_SDK/usr/include"
export CC=arm-apple-darwin9-gcc-4.0.1
export CXX=arm-apple-darwin9-g++-4.0.1
export CPP="cpp-4.0 -nostdinc -U__powerpc__ -U__i386__ -D__arm__"
export CXXPP="cpp-4.0 -nostdinc -U__powerpc__ -U__i386__ -D__arm__"
export LD=$CC
export LDFLAGS="-liconv -Wl,-syslibroot,$ASPEN_SDK"
}
unsetenv () {
export PATH=$ORIG_PATH
unset C_INCLUDE_PATH
unset CPLUS_INCLUDE_PATH
unset CC
unset CXX
unset CPP
unset CXXPP
unset LD
unset LDFLAGS
}
export mono_cv_uscore=yes
export cv_mono_sizeof_sunpath=104
export ac_cv_func_posix_getpwuid_r=yes
export ac_cv_func_backtrace_symbols=no
setenv
pushd eglib
./autogen.sh --host=arm-apple-darwin9
popd
./autogen.sh --disable-mcs-build --host=arm-apple-darwin9 --disable-shared-handles --with-tls=pthread --with-sigaltstack=no --with-glib=embedded $@
perl -pi -e 's/MONO_SIZEOF_SUNPATH 0/MONO_SIZEOF_SUNPATH 104/' config.h
perl -pi -e 's/#define HAVE_FINITE 1//' config.h
perl -pi -e 's/#define HAVE_MMAP 1//' config.h
make
unsetenv
pushd mono/monoburg
/usr/bin/gcc -o monoburg ./monoburg.c parser.c -I../.. -pthread -lm $GLIB_FLAGS
make
popd
setenv
make
+85 -332
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,2.5)
AM_INIT_AUTOMAKE(mono,2.2)
AM_MAINTAINER_MODE
API_VER=1.0
@@ -64,22 +64,10 @@ need_link_unlink=no
AC_MSG_CHECKING([host platform characteristics])
libgc_threads=no
has_dtrace=no
parallel_mark=yes
case "$host" in
powerpc*-*-linux*)
# https://bugzilla.novell.com/show_bug.cgi?id=504411
disable_munmap=yes
;;
esac
case "$host" in
*-*-mingw*|*-*-cygwin*)
platform_win32=yes
AC_DEFINE(PLATFORM_WIN32,1,[Host Platform is Win32])
AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32])
AC_DEFINE(DISABLE_PORTABILITY,1,[Disable the io-portability layer])
AC_DEFINE(PLATFORM_NO_SYMLINKS,1,[This platform does not support symlinks])
AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
if test "x$cross_compiling" = "xno"; then
CC="gcc -mno-cygwin -g"
# So libgc configure gets -mno-cygwin
@@ -109,7 +97,6 @@ case "$host" in
libdl="-ldl"
libgc_threads=pthreads
with_sigaltstack=no
use_sigposix=yes
;;
*-*-*freebsd*)
platform_win32=no
@@ -138,11 +125,10 @@ case "$host" in
# but NOT library support)
#
with_tls=pthread
use_sigposix=yes
;;
*-*-*openbsd*)
platform_win32=no
CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS -DPLATFORM_BSD"
CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
libmono_cflags="-D_THREAD_SAFE"
LDFLAGS="$LDFLAGS -pthread"
libmono_ldflags="-pthread"
@@ -150,23 +136,17 @@ case "$host" in
AC_DEFINE(PTHREAD_POINTER_ID)
libdl=
libgc_threads=pthreads
use_sigposix=yes
;;
*-*-linux*)
platform_win32=no
CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
if test "x$disable_munmap" != "xyes"; then
CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
fi
CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP"
libmono_cflags="-D_REENTRANT"
libmono_ldflags="-lpthread"
libdl="-ldl"
libgc_threads=pthreads
AOT_SUPPORTED="yes"
use_sigposix=yes
;;
*-*-hpux*)
platform_win32=no
platform_win32=no
CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT"
# +ESdbgasm only valid on bundled cc on RISC
# silently ignored for ia64
@@ -182,7 +162,6 @@ case "$host" in
libmono_ldflags="-lpthread"
libgc_threads=pthreads
need_link_unlink=yes
use_sigposix=yes
;;
*-*-solaris*)
platform_win32=no
@@ -193,12 +172,9 @@ case "$host" in
# This doesn't seem to work on solaris/x86, but the configure test runs
with_tls=pthread
has_dtrace=yes
use_sigposix=yes
;;
*-*-darwin*)
parallel_mark="Disabled_Currently_Hangs_On_MacOSX"
platform_win32=no
platform_darwin=yes
CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
libmono_cflags="-D_THREAD_SAFE"
@@ -229,13 +205,9 @@ fi
AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux)
AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
AC_CHECK_TOOL(CC, gcc, gcc)
AC_PROG_CC
# Disabled for now to fix the windows build
#AC_PROG_CXX
AM_PROG_AS
AM_PROG_CC_STDC
AC_PROG_INSTALL
@@ -293,9 +265,8 @@ fi
AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h)
AC_CHECK_HEADERS(sys/user.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h)
AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h)
AC_CHECK_HEADERS(sys/user.h)
AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
if test x$have_zlib = xyes; then
@@ -349,7 +320,7 @@ AC_CHECK_SIZEOF(void *, 4)
WARN=''
if test x"$GCC" = xyes; then
WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings'
WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
# The runtime code does not respect ANSI C strict aliasing rules
CFLAGS="$CFLAGS -fno-strict-aliasing"
@@ -387,19 +358,13 @@ fi
# A sanity check to catch cases where the package was unpacked
# with an ancient tar program (Solaris)
#
AC_ARG_ENABLE(solaris-tar-check,
[ --disable-solaris-tar-check disable solaris tar check],
do_solaris_tar_check=no, do_solaris_tar_check=yes)
if test x"$do_solaris_tar_check" = xyes; then
AC_MSG_CHECKING(integrity of package)
if test -f $srcdir/$mcsdir/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
then
AC_MSG_RESULT(ok)
else
errorm="Your mono distribution is incomplete; if unpacking from a tar file, make sure you use GNU tar; see http://www.mono-project.com/IncompletePackage for more details"
AC_MSG_ERROR([$errorm])
fi
AC_MSG_CHECKING(integrity of package)
if test -f $srcdir/$mcsdir/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
then
AC_MSG_RESULT(ok)
else
errorm="Your mono distribution is incomplete; if unpacking from a tar file, make sure you use GNU tar; see http://www.mono-project.com/IncompletePackage for more details"
AC_MSG_ERROR([$errorm])
fi
mcs_topdir='$(top_srcdir)/'$mcsdir
@@ -426,16 +391,8 @@ fi
# we do not configure the full gettext, as we consume it dynamically from C#
AM_PO_SUBDIRS
if test "x$USE_NLS" = "xyes"; then
AC_CHECK_PROG(HAVE_MSGFMT, msgfmt,yes,no)
if test "x$HAVE_MSGFMT" = "xno"; then
AC_MSG_ERROR([msgfmt not found. You need to install the 'gettext' package, or pass --enable-nls=no to configure.])
fi
fi
AC_ARG_WITH([libgdiplus],
[ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus used for System.Drawing tests (defaults to installed)],
[ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus used for System.Drawing tests (defaults to NO)],
[], [with_libgdiplus=installed])
case $with_libgdiplus in
@@ -452,7 +409,7 @@ if test "x$PKG_CONFIG" = "xno"; then
fi
pkg_config_path=
AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Change pkg-config dir to custom dir],
AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir],
if test x$with_crosspkgdir = "x"; then
if test -s $PKG_CONFIG_PATH; then
pkg_config_path=$PKG_CONFIG_PATH
@@ -465,7 +422,7 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan
)
AC_ARG_WITH([glib],
[ --with-glib=embedded|system Choose glib API: system or embedded (default to system)],
[ --with-glib=embedded|system Choose glib API: system or embedded (default to system)],
[], [with_glib=system])
eglib_dir=
@@ -494,19 +451,14 @@ system)
fi
## Versions of dependencies
GLIB_REQUIRED_VERSION=2.4.0
dnl
dnl No, you will not replace this check with a pkg.m4 check
dnl
if $PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0; then
GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
else
AC_MSG_ERROR([You need at least glib-2.0 $GLIB_REQUIRED_VERSION])
fi
GLIB_REQUIRED_VERSION=1.3.11
PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
;;
*)
AC_MSG_ERROR([Invalid argument to --with-glib.])
@@ -542,17 +494,17 @@ if test x$cross_compiling$platform_win32 = xnoyes; then
AC_MSG_RESULT(ok)
fi
AC_ARG_WITH(gc, [ --with-gc=boehm,included,none Defaults to included],[gc=$with_gc],[gc=$gc_default])
AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
# Enable support for fast thread-local storage
# Some systems have broken support, so we allow to disable it.
AC_ARG_WITH(tls, [ --with-tls=__thread,pthread select Thread Local Storage implementation (defaults to __thread)],[],[with_tls=__thread])
AC_ARG_WITH(tls, [ --with-tls=__thread,pthread select Thread Local Storage implementation],[],[with_tls=__thread])
# Enable support for using sigaltstack for SIGSEGV and stack overflow handling
# This does not work on some platforms (bug #55253)
AC_ARG_WITH(sigaltstack, [ --with-sigaltstack=yes,no enable/disable support for sigaltstack (defaults to yes)],[],[with_sigaltstack=yes])
AC_ARG_WITH(sigaltstack, [ --with-sigaltstack=yes,no enable/disable support for sigaltstack],[],[with_sigaltstack=yes])
AC_ARG_WITH(static_mono, [ --with-static_mono=yes,no link mono statically to libmono (faster) (defaults to yes)],[],[with_static_mono=yes])
AC_ARG_WITH(static_mono, [ --with-static_mono=yes,no link mono statically to libmono (faster)],[],[with_static_mono=yes])
if test "x$enable_static" = "xno"; then
with_static_mono=no
@@ -566,7 +518,7 @@ fi
AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno)
AC_ARG_ENABLE(mcs-build, [ --disable-mcs-build disable the build of the mcs directory], try_mcs_build=$enableval, enable_mcs_build=yes)
AC_ARG_WITH(xen_opt, [ --with-xen_opt=yes,no Enable Xen-specific behaviour (defaults to yes)],[],[with_xen_opt=yes])
AC_ARG_WITH(xen_opt, [ --with-xen_opt=yes,no Enable Xen-specific behaviour],[],[with_xen_opt=yes])
if test "x$with_xen_opt" = "xyes"; then
AC_DEFINE(MONO_XEN_OPT, 1, [Xen-specific behaviour])
ORIG_CFLAGS=$CFLAGS
@@ -584,16 +536,17 @@ if test "x$with_xen_opt" = "xyes"; then
])
fi
AC_ARG_ENABLE(quiet-build, [ --enable-quiet-build Enable quiet runtime build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
AC_ARG_ENABLE(quiet-build, [ --enable-quiet-build Enable quiet runtime build], enable_quiet_build=$enableval, enable_quiet_build=yes)
DISABLED_FEATURES=none
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd.],
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd.],
[
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
eval "mono_feature_disable_$feature='yes'"
AC_MSG_NOTICE([Disabled support for feature: $feature])
done
DISABLED_FEATURES=$enable_minimal
disabled="Disabled: $enable_minimal"
@@ -602,103 +555,67 @@ AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsy
AC_DEFINE_UNQUOTED(DISABLED_FEATURES, "$DISABLED_FEATURES", [String of disabled features])
if test "x$mono_feature_disable_aot" = "xyes"; then
AC_DEFINE(DISABLE_AOT_COMPILER, 1, [Disable AOT Compiler])
AC_MSG_NOTICE([Disabled AOT compiler])
AC_DEFINE(DISABLE_AOT, 1, [Disable AOT support])
fi
if test "x$mono_feature_disable_profiler" = "xyes"; then
AC_DEFINE(DISABLE_PROFILER, 1, [Disable default profiler support])
AC_MSG_NOTICE([Disabled support for the profiler])
fi
AM_CONDITIONAL(DISABLE_PROFILER, test x$mono_feature_disable_profiler = xyes)
if test "x$mono_feature_disable_decimal" = "xyes"; then
AC_DEFINE(DISABLE_DECIMAL, 1, [Disable System.Decimal support])
AC_MSG_NOTICE([Disabled support for decimal])
fi
if test "x$mono_feature_disable_pinvoke" = "xyes"; then
AC_DEFINE(DISABLE_PINVOKE, 1, [Disable P/Invoke support])
AC_MSG_NOTICE([Disabled support for P/Invoke])
fi
if test "x$mono_feature_disable_debug" = "xyes"; then
AC_DEFINE(DISABLE_DEBUG, 1, [Disable runtime debugging support])
AC_MSG_NOTICE([Disabled support for runtime debugging])
fi
if test "x$mono_feature_disable_reflection_emit" = "xyes"; then
AC_DEFINE(DISABLE_REFLECTION_EMIT, 1, [Disable reflection emit support])
mono_feature_disable_reflection_emit_save=yes
AC_MSG_NOTICE([Disabled support for Reflection.Emit])
fi
if test "x$mono_feature_disable_reflection_emit_save" = "xyes"; then
AC_DEFINE(DISABLE_REFLECTION_EMIT_SAVE, 1, [Disable assembly saving support in reflection emit])
AC_MSG_NOTICE([Disabled support for Reflection.Emit.Save])
fi
if test "x$mono_feature_disable_large_code" = "xyes"; then
AC_DEFINE(DISABLE_LARGE_CODE, 1, [Disable support for huge assemblies])
AC_MSG_NOTICE([Disabled support for large assemblies])
fi
if test "x$mono_feature_disable_logging" = "xyes"; then
AC_DEFINE(DISABLE_LOGGING, 1, [Disable support debug logging])
AC_MSG_NOTICE([Disabled support for logging])
fi
if test "x$mono_feature_disable_com" = "xyes"; then
AC_DEFINE(DISABLE_COM, 1, [Disable COM support])
AC_MSG_NOTICE([Disabled COM support])
fi
if test "x$mono_feature_disable_ssa" = "xyes"; then
AC_DEFINE(DISABLE_SSA, 1, [Disable advanced SSA JIT optimizations])
AC_MSG_NOTICE([Disabled SSA JIT optimizations])
fi
if test "x$mono_feature_disable_generics" = "xyes"; then
AC_DEFINE(DISABLE_GENERICS, 1, [Disable generics support])
AC_MSG_NOTICE([Disabled Generics Support])
fi
if test "x$mono_feature_disable_shadowcopy" = "xyes"; then
AC_DEFINE(DISABLE_SHADOW_COPY, 1, [Disable Shadow Copy for AppDomains])
AC_MSG_NOTICE([Disabled Shadow copy for AppDomains])
fi
if test "x$mono_feature_disable_portability" = "xyes"; then
AC_DEFINE(DISABLE_PORTABILITY, 1, [Disables the IO portability layer])
AC_MSG_NOTICE([Disabled IO Portability layer])
fi
if test "x$mono_feature_disable_attach" = "xyes"; then
AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support])
AC_MSG_NOTICE([Disabled agent attach])
fi
if test "x$mono_feature_disable_full_messages" = "xyes"; then
AC_DEFINE(DISABLE_FULL_MESSAGES, 1, [Disables building in the full table of WAPI messages])
AC_MSG_NOTICE([Disabled full messages for Win32 errors, only core message strings shipped])
fi
if test "x$mono_feature_disable_verifier" = "xyes"; then
AC_DEFINE(DISABLE_VERIFIER, 1, [Disables the verifier])
AC_MSG_NOTICE([Disabled the metadata and IL verifiers])
fi
if test "x$mono_feature_disable_jit" = "xyes"; then
AC_DEFINE(DISABLE_JIT, 1, [Disable the JIT, only full-aot mode will be supported by the runtime.])
AC_MSG_NOTICE([Disabled the JIT engine, only full AOT will be supported])
fi
AM_CONDITIONAL(DISABLE_JIT, test x$mono_feature_disable_jit = xyes)
if test "x$mono_feature_disable_simd" = "xyes"; then
AC_DEFINE(DISABLE_SIMD, 1, [Disable SIMD intrinsics related optimizations.])
AC_MSG_NOTICE([Disabled SIMD support])
fi
AC_MSG_CHECKING(for visibility __attribute__)
@@ -713,7 +630,7 @@ AC_TRY_COMPILE([], [
AC_MSG_RESULT(no)
])
AC_ARG_ENABLE(parallel-mark, [ --enable-parallel-mark Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=$parallel_mark)
AC_ARG_ENABLE(parallel-mark, [ --enable-parallel-mark Enables GC Parallel Marking])
if test x$enable_parallel_mark = xyes; then
libgc_configure_args="$libgc_configure_args --enable-parallel-mark"
fi
@@ -799,7 +716,7 @@ case "x$gc" in
;;
esac
AC_ARG_WITH(large-heap, [ --with-large-heap=yes,no Enable support for GC heaps larger than 3GB (defaults to no)], [large_heap=$withval], [large_heap=no])
AC_ARG_WITH(large-heap, [ --with-large-heap=yes,no Enable support for GC heaps larger than 3GB], [large_heap=$withval], [large_heap=no])
if test "x$large_heap" = "xyes"; then
echo "FOO"
CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
@@ -858,7 +775,7 @@ if test x$platform_win32 = xno; then
dnl ******************************************************************
dnl *** Checks for the IKVM JNI interface library ***
dnl ******************************************************************
AC_ARG_WITH(ikvm-native, [ --with-ikvm-native=yes,no build the IKVM JNI interface library (defaults to yes)],[with_ikvm_native=$withval],[with_ikvm_native=yes])
AC_ARG_WITH(ikvm-native, [ --with-ikvm-native=yes,no build the IKVM JNI interface library],[with_ikvm_native=$withval],[with_ikvm_native=yes])
ikvm_native_dir=
if test x$with_ikvm_native = xyes; then
@@ -1196,15 +1113,9 @@ if test x$platform_win32 = xno; then
AC_DEFINE(USE_MONO_MUTEX, 1, [Use mono_mutex_t])
])
AC_CHECK_FUNCS(pthread_attr_setstacksize)
AC_CHECK_FUNCS(pthread_attr_getstack pthread_attr_getstacksize)
AC_CHECK_FUNCS(pthread_attr_getstack)
AC_CHECK_FUNCS(pthread_get_stacksize_np pthread_get_stackaddr_np)
dnl ***********************************
dnl *** Checks for signals
dnl ***********************************
AC_CHECK_HEADERS(signal.h)
AC_CHECK_FUNCS(sigaction)
dnl ***********************************
dnl *** Checks for working __thread ***
dnl ***********************************
@@ -1440,7 +1351,6 @@ if test x$platform_win32 = xno; then
AC_CHECK_HEADERS(net/if.h)
AC_MSG_CHECKING(for ifreq)
AC_TRY_COMPILE([
#include <stdio.h>
#include <sys/ioctl.h>
#include <net/if.h>
], [
@@ -1495,12 +1405,9 @@ if test x$platform_win32 = xno; then
AC_CHECK_HEADERS(sys/extattr.h)
AC_CHECK_HEADERS(sys/sendfile.h)
AC_CHECK_HEADERS(sys/statvfs.h)
AC_CHECK_HEADERS(sys/statfs.h)
AC_CHECK_HEADERS(sys/vfstab.h)
AC_CHECK_HEADERS(sys/xattr.h)
AC_CHECK_HEADERS(sys/mman.h)
AC_CHECK_HEADERS(sys/param.h)
AC_CHECK_HEADERS(sys/mount.h)
AC_CHECK_FUNCS(getdomainname)
AC_CHECK_FUNCS(setdomainname)
AC_CHECK_FUNCS(fgetgrent)
@@ -1685,9 +1592,8 @@ dnl ****************************
AC_MSG_CHECKING([if usage of random device is requested])
AC_ARG_ENABLE(dev-random,
[ --disable-dev-random disable the use of the random device (enabled by default)],
[ --disable-dev-random disable the use of the random device],
try_dev_random=$enableval, try_dev_random=yes)
AC_MSG_RESULT($try_dev_random)
case "{$target}" in
@@ -1760,11 +1666,11 @@ if test x$gc = xsgen; then
fi
fi
AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests Run the nunit tests of the class library on 'make check'])
AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests Run the nunit tests of the class library on 'make check'])
AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
AC_MSG_CHECKING([if big-arrays are to be enabled])
AC_ARG_ENABLE(big-arrays, [ --enable-big-arrays Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
AC_ARG_ENABLE(big-arrays, [ --enable-big-arrays Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
if test "x$enable_big_arrays" = "xyes" ; then
if test "x$ac_cv_sizeof_void_p" = "x8"; then
AC_DEFINE(MONO_BIG_ARRAYS,1,[Enable the allocation and indexing of arrays greater than Int32.MaxValue])
@@ -1788,9 +1694,6 @@ if test "x$enable_dtrace" = "xyes"; then
if test "x$DTRACE" = "xno"; then
AC_MSG_RESULT([dtrace utility not found, dtrace support disabled.])
enable_dtrace=no
elif ! $DTRACE -h $srcdir/data/mono.d > /dev/null 2>&1; then
AC_MSG_RESULT([dtrace doesn't support -h option, dtrace support disabled.])
enable_dtrace=no
fi
fi
@@ -1834,31 +1737,6 @@ fi
AM_CONDITIONAL(ENABLE_DTRACE, [test x$enable_dtrace = xyes])
AM_CONDITIONAL(DTRACE_G_REQUIRED, [test x$dtrace_g = xyes])
dnl **************
dnl *** LLVM ***
dnl **************
AC_ARG_ENABLE(llvm,[ --enable-llvm Enable the experimental LLVM back-end], enable_llvm=$enableval, enable_llvm=no)
if test "x$enable_llvm" = "xyes"; then
AC_PATH_PROG(LLVM_CONFIG, llvm-config, no)
if test "x$LLVM_CONFIG" = "xno"; then
AC_MSG_ERROR([llvm-config not found.])
fi
LLVM_CXXFLAGS=`$LLVM_CONFIG --cflags`
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit x86codegen`
LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
AC_SUBST(LLVM_CXXFLAGS)
AC_SUBST(LLVM_LIBS)
AC_SUBST(LLVM_LDFLAGS)
AC_DEFINE(ENABLE_LLVM, 1, [Enable the LLVM back end])
fi
AM_CONDITIONAL(ENABLE_LLVM, [test x$enable_llvm = xyes])
TARGET="unknown"
ACCESS_UNALIGNED="yes"
@@ -1870,8 +1748,6 @@ SQLITE="libsqlite.so.0"
SQLITE3="libsqlite3.so.0"
X11="libX11.so"
sizeof_register="SIZEOF_VOID_P"
jit_wanted=false
interp_wanted=false
case "$host" in
@@ -1885,20 +1761,6 @@ case "$host" in
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
jit_wanted=true
AC_MSG_CHECKING(for mips n32)
AC_TRY_COMPILE([], [
void main () {
#if _MIPS_SIM != _ABIN32
#error Not mips n32
#endif
}
],[
AC_MSG_RESULT(yes)
sizeof_register=8
],[
AC_MSG_RESULT(no)
])
;;
i*86-*-*)
TARGET=X86;
@@ -2007,11 +1869,8 @@ case "$host" in
powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* )
if test "x$ac_cv_sizeof_void_p" = "x8"; then
TARGET=POWERPC64;
CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__"
CFLAGS="$CFLAGS -mminimal-toc"
else
TARGET=POWERPC;
CPPFLAGS="$CPPFLAGS -D__mono_ppc__"
fi
AC_DEFINE(MONO_ARCH_REGPARMS,1,[Architecture uses registers for Parameters])
arch_target=ppc;
@@ -2054,47 +1913,11 @@ case "$host" in
;;
esac
# FIXME: Define the others as well
case "$TARGET" in
X86)
AC_DEFINE(TARGET_X86, 1, [...])
;;
AMD64)
AC_DEFINE(TARGET_AMD64, 1, [...])
;;
ARM)
AC_DEFINE(TARGET_ARM, 1, [...])
;;
POWERPC)
AC_DEFINE(TARGET_POWERPC, 1, [...])
;;
POWERPC64)
AC_DEFINE(TARGET_POWERPC, 1, [...])
AC_DEFINE(TARGET_POWERPC64, 1, [...])
;;
esac
if test "x$sizeof_register" = "x4"; then
AC_DEFINE(SIZEOF_REGISTER,4,[size of machine integer registers])
elif test "x$sizeof_register" = "x8"; then
AC_DEFINE(SIZEOF_REGISTER,8,[size of machine integer registers])
else
AC_DEFINE(SIZEOF_REGISTER,SIZEOF_VOID_P,[size of machine integer registers])
fi
if test "x$target_byte_order" = "xG_BIG_ENDIAN"; then
AC_DEFINE(TARGET_BYTE_ORDER,G_BIG_ENDIAN,[byte order of target])
elif test "x$target_byte_order" = "xG_LITTLE_ENDIAN"; then
AC_DEFINE(TARGET_BYTE_ORDER,G_LITTLE_ENDIAN,[byte order of target])
else
AC_DEFINE(TARGET_BYTE_ORDER,G_BYTE_ORDER,[byte order of target])
fi
if test "x$have_visibility_hidden" = "xyes"; then
AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute])
fi
AC_ARG_WITH(jit, [ --with-jit=yes,no If you want to build scripts that default to the JIT (defaults to no)],[
AC_ARG_WITH(jit, [ --with-jit=yes,no If you want to build scripts that default to the JIT],[
if test x$withval = xyes; then
jit_wanted=true
else
@@ -2102,7 +1925,7 @@ AC_ARG_WITH(jit, [ --with-jit=yes,no If you want to build scripts
fi
])
AC_ARG_WITH(interp, [ --with-interp=yes,no If you want to build scripts that default to the interpreter (defaults to no)],[
AC_ARG_WITH(interp, [ --with-interp=yes,no If you want to build scripts that default to the interpreter],[
if test x$withval = xyes; then
interp_wanted=true
else
@@ -2204,9 +2027,6 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86" -o "x$TARGET" = "xALPHA"; t
*-*-*linux*)
mono_debugger_supported=yes
;;
*86-apple-darwin*)
mono_debugger_supported=yes
;;
esac
fi
fi
@@ -2274,62 +2094,46 @@ case "x$gc" in
;;
esac
AC_ARG_WITH(profile2, [ --with-profile2=yes,no If you want to install the 2.0 FX (defaults to yes)], [], [with_profile2=yes])
AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.0 FX (defaults to no)], [], [with_profile4=no])
AC_ARG_WITH(moonlight, [ --with-moonlight=yes,no If you want to build the Moonlight 2.1 assemblies (defaults to yes)], [], [with_moonlight=yes])
AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the raw MonoTouch 2.1 assemblies (defaults to no)], [], [with_monotouch=no])
PREVIEW=yes
AC_ARG_WITH(preview, [ --with-preview=yes,no If you want to install the 2.0 FX preview],[
if test x$with_preview = xno; then
PREVIEW=no
fi
])
MOONLIGHT=yes
AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no If you want to build the Moonlight 2.1 assemblies],[
if test x$with_moonlight = xno; then
MOONLIGHT=no
fi
])
OPROFILE=no
AC_ARG_WITH(oprofile,[ --with-oprofile=no,<oprofile install dir> Enable oprofile support (defaults to no)],[
AC_ARG_WITH(oprofile,[ --with-oprofile=no,<path> Enable oprofile support (defaults to NO)],[
if test x$with_oprofile != xno; then
oprofile_include=$with_oprofile/include
if test ! -f $oprofile_include/opagent.h; then
AC_MSG_ERROR([oprofile include file not found at $oprofile_include/opagent.h])
fi
OPROFILE=yes
OPROFILE_CFLAGS="-I$oprofile_include"
OPROFILE_LIBS="-L$with_oprofile/lib/oprofile -lopagent"
AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
OPROFILE=yes
OPROFILE_CFLAGS="-I$with_oprofile/include"
OPROFILE_LIBS=
AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
fi
])
MALLOC_MEMPOOLS=no
AC_ARG_WITH(malloc_mempools,[ --with-malloc-mempools=yes,no Use malloc for each single mempool allocation (only for runtime debugging, defaults to no)],[
AC_ARG_WITH(malloc_mempools,[ --with-malloc-mempools=yes,no Use malloc for each single mempool allocation (only for runtime debugging, defaults to NO)],[
if test x$with_malloc_mempools = xyes; then
MALLOC_MEMPOOLS=yes
AC_DEFINE(USE_MALLOC_FOR_MEMPOOLS,1,[Use malloc for each single mempool allocation])
fi
])
DISABLE_MCS_DOCS=no
AC_ARG_WITH(mcs_docs,[ --with-mcs-docs=yes,no If you want to build the documentation under mcs (defaults to yes)],[
if test x$with_mcs_docs != xyes; then
DISABLE_MCS_DOCS=yes
fi
])
dnl
dnl Consistency settings
dnl
if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
DISABLE_MCS_DOCS=yes
docs_dir=""
else
docs_dir=docs
fi
AC_SUBST(docs_dir)
AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
AC_SUBST(OPROFILE_CFLAGS)
AC_SUBST(OPROFILE_LIBS)
libmono_ldflags="$libmono_ldflags $LIBS"
AM_CONDITIONAL(INSTALL_2_0, [test "x$with_profile2" = xyes])
AM_CONDITIONAL(INSTALL_2_1, [test "x$with_moonlight" = xyes])
AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" = xyes])
AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
AM_CONDITIONAL(INSTALL_2_1, test x$MOONLIGHT = xyes)
AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
@@ -2460,37 +2264,9 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
cd $depth
],[LN_S='$LN_S'])
AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/machine.config],
[ depth=../../../..
case $srcdir in
[[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
.) reldir=$depth ;;
*) reldir=$depth/$srcdir ;;
esac
$ac_aux_dir/install-sh -d runtime/etc/mono/4.0
cd runtime/etc/mono/4.0
rm -f machine.config
$LN_S $reldir/data/net_4_0/machine.config machine.config
cd $depth
],[LN_S='$LN_S'])
AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/web.config],
[ depth=../../../..
case $srcdir in
[[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
.) reldir=$depth ;;
*) reldir=$depth/$srcdir ;;
esac
$ac_aux_dir/install-sh -d runtime/etc/mono/4.0
cd runtime/etc/mono/4.0
rm -f web.config
$LN_S $reldir/data/net_4_0/web.config web.config
cd $depth
],[LN_S='$LN_S'])
if test x$enable_quiet_build = xyes; then
AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/scripts/patch-quiet.sh $i; fi; done], [shell=$SHELL])
AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do $srcdir/scripts/patch-quiet.sh $i; done], [shell=$SHELL])
AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
fi
AC_OUTPUT([
@@ -2504,6 +2280,7 @@ mono/metadata/Makefile
mono/dis/Makefile
mono/cil/Makefile
mono/arch/Makefile
mono/os/Makefile
mono/arch/x86/Makefile
mono/arch/amd64/Makefile
mono/arch/hppa/Makefile
@@ -2526,6 +2303,7 @@ mono/tests/cas/inheritance/Makefile
mono/tests/cas/linkdemand/Makefile
mono/tests/cas/threads/Makefile
mono/benchmark/Makefile
mono/monoburg/Makefile
mono/monograph/Makefile
mono/io-layer/Makefile
mono/mini/Makefile
@@ -2538,7 +2316,6 @@ docs/Makefile
data/Makefile
data/net_1_1/Makefile
data/net_2_0/Makefile
data/net_4_0/Makefile
data/net_2_0/Browsers/Makefile
data/mint.pc
data/mono.pc
@@ -2547,14 +2324,13 @@ data/mono-nunit.pc
data/mono-options.pc
data/mono-lineeditor.pc
data/monodoc.pc
data/mono.web.pc
data/dotnet.pc
data/dotnet35.pc
data/wcf.pc
data/cecil.pc
data/smcs.pc
data/system.web.extensions_1.0.pc
data/system.web.extensions.design_1.0.pc
data/system.web.mvc.pc
samples/Makefile
support/Makefile
data/config
@@ -2617,14 +2393,6 @@ fi
echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make
fi
if test x$platform_darwin = xyes; then
echo "PLATFORM = darwin" >> $srcdir/$mcsdir/build/config.make
fi
if test x$TARGET = xAMD64 -a x$platform_win32 = xno -a "x$AOT_SUPPORTED" = "xyes"; then
echo "ENABLE_AOT = 1" >> $srcdir/$mcsdir/build/config.make
fi
# if we have an olive folder, override the default settings
if test -d $olivedir; then
@@ -2637,15 +2405,11 @@ fi
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
if test x$with_moonlight = xyes; then
if test x$with_moonlight = xyes; then
echo "WITH_MOONLIGHT = yes" >> $srcdir/$olivedir/build/config.make
fi
fi
fi
if test x$DISABLE_MCS_DOCS = xyes; then
echo "DISABLE_MCS_DOCS = yes" >> $srcdir/$mcsdir/build/config.make
fi
)
libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
@@ -2654,28 +2418,23 @@ echo "
mcs source: $mcs_topdir
olive source: $olive_topdir
GC: $gc
GLIB: $with_glib
TLS: $with_tls
SIGALTSTACK: $with_sigaltstack
Engine: $jit_status
2.0 Profile: $with_profile2
Moon Profile: $with_moonlight
4.0 Alpha: $with_profile4
MonoTouch: $with_monotouch
JNI support: $jdk_headers_found
libgdiplus: $libgdiplus_msg
zlib: $zlib_msg
oprofile: $OPROFILE
BigArrays: $enable_big_arrays
DTrace: $enable_dtrace
Parallel Mark: $enable_parallel_mark
LLVM Back End: $enable_llvm
GC: $gc
TLS: $with_tls
SIGALTSTACK: $with_sigaltstack
Engine: $jit_status
2.0 Beta: $PREVIEW
2.1 Alpha: $MOONLIGHT
JNI support: $jdk_headers_found
libgdiplus: $libgdiplus_msg
zlib: $zlib_msg
oprofile: $OPROFILE
BigArrays: $enable_big_arrays
DTrace: $enable_dtrace
$disabled
"
if test x$with_static_mono = xno -a "x$platform_win32" != "xyes"; then
AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexpected bugs)
AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexepcted bugs)
fi
if test x$gc = xsgen; then
@@ -2686,9 +2445,3 @@ if test x$gc = xsgen; then
echo IMPORTANT:
echo IMPORTANT: There are known problems with it, use at your own risk.
fi
if test x$enable_llvm = xyes; then
echo IMPORTANT:
echo IMPORTANT: The LLVM Back End is experimental and does not work yet.
echo IMPORTANT:
fi
-5
View File
@@ -1,5 +0,0 @@
/Makefile.in
/Makefile
/config
/.cvsignore
/*.pc
+9 -14
View File
@@ -1,35 +1,30 @@
SUBDIRS = net_1_1 net_2_0
if INSTALL_4_0
SUBDIRS += net_4_0
endif
monodir = $(sysconfdir)/mono
EXTRA_DIST = \
config.in \
browscap.ini mono.supp mono.d README \
mono.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \
mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in \
mono-lineeditor.pc.in system.web.extensions_1.0.pc.in system.web.extensions.design_1.0.pc.in\
dtrace-prelink.sh mono.web.pc.in system.web.mvc.pc.in
mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in smcs.pc.in \
mono-lineeditor.pc.in system.web.extensions_1.0.pc.in system.web.extensions.design_1.0.pc.in
pkgconfigdir = $(libdir)/pkgconfig
if JIT_SUPPORTED
if INTERP_SUPPORTED
pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc
pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc
else
pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc
pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc
endif
else
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc
endif
DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc
DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc
mono_DATA = config \
browscap.ini
+6723 -5094
View File
File diff suppressed because it is too large. Load diff
-1
View File
@@ -17,7 +17,6 @@
<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
<dllmap dll="libX11" target="@X11@" os="!windows" />
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
<dllmap dll="i:kernel32.dll">
<dllentry dll="__Internal" name="CopyMemory" target="mono_win32_compat_CopyMemory"/>
<dllentry dll="__Internal" name="FillMemory" target="mono_win32_compat_FillMemory"/>
-61
View File
@@ -1,61 +0,0 @@
2009-04-14 Zoltan Varga <[email protected]>
* mono-gdb.py (MonoClassPrinter.to_string): Add a MonoClass* pretty
printer.
2009-04-12 Zoltan Varga <[email protected]>
* mono-gdb.py (MonoMethodPrinter.to_string): Add a MonoMethod* pretty
printer.
2009-04-10 Zoltan Varga <[email protected]>
* mono-gdb.py: Update to the latest archer api.
2009-04-07 Zoltan Varga <[email protected]>
* mono-gdb.py (ObjectPrinter.__init__): Update to latest archer api.
2009-04-06 Zoltan Varga <[email protected]>
* test-xdb.py: New file, tester script for xdb.
* mono-gdb.py (stringify_class_name): Handle classes without a namespace
correctly.
* mono-gdb.py: Update after the changes to dwarfwriter.c.
2009-04-05 Zoltan Varga <[email protected]>
* mono-gdb.py: Handle superclasses in the pretty printer.
2009-03-27 Zoltan Varga <[email protected]>
* mono-gdb.py (StringPrinter.to_string): Fix support for non-ascii characters.
2009-03-20 Zoltan Varga <[email protected]>
* mono-gdb.py: Update for the latest python API on the archer branch.
2009-02-03 Zoltan Varga <[email protected]>
* mono-gdb.py: Remove the --64 argument to as, it is not needed.
* mono-gdb.py (stringify_class_name): Helper function to print base types
using their short name. Also add a prototype implementation of registering
the hooks from python code instead of needing the mono-gdbinit file.
* gdb-python.diff: Changes against the gdb archer branch at
http://sourceware.org/gdb/wiki/PythonGdb to fix some problems/add functionality.
2009-02-03 Geoff Norton <[email protected]>
* mono-gdbinit: Hook into backtrace as hook-stop seems to crash gdb
* mono-gdb.py: Find the gdbinit name from the executable name instead of
hardcoding mono
2009-01-29 Zoltan Varga <[email protected]>
* mono-gdb.py mono-gdbinit: Support files to help debugging mono/mono apps
using a python enabled gdb.
-163
View File
@@ -1,163 +0,0 @@
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 640998b..fb73e9d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-03 Zoltan Varga <[email protected]>
+
+ * cil-script.c python/python-cmd.c: Allow registration of pre/post hooks from
+ python.
+
+ * symfile.c (add_symbol_file_command): Comment out verbose messages.
+
2009-02-03 Thiago Jung Bauermann <[email protected]>
* gdb/c-lang.c (c_get_string): Remove superfluous parenthesis from
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 835d29c..3941aa5 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -299,6 +299,13 @@ execute_user_command (struct cmd_list_element *c, char *args)
static int user_call_depth = 0;
extern int max_user_call_depth;
+ /* Might be a user defined command implemented in Python */
+ if (!c->user_commands && c->func)
+ {
+ (*c->func) (c, args, FALSE);
+ return;
+ }
+
old_chain = setup_user_args (args);
cmdlines = c->user_commands;
diff --git a/gdb/python/python-cmd.c b/gdb/python/python-cmd.c
index 61d5e5d..a3fbc08 100644
--- a/gdb/python/python-cmd.c
+++ b/gdb/python/python-cmd.c
@@ -339,7 +339,8 @@ gdbpy_parse_command_name (char *text, struct cmd_list_element ***base_list,
/* Object initializer; sets up gdb-side structures for command.
- Use: __init__(NAME, CMDCLASS, [COMPLETERCLASS, [PREFIX]]).
+ Use: __init__(NAME, CMDCLASS, [completerclass=COMPLETERCLASS, prefix=PREFIX,
+ pre_hook_of=PREHOOK_OF, post_hook_of=POSTHOOK_OF]).
NAME is the name of the command. It may consist of multiple words,
in which case the final word is the name of the new command, and
@@ -354,6 +355,11 @@ gdbpy_parse_command_name (char *text, struct cmd_list_element ***base_list,
If PREFIX is True, then this command is a prefix command.
+ PREHOOK_OF is the name of a gdb command this command becomes a
+ pre-execution hook of, same as if this command was defined using
+ "define hook-<cmdname>"
+ POSTHOOK_OF is the same for post-execution hooks.
+
The documentation for the command is taken from the doc string for
the python class.
@@ -362,15 +368,18 @@ static int
cmdpy_init (PyObject *self, PyObject *args, PyObject *kwds)
{
cmdpy_object *obj = (cmdpy_object *) self;
- char *name;
+ char *name, *pre_hook_of = NULL, *post_hook_of = NULL;
int cmdtype;
int completetype = -1;
char *docstring = NULL;
volatile struct gdb_exception except;
struct cmd_list_element **cmd_list;
+ struct cmd_list_element *pre_hookc = NULL, *post_hookc = NULL;
char *cmd_name, *pfx_name;
PyObject *is_prefix = NULL;
int cmp;
+ static char *kwlist[] = {"name", "cmdclass", "completerclass", "prefix",
+ "pre_hook_of", "post_hook_of", NULL};
if (obj->command)
{
@@ -381,8 +390,9 @@ cmdpy_init (PyObject *self, PyObject *args, PyObject *kwds)
return -1;
}
- if (! PyArg_ParseTuple (args, "si|iO", &name, &cmdtype,
- &completetype, &is_prefix))
+ if (! PyArg_ParseTupleAndKeywords (args, kwds, "si|iOss", kwlist, &name, &cmdtype,
+ &completetype, &is_prefix, &pre_hook_of,
+ &post_hook_of))
return -1;
if (cmdtype != no_class && cmdtype != class_run
@@ -402,6 +412,30 @@ cmdpy_init (PyObject *self, PyObject *args, PyObject *kwds)
return -1;
}
+ if (pre_hook_of)
+ {
+ char *text = pre_hook_of;
+
+ pre_hookc = lookup_cmd_1 (&text, cmdlist, NULL, 1);
+ if (! pre_hookc)
+ {
+ PyErr_Format (PyExc_RuntimeError, _("command name given by pre_hook argument not found"));
+ return -1;
+ }
+ }
+
+ if (post_hook_of)
+ {
+ char *text = post_hook_of;
+
+ post_hookc = lookup_cmd_1 (&text, cmdlist, NULL, 1);
+ if (! post_hookc)
+ {
+ PyErr_Format (PyExc_RuntimeError, _("command name given by post_hook argument not found"));
+ return -1;
+ }
+ }
+
cmd_name = gdbpy_parse_command_name (name, &cmd_list, &cmdlist);
if (! cmd_name)
return -1;
@@ -470,6 +504,18 @@ cmdpy_init (PyObject *self, PyObject *args, PyObject *kwds)
cmd->func = cmdpy_function;
cmd->destroyer = cmdpy_destroyer;
+ if (pre_hookc)
+ {
+ pre_hookc->hook_pre = cmd;
+ cmd->hookee_pre = pre_hookc;
+ }
+
+ if (post_hookc)
+ {
+ post_hookc->hook_post = cmd;
+ cmd->hookee_post = post_hookc;
+ }
+
obj->command = cmd;
set_cmd_context (cmd, self);
set_cmd_completer (cmd, ((completetype == -1) ? cmdpy_completer
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 14cb7b8..6d0bb40 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2196,7 +2196,7 @@ add_symbol_file_command (char *args, int from_tty)
statements because hex_string returns a local static
string. */
- printf_unfiltered (_("add symbol table from file \"%s\" at\n"), filename);
+ /* printf_unfiltered (_("add symbol table from file \"%s\" at\n"), filename); */
section_addrs = alloc_section_addr_info (section_index);
make_cleanup (xfree, section_addrs);
for (i = 0; i < section_index; i++)
@@ -2211,7 +2211,7 @@ add_symbol_file_command (char *args, int from_tty)
entered on the command line. */
section_addrs->other[sec_num].name = sec;
section_addrs->other[sec_num].addr = addr;
- printf_unfiltered ("\t%s_addr = %s\n", sec, paddress (addr));
+ /* printf_unfiltered ("\t%s_addr = %s\n", sec, paddress (addr)); */
sec_num++;
/* The object's sections are initialized when a
-247
View File
@@ -1,247 +0,0 @@
#
# Author: Zoltan Varga ([email protected])
# License: MIT/X11
#
#
# This is a mono support mode for a python-enabled gdb:
# http://sourceware.org/gdb/wiki/PythonGdb
# Usage:
# - copy/symlink this file, plus mono-gdbinit to the directory where the mono
# executable lives.
# - run mono under gdb, or attach to a mono process using gdb
# - Type 'xdb' in gdb to load/reload the debugging info emitted by the runtime.
# - The debug info is emitted to a file called xdb.s in the current working directory.
# When attaching to a mono process, make sure you are in the same directory.
#
import os
class StringPrinter:
"Print a C# string"
def __init__(self, val):
self.val = val
def to_string(self):
if int(self.val.cast (gdb.lookup_type ("guint64"))) == 0:
return "null"
obj = self.val.cast (gdb.lookup_type ("MonoString").pointer ()).dereference ()
len = obj ['length']
chars = obj ['chars']
i = 0
res = ['"']
while i < len:
val = (chars.cast(gdb.lookup_type ("gint64")) + (i * 2)).cast(gdb.lookup_type ("gunichar2").pointer ()).dereference ()
if val >= 256:
c = "\u%X" % val
else:
c = chr (val)
res.append (c)
i = i + 1
res.append ('"')
return ''.join (res)
def stringify_class_name(ns, name):
if ns == "System":
if name == "Byte":
return "byte"
if name == "String":
return "string"
if ns == "":
return name
else:
return "%s.%s" % (ns, name)
class ArrayPrinter:
"Print a C# array"
def __init__(self, val, class_ns, class_name):
self.val = val
self.class_ns = class_ns
self.class_name = class_name
def to_string(self):
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
length = obj ['max_length']
return "%s [%d]" % (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
class ObjectPrinter:
"Print a C# object"
def __init__(self, val):
if str(val.type)[-1] == "&":
self.val = val.address.cast (gdb.lookup_type ("MonoObject").pointer ())
else:
self.val = val.cast (gdb.lookup_type ("MonoObject").pointer ())
class _iterator:
def __init__(self,obj):
self.obj = obj
self.iter = self.obj.type.fields ().__iter__ ()
pass
def __iter__(self):
return self
def next(self):
field = self.iter.next ()
try:
if str(self.obj [field.name].type) == "object":
# Avoid recursion
return (field.name, self.obj [field.name].cast (gdb.lookup_type ("void").pointer ()))
else:
return (field.name, self.obj [field.name])
except:
# Superclass
return (field.name, self.obj.cast (gdb.lookup_type ("%s" % (field.name))))
def children(self):
# FIXME: It would be easier if gdb.Value would support iteration itself
# It would also be better if we could return None
if int(self.val.cast (gdb.lookup_type ("guint64"))) == 0:
return {}.__iter__ ()
try:
obj = self.val.dereference ()
class_ns = obj ['vtable'].dereference ()['klass'].dereference ()['name_space'].string ()
class_name = obj ['vtable'].dereference ()['klass'].dereference ()['name'].string ()
if class_name [-2:len(class_name)] == "[]":
return {}.__iter__ ()
gdb_type = gdb.lookup_type ("struct %s_%s" % (class_ns.replace (".", "_"), class_name))
return self._iterator(obj.cast (gdb_type))
except:
print sys.exc_info ()[0]
print sys.exc_info ()[1]
return {}.__iter__ ()
def to_string(self):
if int(self.val.cast (gdb.lookup_type ("guint64"))) == 0:
return "null"
try:
obj = self.val.dereference ()
class_ns = obj ['vtable'].dereference ()['klass'].dereference ()['name_space'].string ()
class_name = obj ['vtable'].dereference ()['klass'].dereference ()['name'].string ()
if class_ns == "System" and class_name == "String":
return StringPrinter (self.val).to_string ()
if class_name [-2:len(class_name)] == "[]":
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
if class_ns != "":
try:
gdb_type = gdb.lookup_type ("struct %s.%s" % (class_ns, class_name))
except:
# Maybe there is no debug info for that type
return "%s.%s" % (class_ns, class_name)
#return obj.cast (gdb_type)
return "%s.%s" % (class_ns, class_name)
return class_name
except:
print sys.exc_info ()[0]
print sys.exc_info ()[1]
# FIXME: This can happen because we don't have liveness information
return self.val.cast (gdb.lookup_type ("guint64"))
class MonoMethodPrinter:
"Print a MonoMethod structure"
def __init__(self, val):
self.val = val
def to_string(self):
if int(self.val.cast (gdb.lookup_type ("guint64"))) == 0:
return "0x0"
val = self.val.dereference ()
klass = val ["klass"].dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"%s:%s ()\"" % (class_name, val ["name"].string ())
# This returns more info but requires calling into the inferior
#return "\"%s\"" % (gdb.parse_and_eval ("mono_method_full_name (%s, 1)" % (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
class MonoClassPrinter:
"Print a MonoClass structure"
def __init__(self, val):
self.val = val
def to_string(self):
if int(self.val.cast (gdb.lookup_type ("guint64"))) == 0:
return "0x0"
klass = self.val.dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"%s\"" % (class_name)
# This returns more info but requires calling into the inferior
#return "\"%s\"" % (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)" % (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
def lookup_pretty_printer(val):
t = str (val.type)
if t == "object":
return ObjectPrinter (val)
if t[0:5] == "class" and t[-1] == "&":
return ObjectPrinter (val)
if t == "string":
return StringPrinter (val)
if t == "MonoMethod *":
return MonoMethodPrinter (val)
if t == "MonoClass *":
return MonoClassPrinter (val)
return None
def register_csharp_printers(obj):
"Register C# pretty-printers with objfile Obj."
if obj == None:
obj = gdb
obj.pretty_printers.append (lookup_pretty_printer)
register_csharp_printers (gdb.current_objfile())
class MonoSupport(object):
def __init__(self):
self.s_size = 0
def run_hook(self):
if os.access ("xdb.s", os.F_OK):
os.remove ("xdb.s")
gdb.execute ("set environment MONO_XDEBUG 1")
def stop_hook(self):
# Called when the program is stopped
# Need to recompile+reload the xdb.s file if needed
# FIXME: Need to detect half-written files created when the child is
# interrupted while executing the xdb.s writing code
# FIXME: Handle appdomain unload
if os.access ("xdb.s", os.F_OK):
new_size = os.stat ("xdb.s").st_size
if new_size > self.s_size:
sofile = "xdb.so"
gdb.execute ("shell as -o xdb.o xdb.s && ld -shared -o %s xdb.o" % sofile)
# FIXME: This prints messages which couldn't be turned off
gdb.execute ("add-symbol-file %s 0" % sofile)
self.s_size = new_size
class RunHook (gdb.Command):
def __init__ (self):
super (RunHook, self).__init__ ("hook-run", gdb.COMMAND_NONE,
gdb.COMPLETE_COMMAND, pre_hook_of="run")
def invoke(self, arg, from_tty):
mono_support.run_hook ()
print "Mono support loaded."
mono_support = MonoSupport ()
# This depends on the changes in gdb-python.diff to work
#RunHook ()
# Register our hooks
# This currently cannot be done from python code
exec_file = gdb.current_objfile ().filename
# FIXME: Is there a way to detect symbolic links ?
if os.stat (exec_file).st_size != os.lstat (exec_file).st_size:
exec_file = os.readlink (exec_file)
exec_dir = os.path.dirname (exec_file)
gdb.execute ("source %s/%s-gdbinit" % (exec_dir, os.path.basename (exec_file)))
-20
View File
@@ -1,20 +0,0 @@
# Loaded by mono-gdb.py
# FIXME: According to gdb docs, this is called _before_ anything is printed
# Got broken by this patch:
# http://sourceware.org/ml/gdb-patches/2008-09/msg00193.html
# FIXME: This seems to cause crashes inside gdb
#define hook-stop
# python mono_support.stop_hook ()
#end
define hook-backtrace
python mono_support.stop_hook ()
end
define hook-run
python mono_support.run_hook ()
end
define xdb
python mono_support.stop_hook ()
end
-19
View File
@@ -1,19 +0,0 @@
# Tester script for the xdb functionality
# Run using gdb -P test-xdb.py <NORMAL GDB COMMAND LINE>
import sys
gdb.execute ("file %s" % sys.argv [0])
gdb.execute ("r --break *:* %s" % " ".join (sys.argv[1:len(sys.argv)]))
while True:
try:
if gdb.threads () == None:
break
gdb.execute("xdb")
gdb.execute("bt")
gdb.execute("info args")
gdb.execute("info locals")
gdb.execute("c")
except:
gdb.execute ("quit")
-6
View File
@@ -1,6 +0,0 @@
2009-02-19 Rodrigo Kumpera <[email protected]>
* LockTracerDecoder.cs: Initial version of the lock tracers decoder.
-519
View File
@@ -1,519 +0,0 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Globalization;
using System.Runtime.InteropServices;
public enum Record {
MustNotHoldAny,
MustNotHoldOne,
MustHoldOne,
LockAcquired,
LockReleased
}
public struct LockRecord {
public SimLock lk;
public string frame;
public LockRecord (SimLock lk, string frame) {
this.lk = lk;
this.frame = frame;
}
}
public class SimThread
{
int thread;
List <LockRecord> locks = new List <LockRecord> ();
public SimThread (int t)
{
this.thread = t;
}
public bool HoldsLock (SimLock lk) {
foreach (var l in locks) {
if (l.lk == lk)
return true;
}
return false;
}
public int HoldCount (SimLock lk) {
int res = 0;
foreach (var l in locks)
if (l.lk == lk)
++res;
return res;
}
public void Lock (SimLock lk, string frame) {
foreach (LockRecord lr in locks) {
if (lk.WarnAbout (this, lr.lk))
Console.WriteLine ("WARNING: tried to acquire lock {0} at {1} while holding {2} at {3}: {4}", lk, frame, lr.lk, lr.frame, lk.GetWarningMessage (this, lr.lk));
else if (!lk.IsValid (this, lr.lk))
Console.WriteLine ("ERROR: tried to acquire lock {0} at {1} while holding {2} at {3}: {4}", lk, frame, lr.lk, lr.frame, lk.GetErrorMessage (this, lr.lk));
}
locks.Add (new LockRecord (lk, frame));
}
public void Release (SimLock lk, string frame) {
if (locks.Count == 0) {
Console.WriteLine ("ERROR: released lock {0} at {1} while holding no locks!", lk, frame);
return;
}
LockRecord top = locks [locks.Count - 1];
if (top.lk != lk && !(lk.IsGlobalLock && HoldCount (lk) > 1)) {
Console.WriteLine ("WARNING: released lock {0} at {1} out of order with {2} at {3}!", lk, frame, top.lk, top.frame);
}
for (int i = locks.Count -1; i >= 0; --i) {
if (locks [i].lk == lk) {
locks.RemoveAt (i);
break;
}
}
}
}
/*
LOCK RULES
Simple locks:
Can be acquired at any point regardless of which locks are taken or not.
No other locks can be acquired or released while holding a simple lock.
Reentrancy is not recomended. (warning)
Simple locks are leaf locks on the lock lattice.
Complex locks:
Must respect locking order, which form a lattice.
IOW, to take a given lock, only it's parents might have been taken.
Reentrancy is ok.
Locks around resources count as separate instances of the hierarchy.
Global locks:
Must respect locking order.
Must be the at the botton of the locking lattice.
Can be taken out-of-order by other locks given that it was previously acquired.
Adding global locks is not to be taken lightly.
The current lock hierarchy:
loader lock
domain lock
domain jit lock
simple locks
Examples:
You can take the loader lock without holding a domain lock.
You cannot take a domain lock if the loader lock is held.
You cannot take a domain lock while holding the lock to another domain.
*/
public enum Lock {
Invalid,
LoaderLock,
ImageDataLock,
DomainLock,
DomainAssembliesLock,
DomainJitCodeHashLock,
}
public class SimLock
{
Lock kind;
int id;
public SimLock (Lock kind, int id) {
this.kind = kind;
this.id = id;
}
static int GetLockOrder (Lock kind) {
switch (kind) {
case Lock.LoaderLock:
return 0;
case Lock.DomainLock:
return 1;
case Lock.DomainJitCodeHashLock:
return 2;
default:
return 3;
}
}
bool IsParent (SimLock other) {
return GetLockOrder (kind) > GetLockOrder (other.kind);
}
public bool IsSimpleLock {
get { return GetLockOrder (kind) == 3; }
}
public bool IsGlobalLock {
get { return kind == Lock.LoaderLock; }
}
/*locked is already owned by the thread, 'this' is the new one*/
bool Compare (SimThread thread, SimLock locked, out bool isWarning, out string msg)
{
isWarning = false;
msg = null;
if (locked != this) {
if (!IsParent (locked)) {
if (IsGlobalLock) { /*acquiring a global lock*/
if (!thread.HoldsLock (this)) { /*does the thread alread hold it?*/
msg = "Acquired a global lock after a regular lock without having it before.";
return false;
}
} else {
msg = "Hierarchy violation.";
return false;
}
}
} else if (IsSimpleLock) {
msg = "Avoid taking simple locks recursively";
isWarning = true;
return false;
}
return true;
}
public bool IsValid (SimThread thread, SimLock locked) {
bool warn;
string msg;
return Compare (thread, locked, out warn, out msg);
}
public bool WarnAbout (SimThread thread, SimLock locked) {
bool warn;
string msg;
Compare (thread, locked, out warn, out msg);
return warn;
}
public string GetWarningMessage (SimThread thread, SimLock locked) {
bool warn;
string msg;
Compare (thread, locked, out warn, out msg);
return warn ? msg : null;
}
public string GetErrorMessage (SimThread thread, SimLock locked) {
bool warn;
string msg;
bool res = Compare (thread, locked, out warn, out msg);
return !res && !warn ? msg : null;
}
public override string ToString () {
return String.Format ("{0}", kind);
}
}
public class LockSimulator
{
static Dictionary <int, SimThread> threads = new Dictionary <int, SimThread> ();
static Dictionary <int, SimLock> locks = new Dictionary <int, SimLock> ();
SymbolTable syms;
public LockSimulator (SymbolTable s) { this.syms = s; }
SimLock GetLock (Trace t) {
if (locks.ContainsKey (t.lockPtr))
return locks [t.lockPtr];
else {
return locks [t.lockPtr] = new SimLock (t.lockKind, t.lockPtr);
}
}
SimThread GetThread (Trace t) {
if (threads.ContainsKey (t.thread))
return threads [t.thread];
else
return threads [t.thread] = new SimThread (t.thread);
}
public void PlayBack (IEnumerable<Trace> traces) {
foreach (var t in traces) {
SimThread thread = GetThread (t);
SimLock lk = GetLock (t);
string frame = t.GetUsefullTopTrace (this.syms);
switch (t.record) {
case Record.MustNotHoldAny:
case Record.MustNotHoldOne:
case Record.MustHoldOne:
throw new Exception ("not supported");
case Record.LockAcquired:
thread.Lock (lk, frame);
break;
case Record.LockReleased:
thread.Release (lk, frame);
break;
default:
throw new Exception ("Invalid trace record: "+t.record);
}
}
}
}
public class Trace {
public int thread;
public Record record;
public Lock lockKind;
public int lockPtr;
int[] frames;
static readonly string[] BAD_FRAME_METHODS = new string[] {
"mono_loader_lock",
"mono_loader_unlock",
"mono_image_lock",
"mono_image_unlock",
};
public Trace (string[] fields) {
thread = fields [0].ParseHex ();
record = (Record)fields [1].ParseDec ();
lockKind = (Lock)fields [2].ParseDec ();
lockPtr = fields [3].ParseHex ();
frames = new int [fields.Length - 4];
for (int i = 0; i < frames.Length; ++i)
frames [i] = fields [i + 4].ParseHex ();
}
public void Dump (SymbolTable table) {
Console.WriteLine ("{0:x} {1} {2} {3:x}", thread, record, lockKind, lockPtr);
for (int i = 0; i < frames.Length; ++i)
Console.WriteLine ("\t{0}", table.Translate (frames [i]));
}
public string GetUsefullTopTrace (SymbolTable syms) {
for (int i = 0; i < frames.Length; ++i) {
string str = syms.Translate (frames [i]);
bool ok = true;
for (int j = 0; j < BAD_FRAME_METHODS.Length; ++j) {
if (str.IndexOf (BAD_FRAME_METHODS [j]) >= 0) {
ok = false;
break;
}
}
if (ok)
return str;
}
return "[unknown]";
}
}
public class Symbol : IComparable<Symbol>
{
public int offset;
public int size;
public string name;
public Symbol (int o, int size, string n) {
this.offset = o;
this.size = size;
this.name = n;
}
public int CompareTo(Symbol other) {
return offset - other.offset;
}
}
public interface SymbolTable {
string Translate (int offset);
}
public class OsxSymbolTable : SymbolTable
{
Symbol[] table;
const int MAX_FUNC_SIZE = 0x20000;
public OsxSymbolTable (string binary) {
Load (binary);
}
void Load (string binary) {
ProcessStartInfo psi = new ProcessStartInfo ("gobjdump", "-t "+binary);
psi.UseShellExecute = false;
psi.RedirectStandardOutput = true;
var proc = Process.Start (psi);
var list = new List<Symbol> ();
string line;
while ((line = proc.StandardOutput.ReadLine ()) != null) {
string[] fields = line.Split(new char[] {' ', '\t'}, StringSplitOptions.RemoveEmptyEntries);
if (fields.Length < 4)
continue;
if (!(fields [1].Equals ("g") || fields [1].Equals ("d")))
continue;
if (!fields [2].Equals ("*UND*"))
continue;
int offset = fields [0].ParseHex ();
string name = fields [3];
if (offset != 0)
list.Add (new Symbol (offset, 0, name));
}
table = new Symbol [list.Count];
list.CopyTo (table, 0);
Array.Sort (table);
}
public string Translate (int offset) {
Symbol sym = null;
int res = Array.BinarySearch (table, new Symbol (offset, 0, null));
if (res >= 0)
return table [res].name;
res = ~res;
if (res >= table.Length)
sym = table [table.Length - 1];
else if (res != 0)
sym = table [res - 1];
if (sym != null) {
int size = Math.Max (sym.size, 10);
if (offset - sym.offset < size)
return sym.name;
}
return String.Format ("[{0:x}]", offset);
}
}
public class LinuxSymbolTable : SymbolTable
{
Symbol[] table;
const int MAX_FUNC_SIZE = 0x20000;
public LinuxSymbolTable (string binary) {
Load (binary);
}
void Load (string binary) {
ProcessStartInfo psi = new ProcessStartInfo ("objdump", "-t "+binary);
psi.UseShellExecute = false;
psi.RedirectStandardOutput = true;
var proc = Process.Start (psi);
var list = new List<Symbol> ();
string line;
while ((line = proc.StandardOutput.ReadLine ()) != null) {
string[] fields = line.Split(new char[] {' ', '\t'}, StringSplitOptions.RemoveEmptyEntries);
if (fields.Length < 6)
continue;
if (fields [3] != ".text" || fields [2] != "F")
continue;
int offset = fields [0].ParseHex ();
int size = fields [4].ParseHex ();
string name = fields [fields.Length - 1];
if (offset != 0)
list.Add (new Symbol (offset, size, name));
}
table = new Symbol [list.Count];
list.CopyTo (table, 0);
Array.Sort (table);
}
public string Translate (int offset) {
Symbol sym = null;
int res = Array.BinarySearch (table, new Symbol (offset, 0, null));
if (res >= 0)
return table [res].name;
res = ~res;
if (res >= table.Length)
sym = table [table.Length - 1];
else if (res != 0)
sym = table [res - 1];
if (sym != null && offset - sym.offset < MAX_FUNC_SIZE)
return sym.name;
return String.Format ("[{0:x}]", offset);
}
}
public class TraceDecoder
{
string file;
public TraceDecoder (string file) {
this.file = file;
}
public IEnumerable<Trace> GetTraces () {
using (StreamReader reader = new StreamReader (file)) {
string line;
while ((line = reader.ReadLine ()) != null) {
string[] fields = line.Split(new char[] {','}, StringSplitOptions.RemoveEmptyEntries);
if (fields.Length >= 7) {
yield return new Trace (fields);
}
}
}
}
}
public class Driver
{
[DllImport ("libc")]
static extern int uname (IntPtr buf);
static bool IsOSX ()
{
bool isOsx = false;
IntPtr buf = Marshal.AllocHGlobal (8192);
if (uname (buf) == 0) {
string os = Marshal.PtrToStringAnsi (buf);
isOsx = os == "Darwin";
}
Marshal.FreeHGlobal (buf);
return isOsx;
}
static void Main (string[] args) {
SymbolTable syms;
if (args.Length != 2) {
Console.WriteLine ("usage: LockTracerDecoder.exe /path/to/mono /path/to/locks.pid");
return;
}
if (IsOSX ())
syms = new OsxSymbolTable (args [0]);
else
syms = new LinuxSymbolTable (args [0]);
var decoder = new TraceDecoder (args [1]);
var sim = new LockSimulator (syms);
sim.PlayBack (decoder.GetTraces ());
}
}
public static class Utils
{
public static int ParseHex (this string number) {
while (number.Length > 1 && (number [0] == '0' || number [0] == 'x' || number [0] == 'X'))
number = number.Substring (1);
return int.Parse (number, NumberStyles.HexNumber);
}
public static int ParseDec (this string number) {
while (number.Length > 1 && number [0] == '0')
number = number.Substring (1);
return int.Parse (number);
}
}
+1 -1
View File
@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
Name: Mono NUnit
Description: Mono's version of NUnit
Version: @VERSION@
Libs: -r:${libdir}/mono/1.0/nunit.core.dll -r:${libdir}/mono/1.0/nunit.core.interfaces.dll -r:${libdir}/mono/1.0/nunit.core.extensions.dll -r:${libdir}/mono/1.0/nunit.framework.dll -r:${libdir}/mono/1.0/nunit.framework.extensions.dll -r:${libdir}/mono/1.0/nunit.mocks.dll -r:${libdir}/mono/1.0/nunit.util.dll -r:${libdir}/mono/1.0/nunit-console-runner.dll
Libs: -r:${libdir}/mono/1.0/nunit.core.dll -r:${libdir}/mono/1.0/nunit.framework.dll -r:${libdir}/mono/1.0/nunit.util.dll
-4
View File
@@ -1,4 +0,0 @@
Name: Mono.Web
Description: Mono ASP.NET extension classes
Version: 2.0.0.0
Libs: -r:@prefix@/lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
+1 -43
View File
@@ -1,56 +1,14 @@
2009-08-11 Gonzalo Paniagua Javier <[email protected]>
* DefaultWsdlHelpGenerator.aspx: the 'Message Layout' can now handle
self-referencing types. Fixes bug #529353.
2009-08-05 Atsushi Enomoto <[email protected]>
* web.config: add WCF assemblies as references at compilation.
* machine.config: add some missing WCF sections (new in 3.5).
2009-05-28 Atsushi Enomoto <[email protected]>
* machine.config: fix WCF diagnostics section name.
2009-03-31 Marek Habersack <[email protected]>
* DefaultWsdlHelpGenerator.aspx: the link element in <head> must
be created using Response.Write, as the code expression in the
href attribute is otherwise treated verbatim. This is the same as
with .NET. Fixes bug #490497
2009-03-27 Gonzalo Paniagua Javier <[email protected]>
* DefaultWsdlHelpGenerator.aspx: disable the test form
when only Soap is supported.
Bug #342073 fixed.
2009-01-23 Atsushi Enomoto <[email protected]>
* web.config : added .svc handler.
2009-01-07 Kornél Pál <[email protected]>
* DefaultWsdlHelpGenerator.aspx: Move <script> at the end of <head> that
will make Visual Studio recognize the web service disco reference.
Contributed under MIT/X11 license.
2008-12-03 Marek Habersack <[email protected]>
* machine.config: rename serviceModelHostingEnvironment to
serviceHostingEnvironment.
2008-11-20 Gonzalo Paniagua Javier <[email protected]>
* machine.config: in 2.0, there's no <connectionManagement> section
here. Bug #445991 fixed.
2008-11-14 Gonzalo Paniagua Javier <[email protected]>
* DefaultWsdlHelpGenerator.aspx: use javascript instead of
HttpWebRequest to avoid a deadlock if the web service uses Session.
Bug #444343 fixed.
re: miguel
2008-10-09 Gonzalo Paniagua Javier <[email protected]>
+77 -94
View File
@@ -10,7 +10,6 @@
--%>
<%@ Import Namespace="System.Collections" %>
<%@ Import Namespace="System.Collections.Generic" %>
<%@ Import Namespace="System.IO" %>
<%@ Import Namespace="System.Xml.Serialization" %>
<%@ Import Namespace="System.Xml" %>
@@ -35,6 +34,73 @@
<%@ Page debug="true" %>
<html>
<script language="javascript" type="text/javascript">
var req;
function getXML (command, url, qs) {
if (url == "" || url.substring (0, 4) != "http")
return;
var post_data = null;
req = getReq ();
req.onreadystatechange = stateChange;
if (command == "GET") {
url = url + "?" + qs;
} else {
post_data = qs;
}
req.open (command, url, true);
if (command == "POST")
req.setRequestHeader ("Content-Type", "application/x-www-form-urlencoded");
req.send (post_data);
}
function stateChange () {
if (req.readyState == 4) {
var node = document.getElementById("testresult_div");
var text = "";
if (req.status == 200) {
node.innerHTML = "<div class='code-xml'>" + formatXml (req.responseText) + "</div>";
} else {
var ht = "<b style='color: red'>" + formatXml (req.status + " - " + req.statusText) + "</b>";
if (req.responseText != "")
ht = ht + "\n<div class='code-xml'>" + formatXml (req.responseText) + "</div>";
node.innerHTML = ht;
}
}
}
function formatXml (text)
{
var re = / /g;
text = text.replace (re, "&nbsp;");
re = /\t/g;
text = text.replace (re, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
re = /\<\s*(\/?)\s*(.*?)\s*(\/?)\s*\>/g;
text = text.replace (re,"{blue:&lt;$1}{maroon:$2}{blue:$3&gt;}");
re = /{(\w*):(.*?)}/g;
text = text.replace (re,"<span style='color:$1'>$2</span>");
re = /"(.*?)"/g;
text = text.replace (re,"\"<span style='color:purple'>$1</span>\"");
re = /\r\n|\r|\n/g;
text = text.replace (re, "<br/>");
return text;
}
function getReq () {
if (window.XMLHttpRequest) {
return new XMLHttpRequest(); // Firefox, Safari, ...
} else if (window.ActiveXObject) {
return new ActiveXObject("Microsoft.XMLHTTP");
}
}
</script>
<script language="C#" runat="server">
ServiceDescriptionCollection descriptions;
@@ -123,20 +189,15 @@ void BuildOperationInfo ()
// Protocols supported by the operation
CurrentOperationProtocols = "";
WebServiceProtocols testProtocols = 0;
ArrayList prots = FindServiceProtocols (CurrentOperationName);
for (int n=0; n<prots.Count; n++) {
string prot = (string) prots [n];
if (n != 0) CurrentOperationProtocols += ", ";
CurrentOperationProtocols += prot;
if (prot == "HttpGet")
testProtocols |= WebServiceProtocols.HttpGet;
else if (prot == "HttpPost") {
testProtocols |= WebServiceProtocols.HttpPost;
if (Context.Request.IsLocal)
testProtocols |= WebServiceProtocols.HttpPostLocalhost;
}
CurrentOperationProtocols += (string) prots[n];
}
WebServiceProtocols testProtocols = WebServiceProtocols.HttpGet | WebServiceProtocols.HttpPost;
if (Context.Request.IsLocal)
testProtocols |= WebServiceProtocols.HttpPostLocalhost;
CurrentOperationSupportsTest = (WebServicesSection.Current.EnabledProtocols & testProtocols) != 0;
// Operation format
@@ -1036,7 +1097,7 @@ public class HtmlSampleGenerator: SampleGenerator
if (elem == null) throw new InvalidOperationException ("Element not found: " + qname);
WriteElementSample (xtw, qname.Namespace, elem);
}
void WriteElementSample (XmlTextWriter xtw, string ns, XmlSchemaElement elem)
{
bool sharedAnnType = false;
@@ -1130,18 +1191,9 @@ public class HtmlSampleGenerator: SampleGenerator
{
WriteAttributes (xtw, stype.Attributes, stype.AnyAttribute);
}
Dictionary<XmlSchemaComplexType,int> recursed_types = new Dictionary<XmlSchemaComplexType,int> ();
void WriteComplexTypeElements (XmlTextWriter xtw, string ns, XmlSchemaComplexType stype)
{
int prev = 0;
if (recursed_types.ContainsKey (stype))
prev = recursed_types [stype];
if (prev > 1)
return;
recursed_types [stype] = ++prev;
if (stype.Particle != null)
WriteParticleComplexContent (xtw, ns, stype.Particle);
else
@@ -1151,8 +1203,6 @@ public class HtmlSampleGenerator: SampleGenerator
else if (stype.ContentModel is XmlSchemaComplexContent)
WriteComplexContent (xtw, ns, (XmlSchemaComplexContent)stype.ContentModel);
}
prev = recursed_types [stype];
recursed_types [stype] = --prev;
}
void WriteAttributes (XmlTextWriter xtw, XmlSchemaObjectCollection atts, XmlSchemaAnyAttribute anyat)
@@ -1533,9 +1583,8 @@ public class HtmlSampleGenerator: SampleGenerator
</script>
<head runat="server">
<%
Response.Write ("<link rel=\"alternate\" type=\"text/xml\" href=\"" + Request.FilePath + "?disco\"/>");
%>
<link rel="alternate" type="text/xml" href="<%=Request.FilePath%>?disco"/>
<title><%=WebServiceName%> Web Service</title>
<style type="text/css">
BODY { font-family: Arial; margin-left: 20px; margin-top: 20px; font-size: x-small}
@@ -1566,73 +1615,7 @@ public class HtmlSampleGenerator: SampleGenerator
A:hover { color: blue }
</style>
<script language="javascript" type="text/javascript">
var req;
function getXML (command, url, qs) {
if (url == "" || url.substring (0, 4) != "http")
return;
var post_data = null;
req = getReq ();
req.onreadystatechange = stateChange;
if (command == "GET") {
url = url + "?" + qs;
} else {
post_data = qs;
}
req.open (command, url, true);
if (command == "POST")
req.setRequestHeader ("Content-Type", "application/x-www-form-urlencoded");
req.send (post_data);
}
function stateChange () {
if (req.readyState == 4) {
var node = document.getElementById("testresult_div");
var text = "";
if (req.status == 200) {
node.innerHTML = "<div class='code-xml'>" + formatXml (req.responseText) + "</div>";
} else {
var ht = "<b style='color: red'>" + formatXml (req.status + " - " + req.statusText) + "</b>";
if (req.responseText != "")
ht = ht + "\n<div class='code-xml'>" + formatXml (req.responseText) + "</div>";
node.innerHTML = ht;
}
}
}
function formatXml (text)
{
var re = / /g;
text = text.replace (re, "&nbsp;");
re = /\t/g;
text = text.replace (re, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
re = /\<\s*(\/?)\s*(.*?)\s*(\/?)\s*\>/g;
text = text.replace (re,"{blue:&lt;$1}{maroon:$2}{blue:$3&gt;}");
re = /{(\w*):(.*?)}/g;
text = text.replace (re,"<span style='color:$1'>$2</span>");
re = /"(.*?)"/g;
text = text.replace (re,"\"<span style='color:purple'>$1</span>\"");
re = /\r\n|\r|\n/g;
text = text.replace (re, "<br/>");
return text;
}
function getReq () {
if (window.XMLHttpRequest) {
return new XMLHttpRequest(); // Firefox, Safari, ...
} else if (window.ActiveXObject) {
return new ActiveXObject("Microsoft.XMLHTTP");
}
}
<script>
function clearForm ()
{
document.getElementById("testFormResult").style.display="none";
+4 -17
View File
@@ -79,13 +79,12 @@
<section name="bindings" type="System.ServiceModel.Configuration.BindingsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="client" type="System.ServiceModel.Configuration.ClientSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="commonBehaviors" type="System.ServiceModel.Configuration.CommonBehaviorsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="diagnostics" type="System.ServiceModel.Configuration.DiagnosticSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="diagnostic" type="System.ServiceModel.Configuration.DiagnosticSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="extensions" type="System.ServiceModel.Configuration.ExtensionsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="serviceHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="services" type="System.ServiceModel.Configuration.ServicesSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
<section name="system.webServer" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</configSections>
<connectionStrings>
@@ -103,6 +102,9 @@
</configProtectedData>
<system.net>
<connectionManagement>
<add address="*" maxconnection="2" />
</connectionManagement>
<authenticationModules>
<add type="System.Net.BasicClient, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.DigestClient, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -253,21 +255,6 @@
</providers>
</profile>
</system.web>
<system.serviceModel>
<extensions>
<behaviorExtensions>
<add name="enableWebScript" type="System.ServiceModel.Configuration.WebScriptEnablingElement, System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="webHttp" type="System.ServiceModel.Configuration.WebHttpElement, System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</behaviorExtensions>
<bindingElementExtensions>
<add name="webMessageEncoding" type="System.ServiceModel.Configuration.WebMessageEncodingElement, System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</bindingElementExtensions>
<bindingExtensions>
<add name="webHttpBinding" type="System.ServiceModel.Configuration.WebHttpBindingCollectionElement, System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</bindingExtensions>
</extensions>
</system.serviceModel>
</configuration>
+2 -7
View File
@@ -37,9 +37,8 @@
<add verb="*" path="*.vbproj" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.licx" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.dll" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.rem" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
<add verb="*" path="*.soap" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
<add verb="*" path="*.svc" type="System.ServiceModel.Channels.SvcHttpHandlerFactory, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add verb="*" path="*.rem" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
<add verb="*" path="*.soap" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
<add verb="GET,HEAD" path="*" type="System.Web.StaticFileHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*" type="System.Web.HttpMethodNotAllowedHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</httpHandlers>
@@ -95,10 +94,6 @@
<add assembly="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"/>
<add assembly="System.IdentityModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"/>
<add assembly="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add assembly="System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="*" /> <!-- Add assemblies in bin directory -->
</assemblies>
-9
View File
@@ -1,9 +0,0 @@
2009-08-06 Atsushi Enomoto <[email protected]>
* web.config: add WCF assemblies as references at compilation.
* machine.config: add some missing WCF sections (new in 3.5).
2009-07-24 Jb Evain <[email protected]>
* Initial import of the net_4_0 specific files.
-12
View File
@@ -1,12 +0,0 @@
SUBDIRS =
monodir = $(sysconfdir)/mono/4.0
EXTRA_DIST = machine.config \
web.config \
settings.map
mono_DATA = machine.config \
web.config \
settings.map
-274
View File
@@ -1,274 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="configProtectedData" type="System.Configuration.ProtectedConfigurationSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="appSettings" type="System.Configuration.AppSettingsSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="connectionStrings" type="System.Configuration.ConnectionStringsSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="mscorlib" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
<section name="runtime" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
<section name="assemblyBinding" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
<section name="satelliteassemblies" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
<section name="startup" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
<section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<sectionGroup name="system.web" type="System.Web.Configuration.SystemWebSectionGroup, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<section name="anonymousIdentification" type="System.Web.Configuration.AnonymousIdentificationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="authentication" type="System.Web.Configuration.AuthenticationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="authorization" type="System.Web.Configuration.AuthorizationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="browserCaps" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="clientTarget" type="System.Web.Configuration.ClientTargetSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="compilation" type="System.Web.Configuration.CompilationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="customErrors" type="System.Web.Configuration.CustomErrorsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="deployment" type="System.Web.Configuration.DeploymentSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineOnly" />
<section name="globalization" type="System.Web.Configuration.GlobalizationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="healthMonitoring" type="System.Web.Configuration.HealthMonitoringSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="hostingEnvironment" type="System.Web.Configuration.HostingEnvironmentSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication" />
<section name="httpCookies" type="System.Web.Configuration.HttpCookiesSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="httpHandlers" type="System.Web.Configuration.HttpHandlersSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="httpModules" type="System.Web.Configuration.HttpModulesSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="httpRuntime" type="System.Web.Configuration.HttpRuntimeSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="identity" type="System.Web.Configuration.IdentitySection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="machineKey" type="System.Web.Configuration.MachineKeySection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="membership" type="System.Web.Configuration.MembershipSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="mobileControls" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="deviceFilters" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="pages" type="System.Web.Configuration.PagesSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="processModel" type="System.Web.Configuration.ProcessModelSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineOnly" allowLocation="false" />
<section name="profile" type="System.Web.Configuration.ProfileSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="roleManager" type="System.Web.Configuration.RoleManagerSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="securityPolicy" type="System.Web.Configuration.SecurityPolicySection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication" />
<section name="sessionPageState" type="System.Web.Configuration.SessionPageStateSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="sessionState" type="System.Web.Configuration.SessionStateSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="siteMap" type="System.Web.Configuration.SiteMapSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="trace" type="System.Web.Configuration.TraceSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="trust" type="System.Web.Configuration.TrustSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication" />
<section name="urlMappings" type="System.Web.Configuration.UrlMappingsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="webControls" type="System.Web.Configuration.WebControlsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="webParts" type="System.Web.Configuration.WebPartsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="webServices" type="System.Web.Services.Configuration.WebServicesSection, System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="xhtmlConformance" type="System.Web.Configuration.XhtmlConformanceSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<sectionGroup name="caching" type="System.Web.Configuration.SystemWebCachingSectionGroup, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<section name="cache" type="System.Web.Configuration.CacheSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="outputCache" type="System.Web.Configuration.OutputCacheSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="outputCacheSettings" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="sqlCacheDependency" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
</sectionGroup>
<section name="monoSettings" type="System.Web.Configuration.MonoSettingsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</sectionGroup>
<sectionGroup name="system.net" type="System.Net.Configuration.NetSectionGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="authenticationModules" type="System.Net.Configuration.AuthenticationModulesSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="connectionManagement" type="System.Net.Configuration.ConnectionManagementSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="defaultProxy" type="System.Net.Configuration.DefaultProxySection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<sectionGroup name="mailSettings" type="System.Net.Configuration.MailSettingsSectionGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="smtp" type="System.Net.Configuration.SmtpSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
<section name="requestCaching" type="System.Net.Configuration.RequestCachingSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="settings" type="System.Net.Configuration.SettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="webRequestModules" type="System.Net.Configuration.WebRequestModulesSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
<section name="system.drawing" type="System.Configuration.NameValueSectionHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<sectionGroup name="system.serviceModel" type="System.ServiceModel.Configuration.ServiceModelSectionGroup, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="behaviors" type="System.ServiceModel.Configuration.BehaviorsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="bindings" type="System.ServiceModel.Configuration.BindingsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="client" type="System.ServiceModel.Configuration.ClientSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="commonBehaviors" type="System.ServiceModel.Configuration.CommonBehaviorsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="diagnostics" type="System.ServiceModel.Configuration.DiagnosticSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="extensions" type="System.ServiceModel.Configuration.ExtensionsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="serviceHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="services" type="System.ServiceModel.Configuration.ServicesSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
<section name="system.webServer" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="uri" type="System.Configuration.UriSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</configSections>
<connectionStrings>
<add name="LocalSqlServer" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true" providerName="System.Data.SqlClient"/>
<add name="LocalSqliteServer" connectionString="Data Source=|DataDirectory|/aspnetdb.sqlite;version=3" providerName="Mono.Data.Sqlite"/>
</connectionStrings>
<configProtectedData defaultProvider="RsaProtectedConfigurationProvider">
<providers>
<add name="RsaProtectedConfigurationProvider" type="System.Configuration.RsaProtectedConfigurationProvider, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
description="" keyContainerName="MonoFrameworkConfigurationKey" cspProviderName="" useMachineContainer="true" useOAEP="false" />
<add name="DataProtectionConfigurationProvider" type="System.Configuration.DpapiProtectedConfigurationProvider, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
description="" useMachineProtection="true" keyEntropy="" />
</providers>
</configProtectedData>
<system.net>
<authenticationModules>
<add type="System.Net.BasicClient, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.DigestClient, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.NtlmClient, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</authenticationModules>
<webRequestModules>
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</webRequestModules>
<settings>
<ipv6 enabled="false"/>
</settings>
</system.net>
<system.runtime.remoting>
<application>
<channels>
<channel ref="http client" displayName="http client (delay loaded)" delayLoadAsClientChannel="true" />
<channel ref="tcp client" displayName="tcp client (delay loaded)" delayLoadAsClientChannel="true" />
<channel ref="ipc client" displayName="ipc client (delay loaded)" delayLoadAsClientChannel="true" />
</channels>
</application>
<channels>
<channel id="http" type="System.Runtime.Remoting.Channels.Http.HttpChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="http client" type="System.Runtime.Remoting.Channels.Http.HttpClientChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="http server" type="System.Runtime.Remoting.Channels.Http.HttpServerChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp" type="System.Runtime.Remoting.Channels.Tcp.TcpChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp client" type="System.Runtime.Remoting.Channels.Tcp.TcpClientChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp server" type="System.Runtime.Remoting.Channels.Tcp.TcpServerChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="ipc" type="System.Runtime.Remoting.Channels.Ipc.IpcChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="ipc client" type="System.Runtime.Remoting.Channels.Ipc.IpcClientChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="ipc server" type="System.Runtime.Remoting.Channels.Ipc.IpcServerChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</channels>
<channelSinkProviders>
<clientProviders>
<formatter id="soap" type="System.Runtime.Remoting.Channels.SoapClientFormatterSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="binary" type="System.Runtime.Remoting.Channels.BinaryClientFormatterSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</clientProviders>
<serverProviders>
<formatter id="soap" type="System.Runtime.Remoting.Channels.SoapServerFormatterSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="binary" type="System.Runtime.Remoting.Channels.BinaryServerFormatterSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<provider id="wsdl" type="System.Runtime.Remoting.MetadataServices.SdlChannelSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</serverProviders>
</channelSinkProviders>
</system.runtime.remoting>
<appSettings>
<!--<add key="yourkey" value="your value" /> -->
<!--<remove key="a key defined higher in the hierarchy" /> -->
<!--<clear/> Removes all defined settings -->
</appSettings>
<system.diagnostics>
<trace autoflush="false" indentsize="4" />
</system.diagnostics>
<system.drawing>
</system.drawing>
<system.data>
<DbProviderFactories>
<add name="Mono Sqlite Data Provider" invariant="Mono.Data.SqliteClient"
description="Mono Framework Data Provider for SQLite (old version)"
type="Mono.Data.SqliteClient.SqliteFactory, Mono.Data.SqliteClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"/>
<add name="Mono Sqlite Provider" invariant="Mono.Data.Sqlite"
description="Mono Framework Data Provider for SQLite (new version)"
type="Mono.Data.Sqlite.SqliteFactory, Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"/>
<add name="Odbc Data Provider" invariant="System.Data.Odbc"
description=".Net Framework Data Provider for Odbc"
type="System.Data.Odbc.OdbcFactory, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add name="OleDb Data Provider" invariant="System.Data.OleDb"
description=".Net Framework Data Provider for OleDb"
type="System.Data.OleDb.OleDbFactory, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add name="OracleClient Data Provider" invariant="System.Data.OracleClient"
description=".Net Framework Data Provider for Oracle"
type="System.Data.OracleClient.OracleClientFactory, System.Data.OracleClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add name="SqlClient Data Provider" invariant="System.Data.SqlClient"
description=".Net Framework Data Provider for SqlServer"
type="System.Data.SqlClient.SqlClientFactory, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add name="Sybase Data Provider" invariant="Mono.Data.SybaseClient"
description=".Net Framework Data Provider for Sybase"
type="Mono.Data.SybaseClient.SybaseClientFactory, Mono.Data.SybaseClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"/>
</DbProviderFactories>
</system.data>
<mscorlib>
<cryptographySettings>
<cryptoNameMapping>
<cryptoClasses>
<cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
</cryptoNameMapping>
<oidMap>
<oidEntry OID="1.2.840.113549.2.2" name="MD2" />
<oidEntry OID="1.2.840.113549.2.2" name="Mono.Security.Cryptography.MD2Managed" />
</oidMap>
</cryptographySettings>
</mscorlib>
<strongNames>
<pubTokenMapping>
<!-- ECMA key -->
<map Token="b77a5c561934e089" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- Microsoft (final) key -->
<map Token="b03f5f7f11d50a3a" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- Microsoft (Web Service Enhancement) key -->
<map Token="31bf3856ad364e35" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- IBM (DB2 Data Provider) key -->
<map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- Silverlight 2.0 key -->
<map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
</pubTokenMapping>
</strongNames>
<system.web>
<webServices>
<protocols>
<add name="HttpSoap"/>
<add name="HttpSoap12"/>
<add name="HttpPost"/>
<add name="HttpGet"/>
<add name="Documentation"/>
</protocols>
<conformanceWarnings>
<add name="BasicProfile1_1"/>
</conformanceWarnings>
<wsdlHelpGenerator href="DefaultWsdlHelpGenerator.aspx" />
</webServices>
<membership>
<providers>
<add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="LocalSqlServer" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="true" applicationName="/" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="7" minRequiredNonalphanumericCharacters="1" passwordAttemptWindow="10" passwordStrengthRegularExpression=""/>
<!-- <add name="AspNetSqlMembershipProvider" type="Mainsoft.Web.Security.GenericMembershipProvider, Mainsoft.Web.Security" applicationName="/" connectionStringName="LocalSqlServer" /> -->
</providers>
</membership>
<roleManager>
<providers>
<add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" applicationName="/" connectionStringName="LocalSqlServer" />
<!-- <add name="AspNetSqlRoleProvider" type="Mainsoft.Web.Security.GenericRoleProvider, Mainsoft.Web.Security" applicationName="/" connectionStringName="LocalSqlServer" /> -->
</providers>
</roleManager>
<profile>
<providers>
<add name="AspNetSqlProfileProvider" connectionStringName="LocalSqlServer" applicationName="/" type="System.Web.Profile.SqlProfileProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</providers>
</profile>
</system.web>
<system.serviceModel>
<extensions>
<behaviorExtensions>
<add name="enableWebScript" type="System.ServiceModel.Configuration.WebScriptEnablingElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="webHttp" type="System.ServiceModel.Configuration.WebHttpElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</behaviorExtensions>
<bindingElementExtensions>
<add name="webMessageEncoding" type="System.ServiceModel.Configuration.WebMessageEncodingElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</bindingElementExtensions>
<bindingExtensions>
<add name="webHttpBinding" type="System.ServiceModel.Configuration.WebHttpBindingCollectionElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</bindingExtensions>
</extensions>
</system.serviceModel>
</configuration>
-48
View File
@@ -1,48 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<settingsMap>
<map sectionType="System.Web.Configuration.MembershipSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
any expression understood by the mapper to designate the section region to modify.
-->
<what value="providers">
<!-- 'what' can contain any number of occurrences of any three elements:
replace - replace the designated region
add - add a new entry to the region
clear - clear the region
remove - remove the designatedregion
The attributes to any of the above are freeform and are not processed by the mapper manager. They are stored verbatim for the
mapper to peruse.
-->
<replace name="AspNetSqlMembershipProvider"
type="System.Web.Security.SqliteMembershipProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
connectionStringName="LocalSqliteServer" />
</what>
</map>
<map sectionType="System.Web.Configuration.RoleManagerSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
any expression understood by the mapper to designate the section region to modify.
-->
<what value="providers">
<!-- 'what' can contain any number of occurrences of any three elements:
replace - replace the designated region
add - add a new entry to the region
clear - clear the region
remove - remove the designatedregion
The attributes to any of the above are freeform and are not processed by the mapper manager. They are stored verbatim for the
mapper to peruse.
-->
<replace name="AspNetSqlRoleProvider"
type="System.Web.Security.SqliteRoleProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
connectionStringName="LocalSqliteServer" />
</what>
</map>
</settingsMap>
-154
View File
@@ -1,154 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.web>
<monoSettings>
<compilersCompatibility>
<compiler language="c#;cs;csharp" extension=".cs" compilerOptions="/nowarn:0169"
type="Microsoft.CSharp.CSharpCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</compilersCompatibility>
</monoSettings>
<authorization>
<allow users="*" />
</authorization>
<httpHandlers>
<add verb="*" path="Trace.axd" type="System.Web.Handlers.TraceHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.aspx" type="System.Web.UI.PageHandlerFactory, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.asmx" validate="false" type="System.Web.Services.Protocols.WebServiceHandlerFactory, System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.ashx" type="System.Web.UI.SimpleHandlerFactory, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="GET" path="WebResource.axd" type="System.Web.Handlers.AssemblyResourceLoader, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.master" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.resources" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.skin" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.browser" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.sitemap" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.webinfo" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.resx" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.asax" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.ascx" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.config" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.Config" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.cs" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.vb" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.csproj" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.vbproj" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.licx" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.dll" type="System.Web.HttpForbiddenHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.rem" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
<add verb="*" path="*.soap" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
<add verb="*" path="*.svc" type="System.ServiceModel.Channels.SvcHttpHandlerFactory, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add verb="GET,HEAD" path="*" type="System.Web.StaticFileHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*" type="System.Web.HttpMethodNotAllowedHandler, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</httpHandlers>
<httpModules>
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="OutputCache" type="System.Web.Caching.OutputCacheModule, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="RoleManager" type="System.Web.Security.RoleManagerModule, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="Session" type="System.Web.SessionState.SessionStateModule, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</httpModules>
<authentication mode="Forms">
<forms name=".MONOAUTH" loginUrl="login.aspx" protection="All" timeout="30" path="/">
<credentials passwordFormat="Clear">
<!--<user name="gonzalo" password="gonz"/>-->
</credentials>
</forms>
</authentication>
<machineKey validationKey="AutoGenerate" decryptionKey="AutoGenerate" validation="SHA1" />
<globalization requestEncoding="utf-8"
responseEncoding="utf-8"
fileEncoding="utf-8"/>
<!--
culture="en-US"
uiculture="en-US" />
-->
<sessionState mode="InProc" />
<pages>
<namespaces>
<add namespace="System" />
<add namespace="System.Collections" />
<add namespace="System.Collections.Specialized" />
<add namespace="System.Configuration" />
<add namespace="System.Text" />
<add namespace="System.Text.RegularExpressions" />
<add namespace="System.Web" />
<add namespace="System.Web.Caching" />
<add namespace="System.Web.SessionState" />
<add namespace="System.Web.Security" />
<add namespace="System.Web.Profile" />
<add namespace="System.Web.UI" />
<add namespace="System.Web.UI.WebControls" />
<!-- <add namespace="System.Web.UI.WebControls.WebParts" /> -->
<add namespace="System.Web.UI.HtmlControls" />
</namespaces>
</pages>
<webControls clientScriptsLocation="/web_scripts" />
<compilation debug="false" defaultLanguage="c#" explicit="true" strict="false" >
<assemblies>
<!--<add assembly="mscorlib" /> -->
<add assembly="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"/>
<add assembly="System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"/>
<add assembly="System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add assembly="System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="*" /> <!-- Add assemblies in bin directory -->
</assemblies>
<expressionBuilders>
<add expressionPrefix="Resources"
type="System.Web.Compilation.ResourceExpressionBuilder, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add expressionPrefix="ConnectionStrings"
type="System.Web.Compilation.ConnectionStringsExpressionBuilder, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add expressionPrefix="AppSettings"
type="System.Web.Compilation.AppSettingsExpressionBuilder, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</expressionBuilders>
<buildProviders>
<add extension=".aspx" type="System.Web.Compilation.PageBuildProvider" />
<add extension=".ascx" type="System.Web.Compilation.UserControlBuildProvider" />
<add extension=".master" type="System.Web.Compilation.MasterPageBuildProvider" />
<add extension=".asmx" type="System.Web.Compilation.WebServiceBuildProvider" />
<add extension=".ashx" type="System.Web.Compilation.WebHandlerBuildProvider" />
<add extension=".soap" type="System.Web.Compilation.WebServiceBuildProvider" />
<add extension=".resx" type="System.Web.Compilation.ResXBuildProvider" />
<add extension=".resources" type="System.Web.Compilation.ResourcesBuildProvider" />
<add extension=".wsdl" type="System.Web.Compilation.WsdlBuildProvider" />
<add extension=".xsd" type="System.Web.Compilation.XsdBuildProvider" />
<add extension=".js" type="System.Web.Compilation.ForceCopyBuildProvider" />
<add extension=".lic" type="System.Web.Compilation.IgnoreFileBuildProvider" />
<add extension=".licx" type="System.Web.Compilation.IgnoreFileBuildProvider" />
<add extension=".exclude" type="System.Web.Compilation.IgnoreFileBuildProvider" />
<add extension=".refresh" type="System.Web.Compilation.IgnoreFileBuildProvider" />
</buildProviders>
</compilation>
<httpRuntime executionTimeout="110"
maxRequestLength="4096"
useFullyQualifiedRedirectUrl="false"
minFreeThreads="8"
minLocalRequestFreeThreads="4"
appRequestQueueLimit="5000" />
<clientTarget>
<add alias="ie5" userAgent="Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)" />
<add alias="ie4" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
<add alias="uplevel" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
<add alias="downlevel" userAgent="Unknown" />
</clientTarget>
<siteMap>
<providers>
<add name="AspNetXmlSiteMapProvider"
description="Default site map provider that reads in .sitemap xml files."
type="System.Web.XmlSiteMapProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
siteMapFile="Web.sitemap" />
</providers>
</siteMap>
</system.web>
</configuration>
+7
View File
@@ -0,0 +1,7 @@
assemblies_dir=@prefix@/lib/mono
Libraries=${assemblies_dir}/2.1/smcs.exe
Name: Mono Internal -- Do not use.
Description: Mono Internal Libraries -- Do not use
Version: @VERSION@
Libs: -r:smcs.exe
-4
View File
@@ -1,4 +0,0 @@
Name: System.Web.Mvc
Description: System.Web.Mvc - ASP.NET MVC
Version: 1.0.0.0
Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
-10
View File
@@ -1,10 +0,0 @@
/convert.exe*
/html
/Makefile
/Makefile.in
/monoapi.tree
/monoapi.zip
/mono-file-formats.tree
/mono-file-formats.zip
/mono-tools.tree
/mono-tools.zip
+8 -56
View File
@@ -1,59 +1,3 @@
2009-02-12 Zoltan Varga <[email protected]>
* Makefile.am (EXTRA_DIST): Remove removed files.
* README: Point to the documentation on the wiki.
* call-sites.txt: Remove this, its contents is in jit-trampolines.
* memory-management.txt thread-safety.txt aot-compiler.txt jit-regalloc
exception-handling.txt: Remove documents which are now on the wiki.
2009-02-11 Rodrigo Kumpera <[email protected]>
* thread-safety.txt: Improve the docs about image lock.
2009-02-11 Rodrigo Kumpera <[email protected]>
* thread-safety.txt: Document the new image lock.
2008-12-12 Mark Probst <[email protected]>
* mini-porting.txt: Added some details about function descriptors
and emulated opcodes.
2008-12-08 Jonathan Pryor <[email protected]>
* mono-file-formats.source, mono-tools.source: Place these under the
new "Commands and Files" node, and remove nay intermediate nodes.
2008-11-20 Jonathan Pryor <[email protected]>
* Makefile.am (sources_DATA): Add mono-file-formats.source,
mono-tools.source.
2008-11-20 Raja R Harinath <[email protected]>
Remove unnecessary rebuilds of the html directory
* docs.make (monoapi.zip): Make slightly more unforgiving, by
using '&&' instead of ';' to sequence commands.
(mono-tools.zip, mono-file-formats.zip): Likewise.
* Makefile.am (monoapi.zip, mono-tools.zip, mono-fileformats.zip):
Likewise.
(convert.exe): Don't depend on Makefile.am or docs.make.
2008-11-19 Raja R Harinath <[email protected]>
Fix srcdir != builddir, and add idiom for multi-output commands
* docs.make (monoapi.zip): Handle the case where 'monoapi.tree'
exists but 'monoapi.zip' doesn't. IOW, we should rebuild
monoapi.zip with 'rm monoapi.zip; make'.
(mono-tools.zip, mono-file-formats.zip): Likewise.
* Makefile.am (monoapi.zip, mono-tools.zip, mono-fileformats.zip):
Likewise.
(monoapi.tree): Don't use $< in an explicit rule.
(mono-tools.tree, mono-file-formats.tree): Likewise.
2008-11-18 Jonathan Pryor <[email protected]>
* Makefile.am (EXTRA_DIST): Add mono-file-formats{.config,.source} and
@@ -67,6 +11,14 @@
pages so that they're valid for building from mono/docs.
* monoapi.make: Rename to docs.make.
2008-11-18 Jonathan Pryor <[email protected]>
* docs.make, Makefile.am: Build mono-file-formats{.tree,.zip},
mono-tool{.tree,.zip} files.
* mono-file-formats.config, mono-tools.config: Alter paths to man
pages so that they're valid for building from mono/docs.
* monoapi.make: Rename to docs.make.
2008-11-01 Raja R Harinath <[email protected]>
* Makefile.am: Clean up for srcdir != builddir.
+17 -17
View File
@@ -1,8 +1,6 @@
sourcesdir = $(prefix)/lib/monodoc/sources
sources_DATA = \
mono-file-formats.source \
mono-tools.source \
monoapi.source \
$(ASSEMBLED_DOCS)
@@ -14,6 +12,7 @@ ASSEMBLED_DOCS = \
EXTRA_DIST = \
abc-removal.txt \
AgilityPack.dll \
aot-compiler.txt \
api-style.css \
assembly-bundle \
check-exports \
@@ -24,6 +23,7 @@ EXTRA_DIST = \
docs.make \
documented \
embedded-api \
exception-handling.txt \
exceptions \
exdoc \
file-share-modes \
@@ -34,11 +34,13 @@ EXTRA_DIST = \
internal-calls \
ir-desc \
jit-imt \
jit-regalloc \
jit-thoughts \
jit-trampolines \
local-regalloc.txt \
magic.diff \
mini-doc.txt \
mini-porting.txt \
mono-api-metadata.html \
mono-file-formats.config\
mono-file-formats.source\
@@ -59,6 +61,7 @@ EXTRA_DIST = \
ssapre.txt \
stack-alignment \
stack-overflow.txt \
thread-safety.txt \
threading \
toc.xml \
TODO \
@@ -76,21 +79,18 @@ clean-local:
-rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe*
-cd $(srcdir) && rm -f $(ASSEMBLED_DOCS)
monoapi.zip: monoapi.tree
@test -f $@ || { rm -f $(srcdir)/monoapi.tree && $(MAKE) monoapi.tree; }
monoapi.tree: docs.make Makefile.am toc.xml $(srcdir)/deploy/.stamp
cd $(srcdir) && cp api-style.css deploy
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
monoapi.zip : monoapi.tree
monoapi.tree: docs.make Makefile.am toc.xml deploy/.stamp
cp api-style.css deploy
cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
mono-tools.zip: mono-tools.tree
@test -f $@ || { rm -f $(srcdir)/mono-tools.tree && $(MAKE) mono-tools.tree; }
mono-tools.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
mono-tools.zip : mono-tools.tree
mono-tools.tree: docs.make Makefile.am deploy/.stamp
cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
mono-file-formats.zip: mono-file-formats.tree
@test -f $@ || { rm -f $(srcdir)/mono-file-formats.tree && $(MAKE) mono-file-formats.tree; }
mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
mono-file-formats.zip : mono-file-formats.tree
mono-file-formats.tree: docs.make Makefile.am deploy/.stamp
cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
$(srcdir)/deploy/.stamp: convert.exe Makefile.am
$(mkdir_p) $(srcdir)/html
@@ -100,6 +100,6 @@ $(srcdir)/deploy/.stamp: convert.exe Makefile.am
extract: $(srcdir)/deploy/.stamp
convert.exe: convert.cs AgilityPack.dll
cd $(srcdir) && $(MAKE) PROFILE=net_1_1 -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
convert.exe: docs.make convert.cs Makefile.am
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
-6
View File
@@ -1,9 +1,3 @@
Documentation is now maintained on the mono wiki:
http://www.mono-project.com/Mono:Runtime:Documentation
Older documents or documents which were not yet migrated to the wiki are kept here.
* Scripts to maintain the Mono VM internal API
Layout
+393
View File
@@ -0,0 +1,393 @@
Mono Ahead Of Time Compiler
===========================
The Ahead of Time compilation feature in Mono allows Mono to
precompile assemblies to minimize JIT time, reduce memory
usage at runtime and increase the code sharing across multiple
running Mono application.
To precompile an assembly use the following command:
mono --aot -O=all assembly.exe
The `--aot' flag instructs Mono to ahead-of-time compile your
assembly, while the -O=all flag instructs Mono to use all the
available optimizations.
* Caching metadata
------------------
Besides code, the AOT file also contains cached metadata information which allows
the runtime to avoid certain computations at runtime, like the computation of
generic vtables. This reduces both startup time, and memory usage. It is possible
to create an AOT image which contains only this cached information and no code by
using the 'metadata-only' option during compilation:
mono --aot=metadata-only assembly.exe
This works even on platforms where AOT is not normally supported.
* Position Independent Code
---------------------------
On x86 and x86-64 the code generated by Ahead-of-Time compiled
images is position-independent code. This allows the same
precompiled image to be reused across multiple applications
without having different copies: this is the same way in which
ELF shared libraries work: the code produced can be relocated
to any address.
The implementation of Position Independent Code had a
performance impact on Ahead-of-Time compiled images but
compiler bootstraps are still faster than JIT-compiled images,
specially with all the new optimizations provided by the Mono
engine.
* How to support Position Independent Code in new Mono Ports
------------------------------------------------------------
Generated native code needs to reference various runtime
structures/functions whose address is only known at run
time. JITted code can simple embed the address into the native
code, but AOT code needs to do an indirection. This
indirection is done through a table called the Global Offset
Table (GOT), which is similar to the GOT table in the Elf
spec. When the runtime saves the AOT image, it saves some
information for each method describing the GOT table entries
used by that method. When loading a method from an AOT image,
the runtime will fill out the GOT entries needed by the
method.
* Computing the address of the GOT
Methods which need to access the GOT first need to compute its
address. On the x86 it is done by code like this:
call <IP + 5>
pop ebx
add <OFFSET TO GOT>, ebx
<save got addr to a register>
The variable representing the got is stored in
cfg->got_var. It is allways allocated to a global register to
prevent some problems with branches + basic blocks.
* Referencing GOT entries
Any time the native code needs to access some other runtime
structure/function (i.e. any time the backend calls
mono_add_patch_info ()), the code pointed by the patch needs
to load the value from the got. For example, instead of:
call <ABSOLUTE ADDR>
it needs to do:
call *<OFFSET>(<GOT REG>)
Here, the <OFFSET> can be 0, it will be fixed up by the AOT compiler.
For more examples on the changes required, see
svn diff -r 37739:38213 mini-x86.c
* The Program Linkage Table
As in ELF, calls made from AOT code do not go through the GOT. Instead, a direct call is
made to an entry in the Program Linkage Table (PLT). This is based on the fact that on
most architectures, call instructions use a displacement instead of an absolute address, so
they are already position independent. An PLT entry is usually a jump instruction, which
initially points to some trampoline code which transfers control to the AOT loader, which
will compile the called method, and patch the PLT entry so that further calls are made
directly to the called method.
If the called method is in the same assembly, and does not need initialization (i.e. it
doesn't have GOT slots etc), then the call is made directly, bypassing the PLT.
* Implementation
----------------
** The Precompiled File Format
-----------------------------
We use the native object format of the platform. That way it
is possible to reuse existing tools like objdump and the
dynamic loader. All we need is a working assembler, i.e. we
write out a text file which is then passed to gas (the gnu
assembler) to generate the object file.
The precompiled image is stored in a file next to the original
assembly that is precompiled with the native extension for a shared
library (on Linux its ".so" to the generated file).
For example: basic.exe -> basic.exe.so; corlib.dll -> corlib.dll.so
To avoid symbol lookup overhead and to save space, some things like the
compiled code of the individual methods are not identified by specific symbols
like method_code_1234. Instead, they are stored in one big array and the
offsets inside this array are stored in another array, requiring just two
symbols. The offsets array is usually named 'FOO_offsets', where FOO is the
array the offsets refer to, like 'methods', and 'method_offsets'.
Generating code using an assembler and linker has some disadvantages:
- it requires GNU binutils or an equivalent package to be installed on the
machine running the aot compilation.
- it is slow.
There is some support in the aot compiler for directly emitting elf files, but
its not complete (yet).
The following things are saved in the object file and can be
looked up using the equivalent to dlsym:
mono_assembly_guid
A copy of the assembly GUID.
mono_aot_version
The format of the AOT file format.
mono_aot_opt_flags
The optimizations flags used to build this
precompiled image.
method_infos
Contains additional information needed by the runtime for using the
precompiled method, like the GOT entries it uses.
method_info_offsets
Maps method indexes to offsets in the method_infos array.
mono_icall_table
A table that lists all the internal calls
references by the precompiled image.
mono_image_table
A list of assemblies referenced by this AOT
module.
methods
The precompiled code itself.
method_offsets
Maps method indexes to offsets in the methods array.
ex_info
Contains information about methods which is rarely used during normal execution,
like exception and debug info.
ex_info_offsets
Maps method indexes to offsets in the ex_info array.
class_info
Contains precomputed metadata used to speed up various runtime functions.
class_info_offsets
Maps class indexes to offsets in the class_info array.
class_name_table
A hash table mapping class names to class indexes. Used to speed up
mono_class_from_name ().
plt
The Program Linkage Table
plt_info
Contains information needed to find the method belonging to a given PLT entry.
** Source file structure
-----------------------------
The AOT infrastructure is split into two files, aot-compiler.c and
aot-runtime.c. aot-compiler.c contains the AOT compiler which is invoked by
--aot, while aot-runtime.c contains the runtime support needed for loading
code and other things from the aot files.
** Compilation process
----------------------------
AOT compilation consists of the following stages:
- collecting the methods to be compiled.
- compiling them using the JIT.
- emitting the JITted code and other information into an assembly file (.s).
- assembling the file using the system assembler.
- linking the resulting object file into a shared library using the system
linker.
** Handling compiled code
----------------------------
Each method is identified by a method index. For normal methods, this is
equivalent to its index in the METHOD metadata table. For runtime generated
methods (wrappers), it is an arbitrary number.
Compiled code is created by invoking the JIT, requesting it to created AOT
code instead of normal code. This is done by the compile_method () function.
The output of the JIT is compiled code and a set of patches (relocations). Each
relocation specifies an offset inside the compiled code, and a runtime object
whose address is accessed at that offset.
Patches are described by a MonoJumpInfo structure. From the perspective
of the AOT compiler, there are two kinds of patches:
- calls, which require an entry in the PLT table.
- everything else, which require an entry in the GOT table.
How patches is handled is described in the next section.
After all the method are compiled, they are emitted into the output file into
a byte array called 'methods', The emission
is done by the emit_method_code () and emit_and_reloc_code () functions. Each
piece of compiled code is identified by the local symbol .Lm_<method index>.
While compiled code is emitted, all the locations which have an associated patch
are rewritten using a platform specific process so the final generated code will
refer to the plt and got entries belonging to the patches.
The compiled code array
can be accessed using the 'methods' global symbol.
** Handling patches
----------------------------
Before a piece of AOTed code can be used, the GOT entries used by it must be
filled out with the addresses of runtime objects. Those objects are identified
by MonoJumpInfo structures. These stuctures are saved in a serialized form in
the AOT file, so the AOT loader can deconstruct them. The serialization is done
by the encode_patch () function, while the deserialization is done by the
decode_patch_info () function.
Every method has an associated method info blob inside the 'method_info' byte
array in the AOT file. This contains all the information required to load the
method at runtime:
- the first got entry used by the method.
- the number of got entries used by the method.
- the serialized patch info for the got entries.
Some patches, like vtables, icalls are very common, so instead of emitting their
info every time they are used by a method, we emit the info only once into a
byte array named 'got_info', and only emit an index into this array for every
access.
** The Procedure Linkage Table (PLT)
------------------------------------
Our PLT is similar to the elf PLT, it is used to handle calls between methods.
If method A needs to call method B, then an entry is allocated in the PLT for
method B, and A calls that entry instead of B directly. This is useful because
in some cases the runtime needs to do some processing the first time B is
called.
There are two cases:
- if B is in another assembly, then it needs to be looked up, then JITted or the
corresponding AOT code needs to be found.
- if B is in the same assembly, but has got slots, then the got slots need to be
initialized.
If none of these cases is true, then the PLT is not used, and the call is made
directly to the native code of the target method.
A PLT entry is usually implemented by a jump though a jump table, where the
jump table entries are initially filled up with the address of a trampoline so
the runtime can get control, and after the native code of the called method is
created/found, the jump table entry is changed to point to the native code.
All PLT entries also embed a integer offset after the jump which indexes into
the 'plt_info' table, which stores the information required to find the called
method. The PLT is emitted by the emit_plt () function.
** Exception/Debug info
----------------------------
Each compiled method has some additional info generated by the JIT, usable
for debugging (IL offset-native offset maps) and exception handling
(saved registers, native offsets of try/catch clauses). Since this info is
rarely needed, it is saved into a separate byte array called 'ex_info'.
** Cached metadata
---------------------------
When the runtime loads a class, it needs to compute a variety of information
which is not readily available in the metadata, like the instance size,
vtable, whenever the class has a finalizer/type initializer etc. Computing this
information requires a lot of time, causes the loading of lots of metadata,
and it usually involves the creation of many runtime data structures
(MonoMethod/MonoMethodSignature etc), which are long living, and usually persist
for the lifetime of the app. To avoid this, we compute the required information
at aot compilation time, and save it into the aot image, into an array called
'class_info'. The runtime can query this information using the
mono_aot_get_cached_class_info () function, and if the information is available,
it can avoid computing it.
** Full AOT mode
-------------------------
Some platforms like the iphone prohibit JITted code, using technical and/or
legal means. This is a significant problem for the mono runtime, since it
generates a lot of code dynamically, using either the JIT or more low-level
code generation macros. To solve this, the AOT compiler is able to function in
full-aot or aot-only mode, where it generates and saves all the neccesary code
in the aot image, so at runtime, no code needs to be generated.
There are two kinds of code which needs to be considered:
- wrapper methods, that is methods whose IL is generated dynamically by the
runtime. They are handled by generating them in the add_wrappers () function,
then emitting them the same way as the 'normal' methods. The only problem is
that these methods do not have a methoddef token, so we need a separate table
in the aot image ('wrapper_info') to find their method index.
- trampolines and other small hand generated pieces of code. They are handled
in an ad-hoc way in the emit_trampolines () function.
* Performance considerations
----------------------------
Using AOT code is a trade-off which might lead to higher or
slower performance, depending on a lot of circumstances. Some
of these are:
- AOT code needs to be loaded from disk before being used, so
cold startup of an application using AOT code MIGHT be
slower than using JITed code. Warm startup (when the code is
already in the machines cache) should be faster. Also,
JITing code takes time, and the JIT compiler also need to
load additional metadata for the method from the disk, so
startup can be faster even in the cold startup case.
- AOT code is usually compiled with all optimizations turned
on, while JITted code is usually compiled with default
optimizations, so the generated code in the AOT case should
be faster.
- JITted code can directly access runtime data structures and
helper functions, while AOT code needs to go through an
indirection (the GOT) to access them, so it will be slower
and somewhat bigger as well.
- When JITting code, the JIT compiler needs to load a lot of
metadata about methods and types into memory.
- JITted code has better locality, meaning that if A method
calls B, then the native code for A and B is usually quite
close in memory, leading to better cache behaviour thus
improved performance. In contrast, the native code of
methods inside the AOT file is in a somewhat random order.
* Future Work
-------------
- Currently, when an AOT module is loaded, all of its
dependent assemblies are also loaded eagerly, and these
assemblies need to be exactly the same as the ones loaded
when the AOT module was created ('hard binding'). Non-hard
binding should be allowed.
- On x86, the generated code uses call 0, pop REG, add
GOTOFFSET, REG to materialize the GOT address. Newer
versions of gcc use a separate function to do this, maybe we
need to do the same.
- Currently, we get vtable addresses from the GOT. Another
solution would be to store the data from the vtables in the
.bss section, so accessing them would involve less
indirection.
+27
View File
@@ -0,0 +1,27 @@
Call Sites
Extracted from emails from Paolo Molaro
There are 3 basic different kinds of call sites:
1) normal calls:
call relative_displacement
2) virtual calls:
call *positive_offset(%register)
3) interface calls:
mov constant, %imt_register
call *negative_offset(%register)
The above is what happens on x86 and amd64, with different values of
%imt_register for each arch (this register is a constant, but it could
change with different mono builds, it should be likely one of
constants the runtime comunicates to the debugger). %register can
change depending on the callsite based on the register allocator
choices. Note that the constant for the interface calls won't
necessarily be a MonoMethod address: this could change in the future
to a simple number.
In all the 3 cases the JIT trampolines will need to inspect the call
site, but only in the first case the call site will be changed.
-3
View File
@@ -1,3 +0,0 @@
/.stamp
/*.html
/api-style.css
+4 -7
View File
@@ -10,20 +10,17 @@ ASSEMBLED_DOCS = \
convert.exe: convert.cs AgilityPack.dll
$(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll
monoapi.zip: monoapi.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
monoapi.zip : monoapi.tree
monoapi.tree: toc.xml docs.make
$(MDOC) assemble -o monoapi -f hb $<
mono-tools.zip: mono-tools.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
mono-tools.zip : mono-tools.tree
mono-tools.tree: mono-tools.config docs.make
$(MDOC) assemble -o mono-tools -f man $<
mono-file-formats.zip: mono-file-formats.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
mono-file-formats.zip : mono-file-formats.tree
mono-file-formats.tree: mono-file-formats.config docs.make
$(MDOC) assemble -o mono-file-formats -f man $<
.doc-stamp:
+330
View File
@@ -0,0 +1,330 @@
Exception Handling In the Mono Runtime
--------------------------------------
* Introduction
--------------
There are many types of exceptions which the runtime needs to
handle. These are:
- exceptions thrown from managed code using the 'throw' or 'rethrow' CIL
instructions.
- exceptions thrown by some IL instructions like InvalidCastException thrown
by the 'castclass' CIL instruction.
- exceptions thrown by runtime code
- synchronous signals received while in managed code
- synchronous signals received while in native code
- asynchronous signals
Since exception handling is very arch dependent, parts of the
exception handling code reside in the arch specific
exceptions-<ARCH>.c files. The architecture independent parts
are in mini-exceptions.c. The different exception types listed
above are generated in different parts of the runtime, but
ultimately, they all end up in the mono_handle_exception ()
function in mini-exceptions.c.
* Exceptions throw programmatically from managed code
-----------------------------------------------------
These exceptions are thrown from managed code using 'throw' or
'rethrow' CIL instructions. The JIT compiler will translate
them to a call to a helper function called
'mono_arch_throw/rethrow_exception'.
These helper functions do not exist at compile time, they are
created dynamically at run time by the code in the
exceptions-<ARCH>.c files.
They perform various stack manipulation magic, then call a
helper function usually named throw_exception (), which does
further processing in C code, then calls
mono_handle_exception() to do the rest.
* Exceptions thrown implicitly from managed code
------------------------------------------------
These exceptions are thrown by some IL instructions when
something goes wrong. When the JIT needs to throw such an
exception, it emits a forward conditional branch and remembers
its position, along with the exception which needs to be
emitted. This is usually done in macros named
EMIT_COND_SYSTEM_EXCEPTION in the mini-<ARCH>.c files.
After the machine code for the method is emitted, the JIT
calls the arch dependent mono_arch_emit_exceptions () function
which will add the exception throwing code to the end of the
method, and patches up the previous forward branches so they
will point to this code.
This has the advantage that the rarely-executed exception
throwing code is kept separate from the method body, leading
to better icache performance.
The exception throwing code braches to the dynamically
generated mono_arch_throw_corlib_exception helper function,
which will create the proper exception object, does some stack
manipulation, then calls throw_exception ().
* Exceptions thrown by runtime code
-----------------------------------
These exceptions are usually thrown by the implementations of
InternalCalls (icalls). First an appropriate exception object
is created with the help of various helper functions in
metadata/exception.c, which has a separate helper function for
allocating each kind of exception object used by the runtime
code. Then the mono_raise_exception () function is called to
actually throw the exception. That function never returns.
An example:
if (something_is_wrong)
mono_raise_exception (mono_get_exception_index_out_of_range ());
mono_raise_exception () simply passes the exception to the JIT
side through an API, where it will be received by helper
created by mono_arch_throw_exception (). From now on, it is
treated as an exception thrown from managed code.
* Synchronous signals
---------------------
For performance reasons, the runtime does not do same checks
required by the CLI spec. Instead, it relies on the CPU to do
them. The two main checks which are omitted are null-pointer
checks, and arithmetic checks. When a null pointer is
dereferenced by JITted code, the CPU will notify the kernel
through an interrupt, and the kernel will send a SIGSEGV
signal to the process. The runtime installs a signal handler
for SIGSEGV, which is sigsegv_signal_handler () in mini.c. The
signal handler creates the appropriate exception object and
calls mono_handle_exception () with it. Arithmetic exceptions
like division by zero are handled similarly.
* Synchronous signals in native code
------------------------------------
Receiving a signal such as SIGSEGV while in native code means
something very bad has happened. Because of this, the runtime
will abort after trying to print a managed plus a native stack
trace. The logic is in the mono_handle_native_sigsegv ()
function.
Note that there are two kinds of native code which can be the
source of the signal:
- code inside the runtime
- code inside a native library loaded by an application, ie. libgtk+
* Stack overflow checking
-------------------------
Stack overflow exceptions need special handling. When a thread
overflows its stack, the kernel sends it a normal SIGSEGV
signal, but the signal handler tries to execute on the same as
the thread leading to a further SIGSEGV which will terminate
the thread. A solution is to use an alternative signal stack
supported by UNIX operating systems through the sigaltstack
(2) system call. When a thread starts up, the runtime will
install an altstack using the mono_setup_altstack () function
in mini-exceptions.c. When a SIGSEGV is received, the signal
handler checks whenever the fault address is near the bottom
of the threads normal stack. If it is, a
StackOverflowException is created instead of a
NullPointerException. This exception is handled like any other
exception, with some minor differences.
There are two reasons why sigaltstack is disabled by default:
* The main problem with sigaltstack() is that the stack
employed by it is not visible to the GC and it is possible
that the GC will miss it.
* Working sigaltstack support is very much os/kernel/libc
dependent, so it is disabled by default.
* Asynchronous signals
----------------------
Async signals are used by the runtime to notify a thread that
it needs to change its state somehow. Currently, it is used
for implementing thread abort/suspend/resume.
Handling async signals correctly is a very hard problem,
since the receiving thread can be in basically any state upon
receipt of the signal. It can execute managed code, native
code, it can hold various managed/native locks, or it can be
in a process of acquiring them, it can be starting up,
shutting down etc. Most of the C APIs used by the runtime are
not asynch-signal safe, meaning it is not safe to call them
from an async signal handler. In particular, the pthread
locking functions are not async-safe, so if a signal handler
interrupted code which was in the process of acquiring a lock,
and the signal handler tries to acquire a lock, the thread
will deadlock. Unfortunately, the current signal handling
code does acquire locks, so sometimes it does deadlock.
When receiving an async signal, the signal handler first tries
to determine whenever the thread was executing managed code
when it was interrupted. If it did, then it is safe to
interrupt it, so a ThreadAbortException is constructed and
thrown. If the thread was executing native code, then it is
generally not safe to interrupt it. In this case, the runtime
sets a flag then returns from the signal handler. That flag is
checked every time the runtime returns from native code to
managed code, and the exception is thrown then. Also, a
platform specific mechanism is used to cause the thread to
interrupt any blocking operation it might be doing.
The async signal handler is in sigusr1_signal_handler () in
mini.c, while the logic which determines whenever an exception
is safe to be thrown is in mono_thread_request_interruption
().
* Stack unwinding during exception handling
-------------------------------------------
The execution state of a thread during exception handling is
stored in an arch-specific structure called MonoContext. This
structure contains the values of all the CPU registers
relevant during exception handling, which usually means:
- IP (instruction pointer)
- SP (stack pointer)
- FP (frame pointer)
- callee saved registers
Callee saved registers are the registers which are required by
any procedure to be saved/restored before/after using
them. They are usually defined by each platforms ABI
(Application Binary Interface). For example, on x86, they are
EBX, ESI and EDI.
The code which calls mono_handle_exception () is required to
construct the initial MonoContext. How this is done depends on
the caller. For exceptions thrown from managed code, the
mono_arch_throw_exception helper function saves the values of
the required registers and passes them to throw_exception (),
which will save them in the MonoContext structure. For
exceptions thrown from signal handlers, the MonoContext
stucture is initialized from the signal info received from the
kernel.
During exception handling, the runtime needs to 'unwind' the
stack, i.e. given the state of the thread at a stack frame,
construct the state at its callers. Since this is platform
specific, it is done by a platform specific function called
mono_arch_find_jit_info ().
Two kinds of stack frames need handling:
- Managed frames are easier. The JIT will store some
information about each managed method, like which
callee-saved registers it uses. Based on this information,
mono_arch_find_jit_info () can find the values of the
registers on the thread stack, and restore them.
- Native frames are problematic, since we have no information
about how to unwind through them. Some compilers generate
unwind information for code, some don't. Also, there is no
general purpose library to obtain and decode this unwind
information. So the runtime uses a different solution. When
managed code needs to call into native code, it does through
a managed->native wrapper function, which is generated by
the JIT. This function is responsible for saving the machine
state into a per-thread structure called MonoLMF (Last
Managed Frame). These LMF structures are stored on the
threads stack, and are linked together using one of their
fields. When the unwinder encounters a native frame, it
simply pops one entry of the LMF 'stack', and uses it to
restore the frame state to the moment before control passed
to native code. In effect, all successive native frames are
skipped together.
Problems/future work
--------------------
1. Async signal safety
----------------------
The current async signal handling code is not async safe, so
it can and does deadlock in practice. It needs to be rewritten
to avoid taking locks at least until it can determine that it
was interrupting managed code.
Another problem is the managed stack frame unwinding code. It
blindly assumes that if the IP points into a managed frame,
then all the callee saved registers + the stack pointer are
saved on the stack. This is not true if the thread was
interrupted while executing the method prolog/epilog.
2. Raising exceptions from native code
--------------------------------------
Currently, exceptions are raised by calling
mono_raise_exception () in the middle of runtime code. This
has two problems:
- No cleanup is done, ie. if the caller of the function which
throws an exception has taken locks, or allocated memory,
that is not cleaned up. For this reason, it is only safe to
call mono_raise_exception () 'very close' to managed code,
ie. in the icall functions themselves.
- To allow mono_raise_exception () to unwind through native
code, we need to save the LMF structures which can add a lot
of overhead even in the common case when no exception is
thrown. So this is not zero-cost exception handling.
An alternative might be to use a JNI style
set-pending-exception API. Runtime code could call
mono_set_pending_exception (), then return to its caller with
an error indication allowing the caller to clean up. When
execution returns to managed code, then managed->native
wrapper could check whenever there is a pending exception and
throw it if neccesary. Since we already check for pending
thread interruption, this would have no overhead, allowing us
to drop the LMF saving/restoring code, or significant parts of
it.
4. libunwind
------------
There is an OSS project called libunwind which is a standalone
stack unwinding library. It is currently in development, but
it is used by default by gcc on ia64 for its stack
unwinding. The mono runtime also uses it on ia64. It has
several advantages in relation to our current unwinding code:
- it has a platform independent API, i.e. the same unwinding
code can be used on multiple platforms.
- it can generate unwind tables which are correct at every
instruction, i.e. can be used for unwinding from async
signals.
- given sufficient unwind info generated by a C compiler, it
can unwind through C code.
- most of its API is async-safe
- it implements the gcc C++ exception handling API, so in
theory it can be used to implement mixed-language exception
handling (i.e. C++ exception caught in mono, mono exception
caught in C++).
- it is MIT licensed
The biggest problem with libuwind is its platform support. ia64 support is
complete/well tested, while support for other platforms is missing/incomplete.
http://www.hpl.hp.com/research/linux/libunwind/
+223
View File
@@ -0,0 +1,223 @@
-*- outline -*-
Generic code sharing
====================
* Porting
** Generic class init trampoline
The generic class init trampoline is very similar to the class init
trampoline, with the exception that the VTable of the class to be
inited is passed in a register, MONO_ARCH_VTABLE_REG. That register
can be the same as the IMT register.
The call to the generic class init trampoline is never patched because
the VTable is not constant - it depends on the type arguments of the
class/method doing the call to the trampoline. For that reason, the
trampoline needs a fast path for the case that the class is already
inited, i.e. the trampoline needs to check the initialized bit of the
MonoVTable and immediately return if it is set. See tramp-x86.c for
how to portably figure out the number of the bit in the bit-field that
needs to be checked.
Since the MONO_ARCH_VTABLE_REG is needed by the generic class init
trampoline function (in mini-trampolines.c) it needs to be saved by
the generic trampoline code in the register save block which is passed
to the trampoline. This also applies to the RGCTX fetch trampoline
(see below).
Like the normal class init trampoline, the result of the generic class
init trampoline function is not a pointer to code that needs to be
jumped to. Instead, just like for the class init trampoline, the
generic trampoline code must return to the caller instead of jumping
to the returned value. The same applies for the RGCTX fetch
trampoline (see below).
** RGCTX register
Generic shared code needs access to type information. This
information is contained in a RGCTX for non-generic methods and in an
MRGCTX for generic methods. It is passed in one of several ways,
depending on the type of the called method:
1. Non-generic non-static methods of reference types have access to
the RGCTX via the "this" argument (this->vtable->rgctx).
2. Non-generic static methods of reference types and non-generic
methods of value types need to be passed a pointer to the
caller's class's VTable in the MONO_ARCH_RGCTX_REG register.
3. Generic methods need to be passed a pointer to the MRGCTX in the
MONO_ARCH_RGCTX_REG register.
The MONO_ARCH_RGCTX_REG must not be clobbered by trampolines.
MONO_ARCH_RGCTX_REG can be the same as the IMT register for now, but
this might change in the future when we implement virtual generic
method calls (more) efficiently.
This register lifetime starts at the call site that loads it and
ends in the callee prologue when it is either discarded or stored
into a local variable.
It's better to avoid registers used for argument passing for the RGCTX
as it would make the code dealing with calling conventions code a lot
harder.
** Method prologue
Generic shared code that have a RGCTX receive it in RGCTX_REG. There
must be a check in mono_arch_emit_prolog for MonoCompile::rgctx_var
and if set store it. See mini-x86.c for reference.
** Dealing with types
Types passed to arch functions might be type parameters
(MONO_TYPE_(M)VAR) if the MonoGenericSharingContext* argument is
non-NULL. For example, an argument or return type in a method passed
to mono_arch_find_this_argument() could be a MONO_TYPE_VAR. To guard
for that case use mini_get_basic_type_from_generic() on the type. See
get_call_info() in mini-x86.c, for example.
** (M)RGCTX lazy fetch trampoline
The purpose of the lazy fetch trampoline is to fetch a slot from an
(M)RGCTX which might not be inited, yet. In the latter case, it needs
to go make a transition to unmanaged code to fill the slot. This is
the layout of a RGCTX:
+---------------------------------+
| next | slot 0 | slot 1 | slot 2 |
+--|------------------------------+
|
+-----+
| +---------------------------------
+->| next | slot 3 | slot 4 | slot 5 ....
+--|------------------------------
|
+-----+
| +------------------------------------
+->| next | slot 10 | slot 11 | slot 12 ....
+--|---------------------------------
.
.
.
For fetching a slot from a RGCTX the trampoline is passed a pointer
(as a normal integer argument) to the VTable. From there it has to
fetch the pointer to the RGCTX, which might be null. Then it has to
traverse the correct number of "next" links, each of which might be
NULL. Arriving at the right array it needs to fetch the slot, which
might also be NULL. If any of the NULL cases, the trampoline must
transition to unmanaged code to potentially setup the RGCTX and fill
the slot. Here is pseudo-code for fetching slot 11:
; vtable ptr in r1
; fetch RGCTX array 0
r2 = *(r1 + offsetof(MonoVTable, runtime_generic_context))
if r2 == NULL goto unmanaged
; fetch RGCTX array 1
r2 = *r2
if r2 == NULL goto unmanaged
; fetch RGCTX array 2
r2 = *r2
if r2 == NULL goto unmanaged
; fetch slot 11
r2 = *(r2 + 2 * sizeof (gpointer))
if r2 == NULL goto unmanaged
return r2
unmanaged:
jump unmanaged_fetch_code
The number of slots in the arrays must be obtained from the function
mono_class_rgctx_get_array_size().
The MRGCTX case is different in two aspects. First, the trampoline is
not passed a pointer to a VTable, but a pointer directly to the
MRGCTX, which is guaranteed not to be NULL (any of the next pointers
and any of the slots can be NULL, though). Second, the layout of the
first array is slightly different, in that the first two slots are
occupied by a pointers to the class's VTable and to the method's
method_inst. The next pointer is in the third slot and the first
actual slot, "slot 0", in the fourth:
+--------------------------------------------------------+
| vtable | method_inst | next | slot 0 | slot 1 | slot 2 |
+-------------------------|------------------------------+
.
.
All other arrays have the same layout as the RGCTX ones, except
possibly for their length.
The function to create the trampoline,
mono_arch_create_rgctx_lazy_fetch_trampoline(), gets passed an encoded
slot number. Use the macro MONO_RGCTX_SLOT_IS_MRGCTX to query whether
a trampoline for an MRGCTX is needed, as opposed to one for a RGCTX.
Use MONO_RGCTX_SLOT_INDEX to get the index of the slot (like 2 for
"slot 2" as above).
The unmanaged fetch code is yet another trampoline created via
mono_arch_create_specific_trampoline(), of type
MONO_TRAMPOLINE_RGCTX_LAZY_FETCH. It's given the slot number as the
trampoline argument. In addition, the pointer to the VTable/MRGCTX is
passed in MONO_ARCH_VTABLE_REG (like the VTable to the generic class
init trampoline - see above).
Like the class init and generic class init trampolines, the RGCTX
fetch trampoline code doesn't return code that must be jumped to, so,
like for those trampolines (see above), the generic trampoline code
must do a normal return instead.
* Getting generics information about a stack frame
If a method is compiled with generic sharing, its MonoJitInfo has
has_generic_jit_info set. In that case, the MonoJitInfo is followed
(after the MonoJitExceptionInfo array) by a MonoGenericJitInfo.
The MonoGenericJitInfo contains information about the location of the
this/vtable/MRGCTX variable, if the has_this flag is set. If that is
the case, there are two possibilities:
1. this_in_reg is set. this_reg is the number of the register where
the variable is stored.
2. this_in_reg is not set. The variable is stored at offset
this_offset from the address in the register with number
this_reg.
The variable can either point to the "this" object, to a vtable or to
an MRGCTX:
1. If the method is a non-generic non-static method of a reference
type, the variable points to the "this" object.
2. If the method is a non-generic static method or a non-generic
method of a value type, the variable points to the vtable of the
class.
3. If the method is a generic method, the variable points to the
MRGCTX of the method.
* Layout of the MRGCTX
The MRGCTX is a structure that starts with
MonoMethodRuntimeGenericContext, which contains a pointer to the
vtable of the class and a pointer to the MonoGenericInst with the type
arguments for the method.
* Blog posts about generic code sharing
http://schani.wordpress.com/2007/09/22/generics-sharing-in-mono/
http://schani.wordpress.com/2007/10/12/the-trouble-with-shared-generics/
http://schani.wordpress.com/2007/10/15/a-quick-generics-sharing-update/
http://schani.wordpress.com/2008/01/29/other-types/
http://schani.wordpress.com/2008/02/25/generic-types-are-lazy/
http://schani.wordpress.com/2008/03/10/sharing-static-methods/
http://schani.wordpress.com/2008/04/22/sharing-everything-and-saving-memory/
http://schani.wordpress.com/2008/06/02/sharing-generic-methods/
http://schani.wordpress.com/2008/06/27/another-generic-sharing-update/
+283
View File
@@ -0,0 +1,283 @@
Register Allocation
===================
The current JIT implementation uses a tree matcher to generate code. We use a
simple algorithm to allocate registers in trees, and limit the number of used
temporary register to 4 when evaluating trees. So we can use 2 registers for
global register allocation.
Register Allocation for Trees
=============================
We always evaluate trees from left to right. When there are no more registers
available we need to spill values to memory. Here is the simplified algorithm.
gboolean
tree_allocate_regs (tree, exclude_reg)
{
if (!tree_allocate_regs (tree->left, -1))
return FALSE;
if (!tree_allocate_regs (tree->right, -1)) {
tree->left->spilled == TRUE;
free_used_regs (tree->left);
if (!tree_allocate_regs (tree->right, tree->left->reg))
return FALSE;
}
free_used_regs (tree->left);
free_used_regs (tree->right);
/* try to allocate a register (reg != exclude_reg) */
if ((tree->reg = next_free_reg (exclude_reg)) != -1)
return TRUE;
return FALSE;
}
The emit routing actually spills the registers:
tree_emit (tree)
{
tree_emit (tree->left);
if (tree->left->spilled)
save_reg (tree->left->reg);
tree_emit (tree->right);
if (tree->left->spilled)
restore_reg (tree->left->reg);
emit_code (tree);
}
Global Register Allocation
==========================
TODO.
Local Register Allocation
=========================
This section describes the cross-platform local register allocator which is
in the file mini-codegen.c.
The input to the allocator is a basic block which contains linear IL, ie.
instructions of the form:
DEST <- SRC1 OP SRC2
where DEST, SRC1, and SRC2 are virtual registers (vregs). The job of the
allocator is to assign hard or physical registers (hregs) to each virtual
registers so the vreg references in the instructions can be replaced with their
assigned hreg, allowing machine code to be generated later.
The allocator needs information about the number and types of arguments of
instructions. It takes this information from the machine description files. It
also needs arch specific information, like the number and type of the hard
registers. It gets this information from arch-specific macros.
Currently, the vregs and hregs are partitioned into two classes: integer and
floating point.
The allocator consists of two phases: In the first phase, a forward pass is
made over the instructions, collecting liveness information for vregs. In the
second phase, a backward pass is made over the instructions, assigning
registers. This backward mode of operation makes understanding the allocator
somewhat difficult to understand, but leads to better code in most cases.
Allocator state
===============
The state of the allocator is stored in two arrays: iassign and isymbolic.
iassign maps vregs to hregs, while isymbolic is the opposite.
For a vreg, iassign [vreg] can contain the following values:
* -1 vreg has no assigned hreg
* hreg index (>= 0) vreg is assigned to the given hreg. This means
later instructions (which we have already
processed due to the backward direction) expect
the value of vreg to be found in hreg.
* spill slot index (< -1) vreg is spilled to the given spill slot. This
means later instructions expect the value of
vreg to be found on the stack in the given
spill slot.
Also, the allocator keeps track of which hregs are free and which are used.
This information is stored in a bitmask called ifree_mask.
There is a similar set of data structures for floating point registers.
Spilling
========
When an allocator needs a free hreg, but all of them are assigned, it needs to
free up one of them. It does this by spilling the contents of the vreg which
is currently assigned to the selected hreg. Since later instructions expect
the vreg to be found in the selected hreg, the allocator emits a spill-load
instruction to load the value from the spill slot into the hreg after the
currently processed instruction. When the vreg which is spilled is a
destination in an instruction, the allocator will emit a spill-store to store
the value into the spill slot.
Fixed registers
===============
Some architectures, notably x86/amd64 require that the arguments/results of
some instructions be assigned to specific hregs. An example is the shift
opcodes on x86, where the second argument must be in ECX. The allocator
has support for this. It tries to allocate the vreg to the required hreg. If
thats not possible, then it will emit compensation code which moves values to
the correct registers before/after the instruction.
Fixed registers are mainly used on x86, but they are useful on more regular
architectures on well, for example to model that after a call instruction, the
return of the call is in a specific register.
A special case of fixed registers is two address architectures, like the x86,
where the instructions place their results into their first argument. This is
modelled in the allocator by allocating SRC1 and DEST to the same hreg.
Global registers
================
Some variables might already be allocated to hardware registers during the
global allocation phase. In this case, SRC1, SRC2 and DEST might already be
a hardware register. The allocator needs to do nothing in this case, except
when the architecture uses fixed registers, in which case it needs to emit
compensation code.
Register pairs
==============
64 bit arithmetic on 32 bit machines requires instructions whose arguments are
not registers, but register pairs. The allocator has support for this, both
for freely allocatable register pairs, and for register pairs which are
constrained to specific hregs (EDX:EAX on x86).
Floating point stack
====================
The x86 architecture uses a floating point register stack instead of a set of
fp registers. The allocator supports this by keeping track of the height of the
fp stack, and spilling/loading values from the stack as neccesary.
Calls
=====
Calls need special handling for two reasons: first, they will clobber all
caller-save registers, meaning their contents will need to be spilled. Also,
some architectures pass arguments in registers. The registers used for
passing arguments are usually the same as the ones used for local allocation,
so the allocator needs to handle them specially. This is done as follows:
the MonoInst for the call instruction contains a map mapping vregs which
contain the argument values to hregs where the argument needs to be placed,
like this (on amd64):
R33 -> RDI
R34 -> RSI
...
When the allocator processes the call instruction, it allocates the vregs
in the map to their associated hregs. So the call instruction is processed as
if having a variable number of arguments which fixed register assignments.
An example:
R33 <- 1
R34 <- 2
call
When the call instruction is processed, R33 is assigned to RDI, and R34 is
assigned to RSI. Later, when the two assignment instructions are processed,
R33 and R34 are already assigned to a hreg, so they are replaced with the
associated hreg leading to the following final code:
RDI <- 1
RSI <- 1
call
Machine description files
=========================
A typical entry in the machine description files looks like this:
shl: dest:i src1:i src2:s clob:1 len:2
The allocator is only interested in the dest,src1,src2 and clob fields.
It understands the following values for the dest, src1, src2 fields:
i - integer register
f - fp register
b - base register (same as i, but the instruction does not modify the reg)
m - fp register, even if an fp stack is used (no fp stack tracking)
It understands the following values for the clob field:
1 - sreg1 needs to be the same as dreg
c - instruction clobbers the caller-save registers
Beside these values, an architecture can define additional values (like the 's'
in the example). The allocator depends on a set of arch-specific macros to
convert these values to information it needs during allocation.
Arch specific macros
====================
These macros usually receive a value from the machine description file (like
the 's' in the example). The examples below are for x86.
/*
* A bitmask selecting the caller-save registers (these are used for local
* allocation).
*/
#define MONO_ARCH_CALLEE_REGS X86_CALLEE_REGS
/*
* A bitmask selecting the callee-saved registers (these are usually used for
* global allocation).
*/
#define MONO_ARCH_CALLEE_SAVED_REGS X86_CALLER_REGS
/* Same for the floating point registers */
#define MONO_ARCH_CALLEE_FREGS 0
#define MONO_ARCH_CALLEE_SAVED_FREGS 0
/* Whenever the target uses a floating point stack */
#define MONO_ARCH_USE_FPSTACK TRUE
/* The size of the floating point stack */
#define MONO_ARCH_FPSTACK_SIZE 6
/*
* Given a descriptor value from the machine description file, return the fixed
* hard reg corresponding to that value.
*/
#define MONO_ARCH_INST_FIXED_REG(desc) ((desc == 's') ? X86_ECX : ((desc == 'a') ? X86_EAX : ((desc == 'd') ? X86_EDX : ((desc == 'y') ? X86_EAX : ((desc == 'l') ? X86_EAX : -1)))))
/*
* A bitmask selecting the hregs which can be used for allocating sreg2 for
* a given instruction.
*/
#define MONO_ARCH_INST_SREG2_MASK(ins) (((ins [MONO_INST_CLOB] == 'a') || (ins [MONO_INST_CLOB] == 'd')) ? (1 << X86_EDX) : 0)
/*
* Given a descriptor value, return whenever it denotes a register pair.
*/
#define MONO_ARCH_INST_IS_REGPAIR(desc) (desc == 'l' || desc == 'L')
/*
* Given a descriptor value, and the first register of a regpair, return a
* bitmask selecting the hregs which can be used for allocating the second
* register of the regpair.
*/
#define MONO_ARCH_INST_REGPAIR_REG2(desc,hreg1) (desc == 'l' ? X86_EDX : -1)
+32
View File
@@ -0,0 +1,32 @@
Metadata memory management
--------------------------
Most metadata structures have a lifetime which is equal to the MonoImage where they are
loaded from. These structures should be allocated from the memory pool of the
corresponding MonoImage. The memory pool is protected by the loader lock.
Examples of metadata structures in this category:
- MonoClass
- MonoMethod
- MonoType
Memory owned by these structures should be allocated from the image mempool as well.
Examples include: klass->methods, klass->fields, method->signature etc.
Generics complicates things. A generic class could have many instantinations where the
generic arguments are from different assemblies. Where should we allocate memory for
instantinations ? We can allocate from the mempool of the image which contains the
generic type definition, but that would mean that the instantinations would remain in
memory even after the assemblies containing their type arguments are unloaded, leading
to a memory leak. Therefore, we do the following:
- data structures representing the generic definitions are allocated from the image
mempool as usual. These include:
- generic class definition (MonoGenericClass->container_class)
- generic method definitions
- type parameters (MonoGenericParam)
- data structures representing inflated classes/images are allocated from the heap. These
structures are kept in a cache, indexed by type arguments of the instantinations. When
an assembly is unloaded, this cache is searched and all instantinations referencing
types from the assembly are freed. This is done by mono_metadata_clean_for_image ()
in metadata.c. The structures handled this way include:
- MonoGenericClass
- MonoGenericInst
- inflated MonoMethods
+478
View File
@@ -0,0 +1,478 @@
Mono JIT porting guide.
Paolo Molaro ([email protected])
* Introduction
This documents describes the process of porting the mono JIT
to a new CPU architecture. The new mono JIT has been designed
to make porting easier though at the same time enable the port
to take full advantage from the new architecture features and
instructions. Knowledge of the mini architecture (described in
the mini-doc.txt file) is a requirement for understanding this
guide, as well as an earlier document about porting the mono
interpreter (available on the web site).
There are six main areas that a port needs to implement to
have a fully-functional JIT for a given architecture:
1) instruction selection
2) native code emission
3) call conventions and register allocation
4) method trampolines
5) exception handling
6) minor helper methods
To take advantage of some not-so-common processor features
(for example conditional execution of instructions as may be
found on ARM or ia64), it may be needed to develop an
high-level optimization, but doing so is not a requirement for
getting the JIT to work.
We'll see in more details each of the steps required, note,
though, that a new port may just as well start from a
cut&paste of an existing port to a similar architecture (for
example from x86 to amd64, or from powerpc to sparc).
The architecture specific code is split from the rest of the
JIT, for example the x86 specific code and data is all
included in the following files in the distribution:
mini-x86.h mini-x86.c
inssel-x86.brg
cpu-pentium.md
tramp-x86.c
exceptions-x86.c
I suggest a similar split for other architectures as well.
Note that this document is still incomplete: some sections are
only sketched and some are missing, but the important info to
get a port going is already described.
* Architecture-specific instructions and instruction selection.
The JIT already provides a set of instructions that can be
easily mapped to a great variety of different processor
instructions. Sometimes it may be necessary or advisable to
add a new instruction that represent more closely an
instruction in the architecture. Note that a mini instruction
can be used to represent also a short sequence of CPU
low-level instructions, but note that each instruction
represents the minimum amount of code the instruction
scheduler will handle (i.e., the scheduler won't schedule the
instructions that compose the low-level sequence as individual
instructions, but just the whole sequence, as an indivisible
block).
New instructions are created by adding a line in the
mini-ops.h file, assigning an opcode and a name. To specify
the input and output for the instruction, there are two
different places, depending on the context in which the
instruction gets used.
If the instruction is used in the tree representation, the
input and output types are defined by the BURG rules in the
*.brg files (the usual non-terminals are 'reg' to represent a
normal register, 'lreg' to represent a register or two that
hold a 64 bit value, freg for a floating point register).
If an instruction is used as a low-level CPU instruction, the
info is specified in a machine description file. The
description file is processed by the genmdesc program to
provide a data structure that can be easily used from C code
to query the needed info about the instruction.
As an example, let's consider the add instruction for both x86
and ppc:
x86 version:
add: dest:i src1:i src2:i len:2 clob:1
ppc version:
add: dest:i src1:i src2:i len:4
Note that the instruction takes two input integer registers on
both CPU, but on x86 the first source register is clobbered
(clob:1) and the length in bytes of the instruction differs.
Note that integer adds and floating point adds use different
opcodes, unlike the IL language (64 bit add is done with two
instructions on 32 bit architectures, using a add that sets
the carry and an add with carry).
A specific CPU port may assign any meaning to the clob field
for an instruction since the value will be processed in an
arch-specific file anyway.
See the top of the existing cpu-pentium.md file for more info
on other fields: the info may or may not be applicable to a
different CPU, in this latter case the info can be ignored.
The code in mini.c together with the BURG rules in inssel.brg,
inssel-float.brg and inssel-long32.brg provides general
purpose mappings from the tree representation to a set of
instructions that should be easily implemented in any
architecture. To allow for additional arch-specific
functionality, an arch-specific BURG file can be used: in this
file arch-specific instructions can be selected that provide
better performance than the general instructions or that
provide functionality that is needed by the JIT but that
cannot be expressed in a general enough way.
As an example, x86 has the special instruction "push" to make
it easier to implement the default call convention (passing
arguments on the stack): almost all the other architectures
don't have such an instruction (and don't need it anyway), so
we added a special rule in the inssel-x86.brg file for it.
So, one of the first things needed in a port is to write a
cpu-$(arch).md machine description file and fill it with the
needed info. As a start, only a few instructions can be
specified, like the ones required to do simple integer
operations. The default rules of the instruction selector will
emit the common instructions and so we're ready to go for the
next step in porting the JIT.
*) Native code emission
Since the first step in porting mono to a new CPU is to port
the interpreter, there should be already a file that allows
the emission of binary native code in a buffer for the
architecture. This file should be placed in the
mono/arch/$(arch)/
directory.
The bulk of the code emission happens in the mini-$(arch).c
file, in a function called mono_arch_output_basic_block
(). This function takes a basic block, walks the list of
instructions in the block and emits the binary code for each.
Optionally a peephole optimization pass is done on the basic
block, but this can be left for later, when the port actually
works.
This function is very simple, there is just a big switch on
the instruction opcode and in the corresponding case the
functions or macros to emit the binary native code are
used. Note that in this function the lengths of the
instructions are used to determine if the buffer for the code
needs enlarging.
To complete the code emission for a method, a few other
functions need implementing as well:
mono_arch_emit_prolog ()
mono_arch_emit_epilog ()
mono_arch_patch_code ()
mono_arch_emit_prolog () will emit the code to setup the stack
frame for a method, optionally call the callbacks used in
profiling and tracing, and move the arguments to their home
location (in a caller-save register if the variable was
allocated to one, or in a stack location if the argument was
passed in a volatile register and wasn't allocated a
non-volatile one). caller-save registers used by the function
are saved in the prolog as well.
mono_arch_emit_epilog () will emit the code needed to return
from the function, optionally calling the profiling or tracing
callbacks. At this point the basic blocks or the code that was
moved out of the normal flow for the function can be emitted
as well (this is usually done to provide better info for the
static branch predictor). In the epilog, caller-save
registers are restored if they were used.
Note that, to help exception handling and stack unwinding,
when there is a transition from managed to unmanaged code,
some special processing needs to be done (basically, saving
all the registers and setting up the links in the Last Managed
Frame structure).
When the epilog has been emitted, the upper level code
arranges for the buffer of memory that contains the native
code to be copied in an area of executable memory and at this
point, instructions that use relative addressing need to be
patched to have the right offsets: this work is done by
mono_arch_patch_code ().
* Call conventions and register allocation
To account for the differences in the call conventions, a few functions need to
be implemented.
mono_arch_allocate_vars () assigns to both arguments and local
variables the offset relative to the frame register where they
are stored, dead variables are simply discarded. The total
amount of stack needed is calculated.
mono_arch_call_opcode () is the function that more closely
deals with the call convention on a given system. For each
argument to a function call, an instruction is created that
actually puts the argument where needed, be it the stack or a
specific register. This function can also re-arrange th order
of evaluation when multiple arguments are involved if needed
(like, on x86 arguments are pushed on the stack in reverse
order). The function needs to carefully take into accounts
platform specific issues, like how structures are returned as
well as the differences in size and/or alignment of managed
and corresponding unmanaged structures.
The other chunk of code that needs to deal with the call
convention and other specifics of a CPU, is the local register
allocator, implemented in a function named
mono_arch_local_regalloc (). The local allocator deals with a
basic block at a time and basically just allocates registers
for temporary values during expression evaluation, spilling
and unspilling as necessary.
The local allocator needs to take into account clobbering
information, both during simple instructions and during
function calls and it needs to deal with other
architecture-specific weirdnesses, like instructions that take
inputs only in specific registers or output only is some.
Some effort will be put later in moving most of the local
register allocator to a common file so that the code can be
shared more for similar, risc-like CPUs. The register
allocator does a first pass on the instructions in a block,
collecting liveness information and in a backward pass on the
same list performs the actual register allocation, inserting
the instructions needed to spill values, if necessary.
The cross-platform local register allocator is now implemented
and it is documented in the jit-regalloc file.
When this part of code is implemented, some testing can be
done with the generated code for the new architecture. Most
helpful is the use of the --regression command line switch to
run the regression tests (basic.cs, for example).
Note that the JIT will try to initialize the runtime, but it
may not be able yet to compile and execute complex code:
commenting most of the code in the mini_init() function in
mini.c is needed to let the JIT just compile the regression
tests. Also, using multiple -v switches on the command line
makes the JIT dump an increasing amount of information during
compilation.
Values loaded into registers need to be extened as needed by
the ECMA specs:
*) integers smaller than 4 bytes are extended to int32 values
*) 32 bit floats are extended to double precision (in particular
this means that currently all the floating point operations operate
on doubles)
* Method trampolines
To get better startup performance, the JIT actually compiles a
method only when needed. To achieve this, when a call to a
method is compiled, we actually emit a call to a magic
trampoline. The magic trampoline is a function written in
assembly that invokes the compiler to compile the given method
and jumps to the newly compiled code, ensuring the arguments
it received are passed correctly to the actual method.
Before jumping to the new code, though, the magic trampoline
takes care of patching the call site so that next time the
call will go directly to the method instead of the
trampoline. How does this all work?
mono_arch_create_jit_trampoline () creates a small function
that just preserves the arguments passed to it and adds an
additional argument (the method to compile) before calling the
generic trampoline. This small function is called the specific
trampoline, because it is method-specific (the method to
compile is hard-code in the instruction stream).
The generic trampoline saves all the arguments that could get
clobbered and calls a C function that will do two things:
*) actually call the JIT to compile the method
*) identify the calling code so that it can be patched to call directly
the actual method
If the 'this' argument to a method is a boxed valuetype that
is passed to a method that expects just a pointer to the data,
an additional unboxing trampoline will need to be inserted as
well.
* Exception handling
Exception handling is likely the most difficult part of the
port, as it needs to deal with unwinding (both managed and
unmanaged code) and calling catch and filter blocks. It also
needs to deal with signals, because mono takes advantage of
the MMU in the CPU and of the operation system to handle
dereferences of the NULL pointer. Some of the function needed
to implement the mechanisms are:
mono_arch_get_throw_exception () returns a function that takes
an exception object and invokes an arch-specific function that
will enter the exception processing. To do so, all the
relevant registers need to be saved and passed on.
mono_arch_handle_exception () this function takes the
exception thrown and a context that describes the state of the
CPU at the time the exception was thrown. The function needs
to implement the exception handling mechanism, so it makes a
search for an handler for the exception and if none is found,
it follows the unhandled exception path (that can print a
trace and exit or just abort the current thread). The
difficulty here is to unwind the stack correctly, by restoring
the register state at each call site in the call chain,
calling finally, filters and handler blocks while doing so.
As part of exception handling a couple of internal calls need
to be implemented as well.
ves_icall_get_frame_info () returns info about a specific
frame.
mono_jit_walk_stack () walks the stack and calls a callback with info for
each frame found.
ves_icall_get_trace () return an array of StackFrame objects.
** Code generation for filter/finally handlers
Filter and finally handlers are called from 2 different locations:
1.) from within the method containing the exception clauses
2.) from the stack unwinding code
To make this possible we implement them like subroutines,
ending with a "return" statement. The subroutine does not save
the base pointer, because we need access to the local
variables of the enclosing method. Its is possible that
instructions inside those handlers modify the stack pointer,
thus we save the stack pointer at the start of the handler,
and restore it at the end. We have to use a "call" instruction
to execute such finally handlers.
The MIR code for filter and finally handlers looks like:
OP_START_HANDLER
...
OP_END_FINALLY | OP_ENDFILTER(reg)
OP_START_HANDLER: should save the stack pointer somewhere
OP_END_FINALLY: restores the stack pointers and returns.
OP_ENDFILTER (reg): restores the stack pointers and returns the value in "reg".
** Calling finally/filter handlers
There is a special opcode to call those handler, its called
OP_CALL_HANDLER. It simple emits a call instruction.
Its a bit more complex to call handler from outside (in the
stack unwinding code), because we have to restore the whole
context of the method first. After that we simply emit a call
instruction to invoke the handler. Its usually possible to use
the same code to call filter and finally handlers (see
arch_get_call_filter).
** Calling catch handlers
Catch handlers are always called from the stack unwinding
code. Unlike finally clauses or filters, catch handler never
return. Instead we simply restore the whole context, and
restart execution at the catch handler.
** Passing Exception objects to catch handlers and filters.
We use a local variable to store exception objects. The stack
unwinding code must store the exception object into this
variable before calling catch handler or filter.
* Minor helper methods
A few minor helper methods are referenced from the arch-independent code.
Some of them are:
*) mono_arch_cpu_optimizations ()
This function returns a mask of optimizations that
should be enabled for the current CPU and a mask of
optimizations that should be excluded, instead.
*) mono_arch_regname ()
Returns the name for a numeric register.
*) mono_arch_get_allocatable_int_vars ()
Returns a list of variables that can be allocated to
the integer registers in the current architecture.
*) mono_arch_get_global_int_regs ()
Returns a list of caller-save registers that can be
used to allocate variables in the current method.
*) mono_arch_instrument_mem_needs ()
*) mono_arch_instrument_prolog ()
*) mono_arch_instrument_epilog ()
Functions needed to implement the profiling interface.
* Testing the port
The JIT has a set of regression tests in *.cs files inside the mini directory.
The usual method of testing a port is by compiling these tests on another machine
with a working runtime by typing 'make rcheck', then copying TestDriver.dll and
*.exe to the mini directory. The tests can be run by typing:
./mono --regression <exe file name>
The suggested order for working through these tests is the following:
- basic.exe
- basic-long.exe
- basic-float.exe
- basic-calls.exe
- objects.exe
- arrays.exe
- exceptions.exe
- iltests.exe
- generics.exe
* Writing regression tests
Regression tests for the JIT should be written for any bug
found in the JIT in one of the *.cs files in the mini
directory. Eventually all the operations of the JIT should be
tested (including the ones that get selected only when some
specific optimization is enabled).
* Platform specific optimizations
An example of a platform-specific optimization is the peephole
optimization: we look at a small window of code at a time and
we replace one or more instructions with others that perform
better for the given architecture or CPU.
* 64 bit support tips, by Zoltan Varga ([email protected])
For a 64-bit port of the Mono runtime, you will typically do
the following:
* need to use inssel-long.brg instead of
inssel-long32.brg.
* need to implement lots of new opcodes:
OP_I<OP> is 32 bit op
OP_L<OP> and CEE_<OP> are 64 bit ops
The 64 bit version of an existing port might share the code
with the 32 bit port (for example SPARC/SPARV9), or it might
be separate (x86/AMD64).
That will depend on the similarities of the two instructions
sets/ABIs etc.
The runtime and most parts of the JIT are 64 bit clean
at this point, so the only parts which require changing are
the arch dependent files.
+2 -1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<monodoc>
<source provider="man" basefile="mono-file-formats" path="man"/>
<node label="Mono File Formats" name="mono-formats" parent="formats" />
<source provider="man" basefile="mono-file-formats" path="mono-formats"/>
</monodoc>
+2 -1
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<monodoc>
<source provider="man" basefile="mono-tools" path="man"/>
<node label="Mono Development Tools" name="dev-tools" parent="tools" />
<source provider="man" basefile="mono-tools" path="dev-tools"/>
</monodoc>
+1 -2
View File
@@ -23,8 +23,7 @@ typedef struct {
@API_IDX@
</div>
<a name="cil_assembly_load"/>
<h3>Assembly Loading</h3>
<h4><a name="api:mono_assembly_open">mono_assembly_open</a></h4>
+2 -4
View File
@@ -1,8 +1,7 @@
<h2>Image Manipulation</h2>
<p>Images are the component of assemblies that actually hold
the CIL code and <a href="mono-api-metadata.html">metadata</a>
in the extended PE/COFF file.
the CIL code in the extended PE/COFF file.
<h3>Synopsis</h3>
@@ -24,8 +23,7 @@ typedef enum {
<p>Images are the actual elements in the runtime that contain
the actual code being executed.
<a name="cil_image_open"/>
<h3>Opening and closing MonoImages</h3>
<h4><a name="api:mono_image_open">mono_image_open</a></h4>
+53 -656
View File
@@ -1,650 +1,47 @@
<h1>Metadata Reading</h1>
<h3>Metadata Loader Locking</h3>
<p>The Metadata API gives developers low-level access to the
information encoded in CLI modules: type and
methods definitions encoded in metadata as well as access to
the CIL code and embedded resources.
<p>Managed developers access this information using either the
System.Reflection API or a library
like <a href="http://www.mono-project.com/Cecil">Cecil</a>.
<p>To start using the Metadata API it is necessary
to <a href="mono-api-assembly.html#cil_assembly_load">open an
assembly</a> or a CIL image (a .dll or .exe file) using one of
the
<a href="mono-api-image.html#cil_image_open">CIL image
opening</a> API calls.
<h2>Metadata Heaps</h2>
<p>ECMA CLI images contain four heaps that store different
kinds of information, these are:
<ul>
<li>GUID heap (called #GUID) contains 128-bit GUIDs,
you can get pointer to a GUID value by
calling <a href="#api:mono_metadata_guid_heap">mono_metadata_guid_heap</a>.
<li>User string heap (called #US), it contains user
visible strings, you can fetch a string from this heap
by calling
<a href="#api:mono_metadata_user_string">mono_metadata_user_string</a>.
<li>Blob heap (called #blob), it contains binary
blobs of data, you can get a blob
by <a href="#api:mono_metadata_blob_heap">mono_metadata_blob_heap</a>.
You can determine the size of the blob using
the <a href="#api:mono_metadata_decode_blob_size">mono_metadata_decode_blob_size</a>.
<p>The locking functions here are used by code in class.c and
metadata.c to lock access to the shared hashtables inside the
MonoImage
</ul>
<h4><a name="api:mono_loader_lock">mono_loader_lock</a></h4>
<h4><a name="api:mono_loader_unlock">mono_loader_unlock</a></h4>
<p>The ECMA file format also has an extra section called the
"#~" stream, this stream is the one that holds the metadata
tables. There is a high-level API to get access to the
contents of this API, described in the
section <a href="#metadata-tables">Metadata Tables</a>.
<h4><a name="api:mono_metadata_guid_heap">mono_metadata_guid_heap</a></h4>
<h4><a name="api:mono_metadata_string_heap">mono_metadata_string_heap</a></h4>
<h4><a name="api:mono_metadata_blob_heap">mono_metadata_blob_heap</a></h4>
<h4><a name="api:mono_metadata_user_string">mono_metadata_user_string</a></h4>
<h4><a name="api:mono_metadata_decode_blob_size">mono_metadata_decode_blob_size</a></h4>
<a name="metadata-tables"/>
<h2>Metadata Tables</h2>
<p>Metadata is encoded in a number of tables included on every
CIL image. These tables contain type definitions, member
definitions and so on, these constants are defined in the ECMA 335
specification Partition II section 22. The following table
shows the C constants defined in the Mono runtime and how they
map to the equivalent ECMA CLI metadata table:
<center>
<table border=1>
<thead>
<td>
<b>ECMA CLI Table Name</b>
</td>
<td>
<b>C Constant Name</b>
</td>
<td>
<b>Table Schema (Array Size + Columns Constants)</b>
</td>
</thead>
<td>Assembly</td><td>MONO_TABLE_ASSEMBLY</td><td>
Array size:
MONO_ASSEMBLY_SIZE
<ul>
<li>MONO_ASSEMBLY_HASH_ALG
<li>MONO_ASSEMBLY_MAJOR_VERSION
<li>MONO_ASSEMBLY_MINOR_VERSION
<li>MONO_ASSEMBLY_BUILD_NUMBER
<li>MONO_ASSEMBLY_REV_NUMBER
<li>MONO_ASSEMBLY_FLAGS
<li>MONO_ASSEMBLY_PUBLIC_KEY
<li>MONO_ASSEMBLY_NAME
<li>MONO_ASSEMBLY_CULTURE
</ul>
</td>
</tr>
<td>AssemblyOS</td><td>MONO_TABLE_ASSEMBLYOS</td><td>
Array size:
MONO_ASSEMBLYOS_SIZE
<ul>
<li>MONO_ASSEMBLYOS_PLATFORM
<li>MONO_ASSEMBLYOS_MAJOR_VERSION
<li>MONO_ASSEMBLYOS_MINOR_VERSION
</ul>
</td>
</tr>
<td>AssemblyProcessor</td><td>MONO_TABLE_ASSEMBLYPROCESSOR</td><td>Array
size: MONO_ASSEMBLYPROCESSOR_SIZE
<ul>
<li>MONO_ASSEMBLY_PROCESSOR
</ul>
</td>
</tr>
<td>AssemblyRef</td><td>MONO_TABLE_ASSEMBLYREF</td><td>
Array size:
MONO_ASSEMBLYREF_SIZE
<ul>
<li>MONO_ASSEMBLYREF_MAJOR_VERSION
<li>MONO_ASSEMBLYREF_MINOR_VERSION
<li>MONO_ASSEMBLYREF_BUILD_NUMBER
<li>MONO_ASSEMBLYREF_REV_NUMBER
<li>MONO_ASSEMBLYREF_FLAGS
<li>MONO_ASSEMBLYREF_PUBLIC_KEY
<li>MONO_ASSEMBLYREF_NAME
<li>MONO_ASSEMBLYREF_CULTURE
<li>MONO_ASSEMBLYREF_HASH_VALUE
</ul>
</td>
</tr>
<td>AssemblyRefProcessor</td><td>MONO_TABLE_ASSEMBLYREFPROCESSOR</td><td>Array
size: MONO_ASSEMBLYREFPROC_SIZE
<ul>
<li>MONO_ASSEMBLYREFPROC_PROCESSOR
<li>MONO_ASSEMBLYREFPROC_ASSEMBLYREF
</ul>
</td>
</tr>
<td>AssemblyRefOS</td><td>MONO_TABLE_ASSEMBLYREFOS</td><td>
Array size:
<li>MONO_ASSEMBLYREFOS_SIZE
<ul>
<li>MONO_ASSEMBLYREFOS_PLATFORM
<li>MONO_ASSEMBLYREFOS_MAJOR_VERSION
<li>MONO_ASSEMBLYREFOS_MINOR_VERSION
<li>MONO_ASSEMBLYREFOS_ASSEMBLYREF
</ul>
</td>
</tr>
<td>ClassLayout</td><td>MONO_TABLE_CLASSLAYOUT</td><td>
Array size:
MONO_CLASSLAYOUT_SIZE
<ul>
<li>MONO_CLASS_LAYOUT_PACKING_SIZE
<li>MONO_CLASS_LAYOUT_CLASS_SIZE
<li>MONO_CLASS_LAYOUT_PARENT
</ul>
</td>
</tr>
<td>Constant</td><td>MONO_TABLE_CONSTANT</td><td>
Array size:
MONO_CONSTANT_SIZE
<ul>
<li>MONO_CONSTANT_TYPE
<li>MONO_CONSTANT_PADDING
<li>MONO_CONSTANT_PARENT
<li>MONO_CONSTANT_VALUE
</ul>
</td>
</tr>
<td>CustomAttribute</td><td>MONO_TABLE_CUSTOMATTRIBUTE</td><td>
Array size:
MONO_CUSTOM_ATTR_SIZE
<ul>
<li>MONO_CUSTOM_ATTR_PARENT
<li>MONO_CUSTOM_ATTR_TYPE
<li>MONO_CUSTOM_ATTR_VALUE
</ul>
</td>
</tr>
<td>DeclSecurity</td><td>MONO_TABLE_DECLSECURITY</td><td>
Array size:
MONO_DECL_SECURITY_SIZE
<ul>
<li>MONO_DECL_SECURITY_ACTION
<li>MONO_DECL_SECURITY_PARENT
<li>MONO_DECL_SECURITY_PERMISSIONSET
</ul>
</td>
</tr>
<td>EventMap</td><td>MONO_TABLE_EVENTMAP</td><td>
Array size:
MONO_EVENT_MAP_SIZE
<ul>
<li>MONO_EVENT_MAP_PARENT
<li>MONO_EVENT_MAP_EVENTLIST
</ul>
</td>
</tr>
<td>EventPtr</td><td>MONO_TABLE_EVENT_POINTER</td><td>
Array size:
MONO_EVENT_POINTER_SIZE
<ul>
<li>MONO_EVENT_POINTER_EVENT
</ul>
</td>
</tr>
<td>Event</td><td>MONO_TABLE_EVENT</td><td>
Array size: MONO_EVENT_SIZE
<ul>
<li>MONO_EVENT_FLAGS
<li>MONO_EVENT_NAME
<li>MONO_EVENT_TYPE
</ul>
</td>
</tr>
<td>ExportedType</td><td>MONO_TABLE_EXPORTEDTYPE</td><td>
Array size:
MONO_EXPORTEDTYPE_SIZE
<ul>
<li>MONO_EXP_TYPE_FLAGS
<li>MONO_EXP_TYPE_TYPEDEF
<li>MONO_EXP_TYPE_NAME
<li>MONO_EXP_TYPE_NAMESPACE
<li>MONO_EXP_TYPE_IMPLEMENTATION
</ul>
</td>
</tr>
<td>Field</td><td>MONO_TABLE_FIELD</td><td>
Array size: MONO_FIELD_SIZE
<ul>
<li>MONO_FIELD_FLAGS
<li>MONO_FIELD_NAME
<li>MONO_FIELD_SIGNATURE
</ul>
</td>
</tr>
<td>FieldLayoutt</td><td>MONO_TABLE_FIELDLAYOUT</td><td>
Array size:
MONO_FIELDLAYOUT_SIZE
<ul>
<li>MONO_FIELD_LAYOUT_OFFSET
<li>MONO_FIELD_LAYOUT_FIELD
</ul>
</td>
</tr>
<td>FieldMarshal</td><td>MONO_TABLE_FIELDMARSHAL</td><td>
Array size:
MONO_FIELD_MARSHAL_SIZE
<ul>
<li>MONO_FIELD_MARSHAL_PARENT
<li>MONO_FIELD_MARSHAL_NATIVE_TYPE
</ul>
</td>
</tr>
<td>FieldPtr</td><td>MONO_TABLE_FIELD_POINTER</td><td>
Array size:
MONO_FIELD_POINTER_SIZE
<ul>
<li>MONO_FIELD_POINTER_FIELD
</ul>
</td>
</tr>
<td>FieldRVA</td><td>MONO_TABLE_FIELDRVA</td><td>
Array size:
MONO_FIELDRVA_SIZE
<ul>
<li>MONO_FIELD_RVA_RVA
<li>MONO_FIELD_RVA_FIELD
</ul>
</td>
</tr>
<td>File</td><td>MONO_TABLE_FILE</td><td>
Array size: MONO_FILE_SIZE
<ul>
<li>MONO_FILE_FLAGS
<li>MONO_FILE_NAME
<li>MONO_FILE_HASH_VALUE
</ul>
</td>
</tr>
<td>GenericParam</td><td>MONO_TABLE_GENERICPARAM</td><td>
Array size:
MONO_GENERICPARAM_SIZE
<ul>
<li>MONO_GENERICPARAM_NUMBER
<li>MONO_GENERICPARAM_FLAGS
<li>MONO_GENERICPARAM_OWNER
<li>MONO_GENERICPARAM_NAME
</ul>
</td>
</tr>
<td>GenericParamConstraint</td><td>MONO_TABLE_GENERICPARAMCONSTRAINT</td><td>Array
size: MONO_GENERICPARAMCONSTRAINT_SIZE
<ul>
<li>MONO_GENPARCONSTRAINT_GENERICPAR
<li>MONO_GENPARCONSTRAINT_CONSTRAINT
</ul>
</td>
<tr>
<td>ImplMap</td><td>MONO_TABLE_IMPLMAP</td><td>
Array size:
MONO_IMPLMAP_SIZE
<ul>
<li>MONO_IMPLMAP_FLAGS
<li>MONO_IMPLMAP_MEMBER
<li>MONO_IMPLMAP_NAME
<li>MONO_IMPLMAP_SCOPE
</ul>
</td>
</tr>
<td>InterfaceImpl</td><td>MONO_TABLE_INTERFACEIMPL</td><td>
Array size:
<li>MONO_INTERFACEIMPL_SIZE
<ul>
<li>MONO_INTERFACEIMPL_CLASS
<li>MONO_INTERFACEIMPL_INTERFACE
</ul>
</td>
</tr>
<td>ManifestResource</td><td>MONO_TABLE_MANIFESTRESOURCE</td><td>Array
size: MONO_MANIFESTRESOURCE_SIZE
<ul>
<li>MONO_MANIFEST_OFFSET
<li>MONO_MANIFEST_FLAGS
<li>MONO_MANIFEST_NAME
<li>MONO_MANIFEST_IMPLEMENTATION
</ul>
</td>
</tr>
<tr>
<td>MemberRef</td><td>MONO_TABLE_MEMBERREF</td><td>
Array size:
MONO_MEMBERREF_SIZE
<ul>
<li>MONO_MEMBERREF_CLASS
<li>MONO_MEMBERREF_NAME
<li>MONO_MEMBERREF_SIGNATURE
</ul>
</td>
</tr>
<td>MethodImpl</td><td>MONO_TABLE_METHODIMPL</td><td>
Array size:
MONO_METHODIMPL_SIZE
<ul>
<li>MONO_METHODIMPL_CLASS
<li>MONO_METHODIMPL_BODY
<li>MONO_METHODIMPL_DECLARATION
</ul>
</td>
</tr>
<td>MethodSpec</td><td>MONO_TABLE_METHODSPEC</td><td>
Array size:
MONO_METHODSPEC_SIZE
<ul>
<li>MONO_METHODSPEC_METHOD
<li>MONO_METHODSPEC_SIGNATURE
</ul>
</td>
</tr>
<tr>
<td>MethodSemantics</td><td>MONO_TABLE_METHODSEMANTICS</td><td>Array
size: MONO_METHOD_SEMA_SIZE
<ul>
<li>MONO_METHOD_SEMA_SEMANTICS
<li>MONO_METHOD_SEMA_METHOD
<li>MONO_METHOD_SEMA_ASSOCIATION
</ul>
</td>
</tr>
<td>Moduleref</td><td>MONO_TABLE_MODULEREF</td><td>
Array size:
MONO_MODULEREF_SIZE
<ul>
<li>MONO_MODULEREF_NAME
</ul>
</td>
</tr>
<tr>
<td>Module</td><td>MONO_TABLE_MODULE</td><td>
Array size:
MONO_MODULE_SIZE
<br>
Columns:
<ul>
<li>MONO_MODULE_GENERATION
<li>MONO_MODULE_NAME
<li>MONO_MODULE_MVID
<li>MONO_MODULE_ENC
<li>MONO_MODULE_ENCBASE
</ul>
</td>
</tr>
<td>TypeRef</td><td>MONO_TABLE_TYPEREF</td><td>
Array size:
MONO_TYPEREF_SIZE
<ul>
<li>MONO_TYPEREF_SCOPE
<li>MONO_TYPEREF_NAME
<li>MONO_TYPEREF_NAMESPACE
</ul>
</td>
</tr>
<tr>
<td>MethodPtr</td><td>MONO_TABLE_METHOD_POINTER</td><td>
Array size:
MONO_METHOD_POINTER_SIZE
<ul>
<li>MONO_METHOD_POINTER_METHOD
</ul>
</td>
</tr>
<td>Method</td><td>MONO_TABLE_METHOD</td><td>
Array size:
MONO_METHOD_SIZE
<ul>
<li>MONO_METHOD_RVA
<li>MONO_METHOD_IMPLFLAGS
<li>MONO_METHOD_FLAGS
<li>MONO_METHOD_NAME
<li>MONO_METHOD_SIGNATURE
<li>MONO_METHOD_PARAMLIST
</ul>
</td>
</tr>
<tr>
<td>NestedClass</td><td>MONO_TABLE_NESTEDCLASS</td><td>
Array size:
MONO_NESTEDCLASS_SIZE
<ul>
<li>MONO_NESTED_CLASS_NESTED
<li>MONO_NESTED_CLASS_ENCLOSING
</ul>
</td>
</tr>
<tr>
<td>ParamPtr</td><td>MONO_TABLE_PARAM_POINTER</td><td>
Array size:
MONO_PARAM_POINTER_SIZE
<ul>
<li>MONO_PARAM_POINTER_PARAM
</ul>
</td>
</tr>
<td>Param</td><td>MONO_TABLE_PARAM</td><td>
Array size: MONO_PARAM_SIZE
<ul>
<li>MONO_PARAM_FLAGS
<li>MONO_PARAM_SEQUENCE
<li>MONO_PARAM_NAME
</ul>
</td>
</tr>
<td>PropertyMap</td><td>MONO_TABLE_PROPERTYMAP</td><td>
Array size:
MONO_PROPERTY_MAP_SIZE
<ul>
<li>MONO_PROPERTY_MAP_PARENT
<li>MONO_PROPERTY_MAP_PROPERTY_LIST
</ul>
</td>
</tr>
<td>PropertyPtr</td><td>MONO_TABLE_PROPERTY_POINTER</td><td>Array
size: MONO_PROPERTY_POINTER_SIZE
<ul>
<li>MONO_PROPERTY_POINTER_PROPERTY
</ul>
</td>
</tr>
<td>Property</td><td>MONO_TABLE_PROPERTY</td><td>
Array size:
MONO_PROPERTY_SIZE
<ul>
<li>MONO_PROPERTY_FLAGS
<li>MONO_PROPERTY_NAME
<li>MONO_PROPERTY_TYPE
</ul>
</td>
</tr>
<tr>
<td>StandaloneSig</td><td>MONO_TABLE_STANDALONESIG</td><td>
Array size:
<li>MONO_STAND_ALONE_SIGNATURE_SIZE
<ul>
<li>MONO_STAND_ALONE_SIGNATURE
</ul>
</td>
</tr>
<tr>
<td>TypeDef</td><td>MONO_TABLE_TYPEDEF</td><td>
Array size:
MONO_TYPEDEF_SIZE
<ul>
<li>MONO_TYPEDEF_FLAGS
<li>MONO_TYPEDEF_NAME
<li>MONO_TYPEDEF_NAMESPACE
<li>MONO_TYPEDEF_EXTENDS
<li>MONO_TYPEDEF_FIELD_LIST
<li>MONO_TYPEDEF_METHOD_LIST
</ul>
</td>
</tr>
<tr>
<td>TypeSpec</td><td>MONO_TABLE_TYPESPEC</td><td>
Array size:
MONO_TYPESPEC_SIZE
<ul>
<li>MONO_TYPESPEC_SIGNATURE
</ul>
</td>
</tr>
</table>
</center>
<p>Each table can contain zero or more rows, you must call the
<a href="#api:mono_metadata_table_rows">mono_metadata_table_rows</a>
to obtain the number of rows in a table, and then you can
extract individual row values by using
the <a href="#api:mono_metadata_decode_row">mono_metadata_decode_row</a>
or
the <a href="#api:mono_metadata_decode_row_col">mono_metadata_decode_row_col</a>.
When decoding rows you must provide an guint32 array large
enough to hold as many columns as the table contains.
<p>The metadata tables are stored in the MonoImage, you obtain
a pointer to the MonoTableInfo by calling
the <a href="#api:mono_image_get_table_info">mono_image_get_table_info</a>
and then you can scan those tables, for example:
<pre class="prettyprint">
/*
* Dumps a few fields from the AssemblyRef table
*/
void DumpAssemblyRefs (MonoImage *image)
{
/* Get a pointer to the AssemblyRef metadata table */
MonoTableInfo *t = mono_image_get_table_info (image, MONO_TABLE_ASSEMBLYREF);
/* Fetch the number of rows available in the table */
int rows = mono_table_info_get_rows (t);
int i;
/* For each row, print some of its values */
for (i = 0; i &lt; rows; i++){
/* Space where we extract one row from the metadata table */
guint32 cols [MONO_ASSEMBLYREF_SIZE];
/* Extract the row into the array cols */
mono_metadata_decode_row (t, i, cols, MONO_ASSEMBLYREF_SIZE);
fprintf (output, "%d: Version=%d.%d.%d.%d\n\tName=%s\n", i + 1,
cols [MONO_ASSEMBLYREF_MAJOR_VERSION],
cols [MONO_ASSEMBLYREF_MINOR_VERSION],
cols [MONO_ASSEMBLYREF_BUILD_NUMBER],
cols [MONO_ASSEMBLYREF_REV_NUMBER],
mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_NAME]));
}
}
</pre>
<p>The above program shows the following output when ran on
the C# compiler:
<pre>
1: Version=1.0.5000.0
Name=mscorlib
2: Version=1.0.5000.0
Name=System
3: Version=1.0.5000.0
Name=System.Xml
</pre>
<p>
<h3>Metadata Tables API</h3>
<p>These are the APIs for dealing with tables:
<h4><a name="api:mono_image_get_table_info">mono_image_get_table_info</a></h4>
<h4><a name="api:mono_image_get_table_rows">mono_image_get_table_rows</a></h4>
<h4><a name="api:mono_metadata_get_table">mono_metadata_get_table</a></h4>
<h4><a name="api:mono_meta_table_name">mono_meta_table_name</a></h4>
<h4><a name="api:mono_metadata_decode_row_col">mono_metadata_decode_row_col</a></h4>
<h4><a name="api:mono_metadata_decode_row">mono_metadata_decode_row</a></h4>
<h4><a name="api:mono_metadata_compute_size">mono_metadata_compute_size</a></h4>
<h4><a name="api:mono_metadata_custom_attrs_from_index">mono_metadata_custom_attrs_from_index</a></h4>
<h4><a name="api:mono_metadata_decode_signed_value">mono_metadata_decode_signed_value</a></h4>
<h4><a name="api:mono_metadata_decode_value">mono_metadata_decode_value</a></h4>
<h4><a name="api:mono_metadata_encode_value">mono_metadata_encode_value</a></h4>
<h2>Metadata access API</h2>
<h3>Metadata access API</h3>
<p>This is the low-level API for accessing the metadata
images.
<h4><a name="api:mono_cli_rva_image_map">mono_cli_rva_image_map</a></h4>
<h4><a name="api:mono_pe_file_open">mono_pe_file_open</a></h4>
<h4><a name="api:mono_meta_table_name">mono_meta_table_name</a></h4>
<h4><a name="api:mono_metadata_blob_heap">mono_metadata_blob_heap</a></h4>
<h4><a name="api:mono_metadata_compute_size">mono_metadata_compute_size</a></h4>
<h4><a name="api:mono_metadata_custom_attrs_from_index">mono_metadata_custom_attrs_from_index</a></h4>
<h4><a name="api:mono_metadata_decode_blob_size">mono_metadata_decode_blob_size</a></h4>
<h4><a name="api:mono_metadata_decode_row_col">mono_metadata_decode_row_col</a></h4>
<h4><a name="api:mono_metadata_decode_row">mono_metadata_decode_row</a></h4>
<h4><a name="api:mono_metadata_decode_signed_value">mono_metadata_decode_signed_value</a></h4>
<h4><a name="api:mono_metadata_decode_value">mono_metadata_decode_value</a></h4>
<h4><a name="api:mono_metadata_encode_value">mono_metadata_encode_value</a></h4>
<h4><a name="api:mono_metadata_events_from_typedef">mono_metadata_events_from_typedef</a></h4>
<h4><a name="api:mono_metadata_field_info">mono_metadata_field_info</a></h4>
<h4><a name="api:mono_metadata_free_array">mono_metadata_free_array</a></h4>
<h4><a name="api:mono_metadata_free_marshal_spec">mono_metadata_free_marshal_spec</a></h4>
<h4><a name="api:mono_metadata_free_mh">mono_metadata_free_mh</a></h4>
<h4><a name="api:mono_metadata_free_type">mono_metadata_free_type</a></h4>
<h4><a name="api:mono_metadata_generic_inst_equal">mono_metadata_generic_inst_equal</a></h4>
<h4><a name="api:mono_metadata_generic_inst_hash">mono_metadata_generic_inst_hash</a></h4>
<h4><a name="api:mono_metadata_generic_inst_is_valuetype">mono_metadata_generic_inst_is_valuetype</a></h4>
<h4><a name="api:mono_metadata_generic_method_equal">mono_metadata_generic_method_equal</a></h4>
<h4><a name="api:mono_metadata_get_constant_index">mono_metadata_get_constant_index</a></h4>
<h4><a name="api:mono_metadata_get_marshal_info">mono_metadata_get_marshal_info</a></h4>
<h4><a name="api:mono_metadata_get_table">mono_metadata_get_table</a></h4>
<h4><a name="api:mono_metadata_guid_heap">mono_metadata_guid_heap</a></h4>
<h4><a name="api:mono_metadata_implmap_from_method">mono_metadata_implmap_from_method</a></h4>
<h4><a name="api:mono_metadata_interfaces_from_typedef_full">mono_metadata_interfaces_from_typedef_full</a></h4>
<h4><a name="api:mono_metadata_interfaces_from_typedef">mono_metadata_interfaces_from_typedef</a></h4>
<h4><a name="api:mono_metadata_load_generic_params">mono_metadata_load_generic_params</a></h4>
<h4><a name="api:mono_metadata_locate">mono_metadata_locate</a></h4>
<h4><a name="api:mono_metadata_locate_token">mono_metadata_locate_token</a></h4>
<h4><a name="api:mono_metadata_methods_from_event">mono_metadata_methods_from_event</a></h4>
@@ -652,17 +49,8 @@ MONO_TYPESPEC_SIZE
<h4><a name="api:mono_metadata_nested_in_typedef">mono_metadata_nested_in_typedef</a></h4>
<h4><a name="api:mono_metadata_nesting_typedef">mono_metadata_nesting_typedef</a></h4>
<h4><a name="api:mono_metadata_packing_from_typedef">mono_metadata_packing_from_typedef</a></h4>
<h4><a name="api:mono_metadata_properties_from_typedef">mono_metadata_properties_from_typedef</a></h4>
<h4><a name="api:mono_metadata_token_from_dor">mono_metadata_token_from_dor</a></h4>
<h4><a name="api:mono_metadata_typedef_from_field">mono_metadata_typedef_from_field</a></h4>
<h4><a name="api:mono_metadata_typedef_from_method">mono_metadata_typedef_from_method</a></h4>
<h4><a name="api:mono_metadata_type_equal">mono_metadata_type_equal</a></h4>
<h4><a name="api:mono_metadata_type_hash">mono_metadata_type_hash</a></h4>
<h4><a name="api:mono_metadata_declsec_from_index">mono_metadata_declsec_from_index</a></h4>
<h4><a name="api:mono_metadata_free_method_signature">mono_metadata_free_method_signature</a></h4>
<h3>Retrieving Objects from Tokens</h3>
<h4><a name="api:mono_metadata_parse_array_full">mono_metadata_parse_array_full</a></h4>
<h4><a name="api:mono_metadata_parse_array">mono_metadata_parse_array</a></h4>
<h4><a name="api:mono_metadata_parse_custom_mod">mono_metadata_parse_custom_mod</a></h4>
<h4><a name="api:mono_metadata_parse_field_type">mono_metadata_parse_field_type</a></h4>
<h4><a name="api:mono_metadata_parse_marshal_spec">mono_metadata_parse_marshal_spec</a></h4>
@@ -676,29 +64,25 @@ MONO_TYPESPEC_SIZE
<h4><a name="api:mono_metadata_parse_typedef_or_ref">mono_metadata_parse_typedef_or_ref</a></h4>
<h4><a name="api:mono_metadata_parse_type_full">mono_metadata_parse_type_full</a></h4>
<h4><a name="api:mono_metadata_parse_type">mono_metadata_parse_type</a></h4>
<h4><a name="api:mono_metadata_properties_from_typedef">mono_metadata_properties_from_typedef</a></h4>
<h4><a name="api:mono_metadata_string_heap">mono_metadata_string_heap</a></h4>
<h4><a name="api:mono_metadata_token_from_dor">mono_metadata_token_from_dor</a></h4>
<h4><a name="api:mono_metadata_typedef_from_field">mono_metadata_typedef_from_field</a></h4>
<h4><a name="api:mono_metadata_typedef_from_method">mono_metadata_typedef_from_method</a></h4>
<h4><a name="api:mono_metadata_type_equal">mono_metadata_type_equal</a></h4>
<h4><a name="api:mono_metadata_type_hash">mono_metadata_type_hash</a></h4>
<h4><a name="api:mono_metadata_user_string">mono_metadata_user_string</a></h4>
<h4><a name="api:mono_metadata_declsec_from_index">mono_metadata_declsec_from_index</a></h4>
<h4><a name="api:mono_metadata_free_method_signature">mono_metadata_free_method_signature</a></h4>
<h2>Metadata Loader Locking</h2>
<p>The locking functions here are used by code in class.c and
metadata.c to lock access to the shared hashtables inside the
MonoImage.
<h4><a name="api:mono_loader_lock">mono_loader_lock</a></h4>
<h4><a name="api:mono_loader_unlock">mono_loader_unlock</a></h4>
<h2>Generics Support</h2>
<h3>Generics Support</h3>
<h4><a name="api:mono_metadata_generic_class_is_valuetype">mono_metadata_generic_class_is_valuetype</a></h4>
<h4><a name="api:mono_metadata_has_generic_params">mono_metadata_has_generic_params</a></h4>
<h4><a name="api:mono_metadata_inflate_generic_inst">mono_metadata_inflate_generic_inst</a></h4>
<h4><a name="api:mono_metadata_parse_generic_inst">mono_metadata_parse_generic_inst</a></h4>
<h4><a name="api:mono_metadata_generic_inst_equal">mono_metadata_generic_inst_equal</a></h4>
<h4><a name="api:mono_metadata_generic_inst_hash">mono_metadata_generic_inst_hash</a></h4>
<h4><a name="api:mono_metadata_load_generic_params">mono_metadata_load_generic_params</a></h4>
<h4><a name="api:mono_metadata_generic_inst_is_valuetype">mono_metadata_generic_inst_is_valuetype</a></h4>
<h4><a name="api:mono_metadata_generic_method_equal">mono_metadata_generic_method_equal</a></h4>
<h2>Tokens</h2>
<h3>Tokens</h3>
<h4><a name="api:mono_ldtoken">mono_ldtoken</a></h4>
<h4><a name="api:mono_lookup_dynamic_token">mono_lookup_dynamic_token</a></h4>
@@ -706,12 +90,25 @@ MONO_TYPESPEC_SIZE
<h4><a name="api:mono_exception_from_token">mono_exception_from_token</a></h4>
<h4><a name="api:mono_create_jit_trampoline_from_token">mono_create_jit_trampoline_from_token</a></h4>
<h2>OpCodes</h2>
<h3>Working with signatures</h3>
<h4><a name="api:mono_signature_explicit_this">mono_signature_explicit_this</a></h4>
<h4><a name="api:mono_signature_get_call_conv">mono_signature_get_call_conv</a></h4>
<h4><a name="api:mono_signature_get_desc">mono_signature_get_desc</a></h4>
<h4><a name="api:mono_signature_get_param_count">mono_signature_get_param_count</a></h4>
<h4><a name="api:mono_signature_get_params">mono_signature_get_params</a></h4>
<h4><a name="api:mono_signature_get_return_type">mono_signature_get_return_type</a></h4>
<h4><a name="api:mono_signature_hash">mono_signature_hash</a></h4>
<h4><a name="api:mono_signature_is_instance">mono_signature_is_instance</a></h4>
<h4><a name="api:mono_signature_vararg_start">mono_signature_vararg_start</a></h4>
<h3>OpCodes</h3>
<h4><a name="api:mono_opcode_name">mono_opcode_name</a></h4>
<h4><a name="api:mono_opcode_value">mono_opcode_value</a></h4>
<h2>Metadata Loading Errors</h2>
<h3>Metadata Loading Errors</h3>
<p>The routines in this section are used to cope with errors
during metadata loading. Errors in metadata handling can
+1 -13
View File
@@ -54,20 +54,8 @@ mono_runtime_invoke (method, obj, args, &amp;exception);
<h4><a name="api:mono_method_has_marshal_info">mono_method_has_marshal_info</a></h4>
<h4><a name="api:mono_method_return_message_restore">mono_method_return_message_restore</a></h4>
<h4><a name="api:mono_method_same_domain">mono_method_same_domain</a></h4>
<h4><a name="api:mono_method_verify">mono_method_verify</a></h4>
<h3>Method Signatures</h3>
<h4><a name="api:mono_method_signature">mono_method_signature</a></h4>
<h4><a name="api:mono_signature_explicit_this">mono_signature_explicit_this</a></h4>
<h4><a name="api:mono_signature_get_call_conv">mono_signature_get_call_conv</a></h4>
<h4><a name="api:mono_signature_get_desc">mono_signature_get_desc</a></h4>
<h4><a name="api:mono_signature_get_param_count">mono_signature_get_param_count</a></h4>
<h4><a name="api:mono_signature_get_params">mono_signature_get_params</a></h4>
<h4><a name="api:mono_signature_get_return_type">mono_signature_get_return_type</a></h4>
<h4><a name="api:mono_signature_hash">mono_signature_hash</a></h4>
<h4><a name="api:mono_signature_is_instance">mono_signature_is_instance</a></h4>
<h4><a name="api:mono_signature_vararg_start">mono_signature_vararg_start</a></h4>
<h4><a name="api:mono_method_verify">mono_method_verify</a></h4>
<h3>Methods Header Operations</h3>
+113
View File
@@ -0,0 +1,113 @@
1. Thread safety of metadata structures
----------------------------------------
1.1 Synchronization of read-only data
-------------------------------------
Read-only data is data which is not modified after creation, like the
actual binary metadata in the metadata tables.
There are three kinds of threads with regards to read-only data:
- readers
- the creator of the data
- the destroyer of the data
Most threads are readers.
- synchronization between readers is not neccesary
- synchronization between the writers is done using locks.
- synchronization between the readers and the creator is done by not exposing
the data to readers before it is fully constructed.
- synchronization between the readers and the destroyer: TBD.
1.2 Deadlock prevention plan
----------------------------
Hold locks for the shortest time possible. Avoid calling functions inside
locks which might obtain global locks (i.e. locks known outside this module).
1.3 Locks
----------
1.3.1 Simple locks
------------------
There are a lot of global data structures which can be protected by a 'simple' lock. Simple means:
- the lock protects only this data structure or it only protects the data structures in a given C module.
An example would be the appdomains list in domain.c
- the lock is only held for a short amount of time, and no other lock is acquired inside this simple lock. Thus there is
no possibility of deadlock.
1.3.2 The class loader lock
---------------------------
This locks is held by the class loading routines in class.c and loader.c. It
protects the various caches inside MonoImage which are used by these modules.
1.3.3 The domain lock
---------------------
Each appdomain has a lock which protects the per-domain data structures.
1.3.4 The locking hierarchy
---------------------------
It is useful to model locks by a locking hierarchy, which is a relation between locks, which is reflexive, transitive,
and antisymmetric, in other words, a lattice. If a thread wants to acquire a lock B, while already holding A, it can only
do it if A < B. If all threads work this way, then no deadlocks can occur.
Our locking hierarchy so far looks like this:
<DOMAIN LOCK>
\
<CLASS LOADER LOCK>
\ \
<SIMPLE LOCK 1> <SIMPLE LOCK 2>
1.4 Notes
----------
Some common scenarios:
- if a function needs to access a data structure, then it should lock it itself, and do not count on its caller locking it.
So for example, the image->class_cache hash table would be locked by mono_class_get().
- there are lots of places where a runtime data structure is created and stored in a cache. In these places, care must be
taken to avoid multiple threads creating the same runtime structure, for example, two threads might call mono_class_get ()
with the same class name. There are two choices here:
<enter mutex>
<check that item is created>
if (created) {
<leave mutex>
return item
}
<create item>
<store it in cache>
<leave mutex>
This is the easiest solution, but it requires holding the lock for the whole time which might create a scalability problem, and could also lead to deadlock.
<enter mutex>
<check that item is created>
<leave mutex>
if (created) {
return item
}
<create item>
<enter mutex>
<check that item is created>
if (created) {
/* Another thread already created and stored the same item */
<free our item>
<leave mutex>
return orig item
}
else {
<store item in cache>
<leave mutex>
return item
}
This solution does not present scalability problems, but the created item might be hard to destroy (like a MonoClass).
- lazy initialization of hashtables etc. is not thread safe
File renamed without changes.
-21
View File
@@ -1,21 +0,0 @@
/
/depcomp
/config.guess
/config.sub
/ltmain.sh
/eglib-*.tar.gz
/missing
/install-sh
/compile
/Makefile
/Makefile.in
/stamp-h1
/config.h.in
/libtool
/autom4te.cache
/aclocal.m4
/config.log
/configure
/config.h
/config.status
/INSTALL
-8
View File
@@ -1,8 +0,0 @@
set(SUBDIRS src test)
autoheader("config.h" null)
foreach(subdir ${SUBDIRS})
add_subdirectory(${subdir})
endforeach()
-83
View File
@@ -1,86 +1,3 @@
2009-06-20 Zoltan Varga <[email protected]>
* src/glib.h: Add GUINT32_FROM/TO_BE macros.
2009-06-09 Jonathan Chambers <[email protected]>
* CMakeLists.txt: Add start of CMake build.
* src/CMakeLists.txt: Add start of CMake build.
Contribution is licensed as MIT/X11.
2009-06-02 Bill Holmes <[email protected]>
* src/gpath.c (g_find_program_in_path): While searching on Windows
also try additional suffixes .exe, .cmd, .bat, and.com.
Contributed under MIT/X11 license.
2009-05-27 Geoff Norton <[email protected]>
* src/gfile-posix.c: Fix g_get_current_dir on amd64
2009-04-22 Jeffrey Stedfast <[email protected]>
* src/gtimer-win32.c (g_timer_elapsed): Avoid re-querying freq by
just saving it in a static variable. Also modified microseconds
calculation to avoid overflow.
2009-04-05 Miguel de Icaza <[email protected]>
* src/gpath.c: Avoid situations where we add the separator if one
of the elements is the separator.
2009-04-02 Miguel de Icaza <[email protected]>
* src/gpath.c: If the first element is NULL, return an empty
string.
2009-02-19 Gonzalo Paniagua Javier <[email protected]>
* src/gstr.c: use memset in g_strnfill.
2009-01-19 Bill Holmes <[email protected]>
* src/gstr.c (g_strnfill): Fixing a warning for MSVC.
Contributed under MIT/X11 license.
2009-02-05 Miguel de Icaza <[email protected]>
* src/gstr.c: Add g_strnfill
* src/glib.h: Add g_list_previous
2009-01-19 Bill Holmes <[email protected]>
* gmisc-win32.c (g_path_is_absolute): Adding support for UNC
paths on Windows.
Contributed under MIT/X11 license.
2009-01-08 Bill Holmes <[email protected]>
* winconfig.h, src/gfile-posix.c :
Fixing the MSVC builds.
Contributed under MIT/X11 license.
2009-01-07 Miguel de Icaza <[email protected]>
* src/gfile-posix.c: Move g_get_current_dir, as it is a
POSIX-esque feature, and some other systems do not have current
directories.
* src/glib.h (G_LOCK_DEFINE, G_LOCK_DEFINE_STATIC):
Embedded support from Paolo's work on quack.
* configure.ac: check for strtok_r, langinfo.h and iconv.h
* src/gpath.c (strtok_r): Add a strtok_r implementation if it is
not available on the target system.
2008-11-05 Bill Holmes <[email protected]>
* src/gutf8.c, src/unicode-data.h, src/gunicode.c :
+10 -34
View File
@@ -2,12 +2,13 @@ AC_INIT(README)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(eglib,0.3)
AM_INIT_AUTOMAKE(eglib,0.2)
AM_MAINTAINER_MODE
AC_PROG_CC
AM_PROG_LIBTOOL
CFLAGS="$CFLAGS -g -O0 -D_GNU_SOURCE"
CFLAGS='-g -O0 -D_GNU_SOURCE'
AC_SUBST(CFLAGS)
GNUC_PRETTY=
GNUC_UNUSED=
BREAKPOINT="G_STMT_START { raise (SIGTRAP); } G_STMT_END"
@@ -43,11 +44,10 @@ esac
case $target in
arm*-darwin*)
CFLAGS="$CFLAGS -U_FORTIFY_SOURCE"
CFLAGS="$CLAFGS -U_FORTIFY_SOURCE"
;;
esac
AC_SUBST(CFLAGS)
AC_SUBST(PATHSEP)
AC_SUBST(SEARCHSEP)
AC_SUBST(OS)
@@ -55,7 +55,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, test x$OS = xWIN32)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(void *)
AC_CHECK_FUNCS(strndup strlcpy getpwent_r strtok_r rewinddir)
AC_CHECK_FUNCS(strndup strlcpy getpwent_r)
AC_CHECK_LIB(iconv, libiconv_open, LIBS="$LIBS -liconv")
old_ldflags="${LDFLAGS}"
LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
@@ -64,7 +64,7 @@ if test $found_export_dynamic = no; then
LDFLAGS="${old_ldflags}"
fi
AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h)
AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h)
if test $ac_cv_sizeof_void_p != $ac_cv_sizeof_int; then
GPOINTER_TO_INT="((gint)(long) (ptr))"
@@ -84,34 +84,10 @@ else
G_GUINT64_FORMAT='"llu"'
fi
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test "x$PKG_CONFIG" = "xno"; then
AC_MSG_ERROR([You need to install pkg-config])
fi
pkg_config_path=
AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Change pkg-config dir to custom dir],
if test x$with_crosspkgdir = "x"; then
if test -s $PKG_CONFIG_PATH; then
pkg_config_path=$PKG_CONFIG_PATH
fi
else
pkg_config_path=$with_crosspkgdir
PKG_CONFIG_PATH=$pkg_config_path
export PKG_CONFIG_PATH
fi
)
dnl
dnl No, you can not replace the call below with a pkg.m4 macro
dnl
if $PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0; then
have_glib=true;
else
have_glib=false;
fi
AM_CONDITIONAL(HAVE_GLIB, $have_glib)
PKG_CHECK_MODULES(GLIB, glib-2.0,
[AM_CONDITIONAL(HAVE_GLIB, test x = x)],
[AM_CONDITIONAL(HAVE_GLIB, test x = y)]
)
AC_SUBST(GPOINTER_TO_INT)
AC_SUBST(GPOINTER_TO_UINT)
AC_SUBST(GINT_TO_POINTER)
-6
View File
@@ -1,6 +0,0 @@
/
/Makefile
/Makefile.in
/.libs
/.deps
/eglib-config.h
-49
View File
@@ -1,49 +0,0 @@
set(win_files
gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c
gmodule-win32.c gtimer-win32.c)
set(unix_files
gdate-unix.c gdir-unix.c gfile-unix.c gmisc-unix.c
gmodule-unix.c gtimer-unix.c)
if (MSVC)
set(os_files ${win_files})
else(MSVC)
set(os_files ${unix_files})
endif(MSVC)
set(libeglib_la_SOURCES
${os_files}
eglib-config.h
sort.frag.h
glib.h
garray.c
gerror.c
ghashtable.c
gmem.c
gmodule.h
goutput.c
gstr.c
gslist.c
gstring.c
gptrarray.c
glist.c
gqueue.c
gpath.c
gshell.c
gspawn.c
gfile.c
gfile-posix.c
gpattern.c
gmarkup.c
gutf8.c
gunicode.c
unicode-data.h)
set(EXTRA_DIST eglib-config.h.in eglib-config.hw ${win_files} ${unix_files})
INCLUDE_DIRECTORIES(../ ${CMAKE_CURRENT_SOURCE_DIR})
ADD_DEFINITIONS(${CFLAGS} -D_FORTIFY_SOURCE=2)
ADD_LIBRARY(eglib-static STATIC ${libeglib_la_SOURCES})
ADD_LIBRARY(eglib SHARED ${libeglib_la_SOURCES})
-1
View File
@@ -39,7 +39,6 @@ libeglib_la_SOURCES = \
gmarkup.c \
gutf8.c \
gunicode.c \
unicode-data.h \
$(os_files)
libeglib_la_CFLAGS = -Wall -D_FORTIFY_SOURCE=2
-14
View File
@@ -36,9 +36,6 @@
struct _GDir {
DIR *dir;
#ifndef HAVE_REWINDDIR
char *path;
#endif
};
GDir *
@@ -60,9 +57,6 @@ g_dir_open (const gchar *path, guint flags, GError **error)
g_free (dir);
return NULL;
}
#ifndef HAVE_REWINDDIR
dir->path = g_strdup (path);
#endif
return dir;
}
@@ -85,12 +79,7 @@ void
g_dir_rewind (GDir *dir)
{
g_return_if_fail (dir != NULL && dir->dir != NULL);
#ifndef HAVE_REWINDDIR
closedir (dir->dir);
dir->dir = opendir (dir->path);
#else
rewinddir (dir->dir);
#endif
}
void
@@ -98,9 +87,6 @@ g_dir_close (GDir *dir)
{
g_return_if_fail (dir != NULL && dir->dir != 0);
closedir (dir->dir);
#ifndef HAVE_REWINDDIR
g_free (dir->path);
#endif
dir->dir = NULL;
g_free (dir);
}
-25
View File
@@ -35,7 +35,6 @@
#include <sys/types.h>
#ifdef _MSC_VER
#include <direct.h>
int mkstemp (char *tmp_template);
#endif
@@ -145,27 +144,3 @@ g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error)
}
return fd;
}
gchar *
g_get_current_dir (void)
{
int s = 32;
char *buffer = NULL, *r;
gboolean fail;
do {
buffer = g_realloc (buffer, s);
r = getcwd (buffer, s);
fail = (r == NULL && errno == ERANGE);
if (fail) {
s <<= 1;
}
} while (fail);
/* On amd64 sometimes the bottom 32-bits of r == the bottom 32-bits of buffer
* but the top 32-bits of r have overflown to 0xffffffff (seriously wtf getcwd
* so we return the buffer here since it has a pointer to the valid string
*/
return buffer;
}
+2 -10
View File
@@ -234,7 +234,6 @@ gchar *g_strjoinv (const gchar *separator, gchar **str_array);
gchar *g_strchug (gchar *str);
gchar *g_strchomp (gchar *str);
void g_strdown (gchar *string);
gchar *g_strnfill (gsize length, gchar fill_char);
gchar *g_strdelimit (gchar *string, const gchar *delimiters, gchar new_delimiter);
gchar *g_strescape (const gchar *source, const gchar *exceptions);
@@ -367,7 +366,6 @@ struct _GList {
};
#define g_list_next(list) ((list) ? (((GList *) (list))->next) : NULL)
#define g_list_previous(list) ((list) ? (((GList *) (list))->prev) : NULL)
GList *g_list_alloc (void);
GList *g_list_append (GList *list,
@@ -834,15 +832,13 @@ glong g_utf8_strlen (const gchar *str, gssize max);
#define g_thread_supported() TRUE
#define g_thread_init(x) G_STMT_START { if (x != NULL) { g_error ("No vtable supported in g_thread_init"); } } G_STMT_END
#define G_LOCK_DEFINE(name) int name;
#define G_LOCK_DEFINE_STATIC(name) static int name;
#define G_LOCK_DEFINE(name)
#define G_LOCK_DEFINE_STATIC(name)
#define G_LOCK_EXTERN(name)
#define G_LOCK(name)
#define G_TRYLOCK(name)
#define G_UNLOCK(name)
#define GUINT16_SWAP_LE_BE_CONSTANT(x) ((((guint16) x) >> 8) | ((((guint16) x) << 8)))
#define GUINT16_SWAP_LE_BE(x) ((guint16) (((guint16) x) >> 8) | ((((guint16)(x)) & 0xff) << 8))
#define GUINT32_SWAP_LE_BE(x) ((guint32) \
( (((guint32) (x)) << 24)| \
@@ -860,15 +856,11 @@ glong g_utf8_strlen (const gchar *str, gssize max);
# define GUINT64_TO_LE(x) (x)
# define GUINT16_TO_LE(x) (x)
# define GUINT_TO_LE(x) (x)
# define GUINT32_TO_BE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT32_FROM_BE(x) GUINT32_SWAP_LE_BE(x)
#else
# define GUINT32_TO_LE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT64_TO_LE(x) GUINT64_SWAP_LE_BE(x)
# define GUINT16_TO_LE(x) GUINT16_SWAP_LE_BE(x)
# define GUINT_TO_LE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT32_TO_BE(x) (x)
# define GUINT32_FROM_BE(x) (x)
#endif
#define GUINT32_FROM_LE(x) (GUINT32_TO_LE (x))
+6 -34
View File
@@ -40,7 +40,6 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <stdio.h>
#include <ctype.h>
#include <glib.h>
#define set_error(msg, ...) do { if (error != NULL) *error = g_error_new (GINT_TO_POINTER (1), 1, msg, __VA_ARGS__); } while (0);
@@ -100,37 +99,10 @@ g_markup_parse_context_free (GMarkupParseContext *context)
g_free (context);
}
static gboolean
my_isspace (char c)
{
if (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\v')
return TRUE;
return FALSE;
}
static gboolean
my_isalnum (char c)
{
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
return TRUE;
if (c >= '0' && c <= '9')
return TRUE;
return FALSE;
}
static gboolean
my_isalpha (char c)
{
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
return TRUE;
return FALSE;
}
static const char *
skip_space (const char *p, const char *end)
{
for (; p < end && my_isspace (*p); p++)
for (; p < end && isspace (*p); p++)
;
return p;
}
@@ -166,7 +138,7 @@ parse_name (const char *p, const char *end, char **value)
const char *start = p;
int l;
for (; p < end && my_isalnum (*p); p++)
for (; p < end && isalnum (*p); p++)
;
if (p == end)
return end;
@@ -296,7 +268,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
int full_stop = 0, l;
gchar **names = NULL, **values = NULL;
for (; p < end && my_isspace (*p); p++)
for (; p < end && isspace (*p); p++)
;
if (p == end){
set_error ("%s", "Unfinished element");
@@ -309,12 +281,12 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
break;
}
if (!my_isalpha (*p)){
if (!(isascii (*p) && isalpha (*p))){
set_error ("%s", "Expected an element name");
goto fail;
}
for (++p; p < end && (my_isalnum (*p) || (*p == '.')); p++)
for (++p; p < end && (isalnum (*p) || (*p == '.')); p++)
;
if (p == end){
set_error ("%s", "Expected an element");
@@ -322,7 +294,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
}
element_end = p;
for (; p < end && my_isspace (*p); p++)
for (; p < end && isspace (*p); p++)
;
if (p == end){
set_error ("%s", "Unfinished element");
+5 -10
View File
@@ -93,16 +93,11 @@ g_path_is_absolute (const char *filename)
{
g_return_val_if_fail (filename != NULL, FALSE);
if (filename[0] != '\0' && filename[1] != '\0')
if (filename[1] == ':' && filename[2] != '\0' &&
(filename[2] == '\\' || filename[2] == '/'))
return TRUE;
/* UNC paths */
else if (filename[0] == '\\' && filename[1] == '\\' &&
filename[2] != '\0')
return TRUE;
return FALSE;
if (filename[0] != '\0' && filename[1] != '\0' && filename[1] == ':' &&
filename[2] != '\0' && (filename[2] == '\\' || filename[2] == '/'))
return TRUE;
else
return FALSE;
}
const gchar *
+21 -94
View File
@@ -47,9 +47,7 @@ g_build_path (const gchar *separator, const gchar *first_element, ...)
va_list args;
g_return_val_if_fail (separator != NULL, NULL);
if (first_element == NULL)
return g_strdup ("");
g_return_val_if_fail (first_element != NULL, NULL);
result = g_string_sized_new (48);
@@ -68,8 +66,7 @@ g_build_path (const gchar *separator, const gchar *first_element, ...)
g_string_append_len (result, s, p - s);
if (next && *next){
if (strncmp (separator, result->str + strlen (result->str) - slen, slen))
g_string_append (result, separator);
g_string_append (result, separator);
for (; strncmp (next, separator, slen) == 0; )
next += slen;
@@ -134,60 +131,6 @@ g_path_get_basename (const char *filename)
return g_strdup (&r[1]);
}
#ifndef HAVE_STRTOK_R
// This is from BSD's strtok_r
char *
strtok_r(char *s, const char *delim, char **last)
{
char *spanp;
int c, sc;
char *tok;
if (s == NULL && (s = *last) == NULL)
return NULL;
/*
* Skip (span) leading delimiters (s += strspn(s, delim), sort of).
*/
cont:
c = *s++;
for (spanp = (char *)delim; (sc = *spanp++) != 0; ){
if (c == sc)
goto cont;
}
if (c == 0){ /* no non-delimiter characters */
*last = NULL;
return NULL;
}
tok = s - 1;
/*
* Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
* Note that delim must have one NUL; we stop if we see that, too.
*/
for (;;){
c = *s++;
spanp = (char *)delim;
do {
if ((sc = *spanp++) == c) {
if (c == 0)
s = NULL;
else {
char *w = s - 1;
*w = '\0';
}
*last = s;
return tok;
}
}
while (sc != 0);
}
/* NOTREACHED */
}
#endif
gchar *
g_find_program_in_path (const gchar *program)
{
@@ -195,12 +138,6 @@ g_find_program_in_path (const gchar *program)
char *x = p, *l;
gchar *curdir = NULL;
char *save;
#ifdef G_OS_WIN32
char *program_exe;
char *suffix_list[5] = {".exe",".cmd",".bat",".com",NULL};
int listx;
gboolean hasSuffix;
#endif
g_return_val_if_fail (program != NULL, NULL);
@@ -209,15 +146,6 @@ g_find_program_in_path (const gchar *program)
x = curdir;
}
#ifdef G_OS_WIN32
/* see if program already has a suffix */
listx = 0;
hasSuffix = FALSE;
while (!hasSuffix && suffix_list[listx]) {
hasSuffix = g_str_has_suffix(program,suffix_list[listx++]);
}
#endif
while ((l = strtok_r (x, G_SEARCHPATH_SEPARATOR_S, &save)) != NULL){
char *probe_path;
@@ -229,32 +157,31 @@ g_find_program_in_path (const gchar *program)
return probe_path;
}
g_free (probe_path);
#ifdef G_OS_WIN32
/* check for program with a suffix attached */
if (!hasSuffix) {
listx = 0;
while (suffix_list[listx]) {
program_exe = g_strjoin(NULL,program,suffix_list[listx],NULL);
probe_path = g_build_path (G_DIR_SEPARATOR_S, l, program_exe, NULL);
if (access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
g_free (curdir);
g_free (p);
g_free (program_exe);
return probe_path;
}
listx++;
g_free (probe_path);
g_free (program_exe);
}
}
#endif
}
g_free (curdir);
g_free (p);
return NULL;
}
gchar *
g_get_current_dir (void)
{
int s = 32;
char *buffer = NULL, *r;
gboolean fail;
do {
buffer = g_realloc (buffer, s);
r = getcwd (buffer, s);
fail = (r == NULL && errno == ERANGE);
if (fail) {
s <<= 1;
}
} while (fail);
return r;
}
static char *name;
void
+2 -8
View File
@@ -826,12 +826,6 @@ g_ascii_xdigit_value (gchar c)
(c - 'A' + 10))));
}
gchar *
g_strnfill (gsize length, gchar fill_char)
{
gchar *ret = g_new (gchar, length + 1);
memset (ret, fill_char, length);
ret [length] = 0;
return ret;
}
+9 -13
View File
@@ -68,14 +68,9 @@ g_timer_stop (GTimer *timer)
gdouble
g_timer_elapsed (GTimer *timer, gulong *microseconds)
{
static guint64 freq = 0;
guint64 delta, stop;
if (freq == 0) {
if (!QueryPerformanceFrequency ((LARGE_INTEGER *)&freq))
freq = 1;
}
guint64 stop;
guint64 freq;
gdouble seconds;
if (timer->stop == 0) {
QueryPerformanceCounter ((LARGE_INTEGER*)&stop);
}
@@ -83,12 +78,13 @@ g_timer_elapsed (GTimer *timer, gulong *microseconds)
stop = timer->stop;
}
delta = stop - timer->start;
QueryPerformanceFrequency ((LARGE_INTEGER*)&freq);
seconds = 1.0 * (stop - timer->start) / freq;
if (microseconds)
*microseconds = (gulong) (delta * (1000000.0 / freq));
return (gdouble) delta / (gdouble) freq;
if (microseconds) {
*microseconds = (gulong)(1000000.0 * (stop - timer->start) / freq);
}
return seconds;
}
+1 -10
View File
@@ -33,7 +33,6 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
#include <config.h>
#include <stdio.h>
#include <glib.h>
#include <unicode-data.h>
@@ -45,13 +44,9 @@
typedef int iconv_t;
#else
#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
#endif
#ifdef HAVE_ICONV_H
#include <iconv.h>
#endif
#endif
static char *my_charset;
static gboolean is_utf8;
@@ -205,7 +200,7 @@ g_convert (const gchar *str, gssize len,
{
char *result = NULL;
#ifdef G_OS_WIN32
#elif HAVE_ICONV_H
#else
iconv_t convertor;
char *buffer, *output;
const char *strptr = (const char *) str;
@@ -300,11 +295,7 @@ g_get_charset (G_CONST_RETURN char **charset)
is_utf8 = FALSE;
#else
if (my_charset == NULL){
#if HAVE_LANGINFO_H
my_charset = g_strdup (nl_langinfo (CODESET));
#else
my_charset = g_strdup ("UTF-8");
#endif
is_utf8 = strcmp (my_charset, "UTF-8") == 0;
}
-17
View File
@@ -1,17 +0,0 @@
/
/Makefile.in
/configure
/libtool
/aclocal.m4
/Makefile
/config.h
/config.h.in
/config.status
/stamp-h1
/autom4te.cache
/.libs
/.deps
/test-glib
/test-eglib
/test-glib.exe
/test-eglib.exe
+1 -1
View File
@@ -238,7 +238,7 @@ gint main(gint argc, gchar **argv)
string_array_free(tests_to_run);
}
return global_tests - global_passed;
return 0;
}
+2 -23
View File
@@ -92,14 +92,7 @@ test_buildpath ()
if (strcmp (s, "/a/c/") != 0)
return FAILED ("14 Got wrong result, got: %s", s);
g_free (s);
/* Null */
s = g_build_path ("/", NULL);
if (s == NULL)
return FAILED ("must get a non-NULL return");
if (s [0] != 0)
return FAILED ("must get an empty string");
g_free (s);
return OK;
}
@@ -116,20 +109,6 @@ test_buildfname ()
#endif
return FAILED ("1 Got wrong result, got: %s", s);
g_free (s);
s = g_build_filename ("/", "a", NULL);
#ifdef G_OS_WIN32
if (strcmp (s, "\\a") != 0)
#else
if (strcmp (s, "/a") != 0)
#endif
return FAILED ("1 Got wrong result, got: %s", s);
#ifndef OS_WIN32
s = g_build_filename ("/", "foo", "/bar", "tolo/", "/meo/", NULL);
if (strcmp (s, "/foo/bar/tolo/meo/") != 0)
return FAILED ("1 Got wrong result, got: %s", s);
#endif
return OK;
}
@@ -305,8 +284,8 @@ test_misc ()
}
static Test path_tests [] = {
{"g_build_filename", test_buildfname},
{"g_buildpath", test_buildpath},
{"g_build_filename", test_buildfname},
{"g_path_get_dirname", test_dirname},
{"g_path_get_basename", test_basename},
{"g_find_program_in_path", test_ppath},
+8 -3
View File
@@ -184,9 +184,14 @@ gdouble
get_timestamp()
{
/* FIXME: We should use g_get_current_time here */
GTimeVal res;
g_get_current_time (&res);
return res.tv_sec + (1.e-6) * res.tv_usec;
#ifdef G_OS_WIN32
long int l = GetTickCount();
return (gdouble)(l / 1000) + (1.e-6) * ((l % 1000) * 1000);
#else
struct timeval tp;
gettimeofday(&tp, NULL);
return (gdouble)tp.tv_sec + (1.e-6) * tp.tv_usec;
#endif
}
/*
-2
View File
@@ -72,5 +72,3 @@
/* Version number of package */
#define VERSION "0.1"
#define HAVE_STRTOK_R 1
-7
View File
@@ -1,7 +0,0 @@
/Makefile.in
/.libs
/.deps
/Makefile
/*.o
/*.lo
/*.la
-4
View File
@@ -1,4 +0,0 @@
ADD_DEFINITIONS(${GMODULE_CFLAGS})
ADD_LIBRARY(ikvm_native SHARED jni.c os.c jni.h)
TARGET_LINK_LIBRARIES(ikvm_native ${GMODULE_LIBS})
+1 -1
View File
@@ -28,7 +28,7 @@
#include <malloc.h>
#define ALLOCA _alloca
#else
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include <stdlib.h>
#else
#include <alloca.h>
-24
View File
@@ -1,24 +0,0 @@
/aclocal.m4
/config.cache
/config.guess
/config.h
/config.h.in
/config.log
/config.status
/config.sub
/configure
/libtool
/ltmain.sh
/ltconfig
/Makefile
/Makefile.in
/stamp-h
/stamp-h.in
/*.lo
/.deps
/.libs
/*.la
/*.o
/autom4te.cache
/libgc-mono.pc
/libgc-mono-*.tar.gz
-196
View File
@@ -1,196 +0,0 @@
# based on configure.in/Makefile.am, which is:
# Copyright (c) 1999-2001 by Red Hat, Inc. All rights reserved.
#
# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
# OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
#
# Permission is hereby granted to use or copy this program
# for any purpose, provided the above notices are retained on all copies.
# Permission to modify the code and to distribute modified code is granted,
# provided the above notices are retained, and a notice that the code was
# modified is included with the above copyright notice.
#
# Original author: Tom Tromey
# Modified by: Grzegorz Jakacki <jakacki at acm dot org>
# This is in sync with the configure.in/Makefile.am at r135583
#
# This is a cmake build file for libgc
# Only the functionality needed by mono is supported
#
# FIXME:
add_definitions("-g -O2")
set(THREADS ${libgc_threads})
set(THREADDLLIBS "")
if (THREADS STREQUAL "no" OR THREADS STREQUAL "none" OR THREADS STREQUAL "single")
set(THREADS none)
endif()
if (THREADS STREQUAL "posix" OR THREADS STREQUAL "pthreads")
set(THREADS posix)
set(THREADDLLIBS "-lpthread")
if (${host} MATCHES "x86-.*-linux.*|ia64-.*-linux.*|i386-.*-linux.*|i486-.*-linux.*|i586-.*-linux.*|i686-.*-linux.*|x86_64-.*-linux.*|alpha.*-.*-linux.*|s390.*-.*-linux.*|sparc.*-.*-linux.*|powerpc-.*-linux.*")
add_definitions(-DGC_LINUX_THREADS -D_REENTRANT)
set(parallel_mark_supported yes)
add_definitions(-DTHREAD_LOCAL_ALLOC)
elseif(${host} MATCHES ".*-linux.*")
add_definitions(-DGC_LINUX_THREADS -D_REENTRANT)
elseif(${host} MATCHES ".*-aix.*")
add_definitions(-DGC_AIX_THREADS -D_REENTRANT)
elseif(${host} MATCHES ".*-hpux.*")
message("Only HP/UX 11 threads are supported.")
add_definitions(-DGC_HPUX_THREADS -D_REENTRANT -D_POSIX_C_SOURCE=199506L)
add_definitions(-DTHREAD_LOCAL_ALLOC)
set(parallel_mark_supported yes)
set(THREADDLLIBS "-lpthread -lrt")
elseif(${host} ".*-.*-freebsd.*")
add_definitions(-DGC_FREEBSD_THREADS)
message(FATAL_ERROR "todo")
### if test "x$PTHREAD_CFLAGS" != "x"; then
### INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
### fi
### if test "x$PTHREAD_LIBS" = "x"; then
### THREADDLLIBS=-pthread
### else
### THREADDLLIBS="$PTHREAD_LIBS"
### fi
elseif(${host} ".*-.*-freebsd.*")
add_definitions(-DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS)
elseif(${host} ".*-.*-irix.*")
add_definitions(-DGC_IRIX_THREADS)
elseif(${host} ".*-.*-cygwin.*")
add_definitons(-DGC_WIN32_THREADS)
elseif(${host} ".*-.*-darwin.*")
add_definitons(-DGC_DARWIN_THREADS -DTHREAD_LOCAL_ALLOC)
set(parallel_mark_supported yes)
elseif(${host} ".*-.*-netbsd.*")
add_definitions(-DGC_NETBSD_THREADS -DTHREAD_LOCAL_ALLOC)
set(parallel_mark_supported yes)
elseif(${host} ".*-.*-osf.*")
add_definitions(GC_OSF1_THREADS -DTHREAD_LOCAL_ALLOC)
set(parallel_mark_supported yes)
add_definitions(-pthread)
set(THREADDLLIBS "-lpthread -lrt")
else()
message(FATAL_ERROR "Pthreads not supported by the GC on this platform.")
endif()
endif()
if(THREADS STREQUAL "win32")
add_definitions(GC_WIN32_THREADS)
# Wine getenv may not return NULL for missing entry
add_definitions(NO_GETENV)
if (enable_win32_dllmain)
add_definitions(gc_inside_dll)
endif()
endif()
if(${host} MATCHES "powerpc-.*-darwin.*")
set(powerpc_darwin yes)
endif()
if(parallel_mark_supported AND enable_parallel_mark)
add_definitions("-DPARALLEL_MARK")
endif()
# Configuration of machine-dependent code
ac_msg_checking("which machine-dependent code should be used")
###AC_MSG_CHECKING(
###machdep=
###case "$host" in
### alpha-*-openbsd*)
### machdep="alpha_mach_dep.lo"
### if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
### AC_MSG_WARN(OpenBSD/Alpha without dlopen(). Shared library support is disabled)
### fi
### ;;
### alpha*-*-linux*)
### machdep="alpha_mach_dep.lo"
### ;;
### i?86-*-solaris2.[[89]]|i?86-*-solaris2.1?)
### AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED)
### ;;
### mipstx39-*-elf*)
### machdep="mips_ultrix_mach_dep.lo"
### AC_DEFINE(STACKBASE, __stackbase)
### AC_DEFINE(DATASTART_IS_ETEXT)
### ;;
### mips-dec-ultrix*)
### machdep="mips_ultrix_mach-dep.lo"
### ;;
### mips-nec-sysv*|mips-unknown-sysv*)
### ;;
### mips*-*-linux*)
### ;;
### mips-*-*)
### machdep="mips_sgi_mach_dep.lo"
### AC_DEFINE(NO_EXECUTE_PERMISSION)
### ;;
### sparc-*-netbsd*)
### machdep="sparc_netbsd_mach_dep.lo"
### ;;
### sparc-sun-solaris2.3)
### machdep="sparc_mach_dep.lo"
### AC_DEFINE(SUNOS53_SHARED_LIB)
### ;;
### sparc*-sun-solaris2.*)
### machdep="sparc_mach_dep.lo"
### ;;
### ia64-*-*)
### machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
### ;;
###esac
if(NOT machdep)
set(machdep "mach_dep.c")
endif()
ac_msg_result("${machdep}")
ac_msg_checking("for threads package to use")
ac_msg_result("${THREADS}")
# Include defines that have become de facto standard.
# ALL_INTERIOR_POINTERS can be overridden in startup code.
add_definitions(-DSILENT -DNO_SIGNALS -DNO_EXECUTE_PERMISSION)
# AC_DEFINE(ALL_INTERIOR_POINTERS)
# By default, make the library as general as possible.
add_definitions(-DJAVA_FINALIZATION -DGC_GCJ_SUPPORT -DATOMIC_UNCOLLECTABLE)
add_definitions(-D_IN_LIBGC)
set(SUBDIRS include doc)
foreach(dir ${SUBDIRS})
add_subdirectory(${dir})
endforeach()
set(top_srcdir ../)
# .. is needed for mono/utils/mono-compiler.h
INCLUDE_DIRECTORIES(. .. include)
add_definitions(${CPPFLAGS})
if(powerpc_darwin)
set(asm_libgc_sources powerpc_darwin_mach_dep.s)
endif()
set(libmonogc_la_SOURCES
allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c
dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c
malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c
obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c
solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c
backgraph.c win32_threads.c
pthread_support.c pthread_stop_world.c darwin_stop_world.c
${asm_libgc_sources} ${machdep})
add_library(monogc-static STATIC ${libmonogc_la_SOURCES})
target_link_libraries (${THREADDLLIBS} ${UNWINDLIBS})
-67
View File
@@ -1,70 +1,3 @@
2009-07-20 Geoff Norton <[email protected]>
* darwin_stop_world.c: Fix the x86 version guards to use Apple's
properly defined macros.
2009-07-02 jonas echterhoff <[email protected]>
* darwin_stop_world.c: make debugger code compile on
OS X.
* pthread_support.c: give mach ports to the debugger instead of pthreads,
as those can be iterated over from another executable.
2009-06-22 Neale Ferguson <[email protected]>
* include/private/gc_locks.h: Fix typo in 390 version of GC_compare_and_exchange
and define a null memory barrier.
2009-06-16 Geoff Norton <[email protected]>
* include/private/gcconfig.h: Disable static scanning on this platform
* misc.c: Enable platform-specific disabling of static scanning
2009-06-06 Zoltan Varga <[email protected]>
* CMakeLists.txt: Fix handling of powerpc and the selection of
threads. Delete commented out stuff.
* CMakeLists.txt: CMake build file for libgc.
2009-05-18 Miguel de Icaza <[email protected]>
* include/private/gcconfig.h: Add support for Linux on the PS3
2009-04-28 Zoltan Varga <[email protected]>
* misc.c (GC_init): Avoid casting an lvalue. Fixes part of #498692.
2009-04-24 Kostyantyn Gushtin, Yevgen Kiruha, Serhiy Naumenko, Serhiy
Stetskovych and Ian Dichkovsky <[email protected]>
* include/private/gcconfig.h: Changes to support 64-bit ABI on MIPS.
Add an additional condition for a proper defining of ALIGNMENT
and CPP_WORDSZ.
2009-04-10 Zoltan Varga <[email protected]>
* include/private/gc_locks.h (GC_test_and_set): Merge a change from libgc
7.1's libatomic-ops to fix the ppc build with gcc 4.4.
2009-02-23 Zoltan Varga <[email protected]>
* os_dep.c (GC_init_linux_data_start): Avoid the call to GC_find_limit ()
if GC_no_dls is TRUE, as it is not needed and it complicates debugging since
it causes a SIGSEGV.
2009-01-18 Zoltan Varga <[email protected]>
* include/private/gcconfig.h: Applied patch from Koushik Dutta
([email protected]). Define SEARCH_FOR_DATA_START for android.
2008-11-18 Mark Probst <[email protected]>
* include/private/gc_locks.h (test_and_set): The PPC64 case is
wrong, as it operates on 64 bit values, not on 32 bit ones as the
function requires. The PPC32 case is sufficient.
2008-09-29 Geoff Norton <[email protected]>
* include/private/gcconfig.h: Make Darwin/ARM use mmap() instead of
+2 -23
View File
@@ -2,13 +2,6 @@
# if defined(GC_DARWIN_THREADS)
#include <AvailabilityMacros.h>
#include "mono/utils/mono-compiler.h"
#ifdef MONO_DEBUGGER_SUPPORTED
#include "include/libgc-mono-debugger.h"
#endif
/* From "Inside Mac OS X - Mach-O Runtime Architecture" published by Apple
Page 49:
"The space beneath the stack pointer, where a new stack frame would normally
@@ -112,8 +105,7 @@ void GC_push_all_stacks() {
if(r != KERN_SUCCESS) ABORT("thread_get_state failed");
#if defined(I386)
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
#if defined(_STRUCT_X86_EXCEPTION_STATE32)
lo = state.__esp;
GC_push_one(state.__eax);
@@ -358,7 +350,7 @@ void GC_push_all_stacks() {
(natural_t *)&info, &outCount);
if(r != KERN_SUCCESS) continue;
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
#if defined(_STRUCT_X86_EXCEPTION_STATE32)
lo = (void*)info.__esp;
hi = (ptr_t)FindTopOfStack(info.__esp);
@@ -690,17 +682,4 @@ void GC_darwin_register_mach_handler_thread(mach_port_t thread) {
GC_use_mach_handler_thread = 1;
}
#ifdef MONO_DEBUGGER_SUPPORTED
GCThreadFunctions *gc_thread_vtable = NULL;
void *
GC_mono_debugger_get_stack_ptr (void)
{
GC_thread me;
me = GC_lookup_thread (pthread_self ());
return &me->stop_info.stack_ptr;
}
#endif
#endif
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
@@ -10,12 +10,6 @@
struct thread_stop_info {
mach_port_t mach_thread;
int signal;
word last_stop_count; /* GC_last_stop_count value when thread */
/* last successfully handled a suspend */
/* signal. */
ptr_t stack_ptr; /* Valid only when stopped. */
};
struct GC_mach_thread {
+24 -5
View File
@@ -155,23 +155,43 @@
# define GC_TEST_AND_SET_DEFINED
# endif
# if defined(POWERPC)
# if CPP_WORDSZ == 64
inline static int GC_test_and_set(volatile unsigned int *addr) {
unsigned long oldval;
unsigned long temp = 1; /* locked value */
__asm__ __volatile__(
"1:\tldarx %0,0,%3\n" /* load and reserve */
"\tcmpdi %0, 0\n" /* if load is */
"\tbne 2f\n" /* non-zero, return already set */
"\tstdcx. %2,0,%1\n" /* else store conditional */
"\tbne- 1b\n" /* retry if lost reservation */
"\tsync\n" /* import barrier */
"2:\t\n" /* oldval is zero if we set */
: "=&r"(oldval), "=p"(addr)
: "r"(temp), "1"(addr)
: "cr0","memory");
return (int)oldval;
}
# else
inline static int GC_test_and_set(volatile unsigned int *addr) {
int oldval;
int temp = 1; /* locked value */
__asm__ __volatile__(
"1:\tlwarx %0,0,%1\n" /* load and reserve */
"1:\tlwarx %0,0,%3\n" /* load and reserve */
"\tcmpwi %0, 0\n" /* if load is */
"\tbne 2f\n" /* non-zero, return already set */
"\tstwcx. %2,0,%1\n" /* else store conditional */
"\tbne- 1b\n" /* retry if lost reservation */
"\tsync\n" /* import barrier */
"2:\t\n" /* oldval is zero if we set */
: "=&r"(oldval)
: "r"(addr), "r"(temp)
: "=&r"(oldval), "=p"(addr)
: "r"(temp), "1"(addr)
: "cr0","memory");
return oldval;
}
# endif
# define GC_TEST_AND_SET_DEFINED
inline static void GC_clear(volatile unsigned int *addr) {
__asm__ __volatile__("lwsync" : : : "memory");
@@ -565,7 +585,7 @@
# endif /* ALPHA */
# if defined(S390)
# if !defined(GENERIC_COMPARE_AND_SWAP)
inline static GC_bool GC_compare_and_exchange(volatile GC_word *addr,
inline static GC_bool GC_compare_and_exchange(volatile C_word *addr,
GC_word old, GC_word new_val)
{
int retval;
@@ -583,7 +603,6 @@
return retval == 0;
}
# endif
# define GC_memory_barrier()
# endif
# if !defined(GENERIC_COMPARE_AND_SWAP)
/* Returns the original value of *addr. */
+1 -29
View File
@@ -334,7 +334,6 @@
# define ARM
# define mach_type_known
# define DARWIN_DONT_PARSE_STACK
# define GC_DONT_REGISTER_MAIN_STATIC_DATA
# endif
# endif
# if defined(NeXT) && defined(mc68000)
@@ -805,7 +804,6 @@
# define STACKBOTTOM ((ptr_t) LMGetCurStackBase())
# define DATAEND /* not needed */
# endif
# ifdef LINUX
# if defined(__powerpc64__)
# define ALIGNMENT 8
@@ -884,20 +882,6 @@
# define DATASTART GC_data_start
# define DYNAMIC_LOADING
# endif
# ifdef SN_TARGET_PS3
# define NO_GETENV
# define CPP_WORDSZ 32
# define ALIGNMENT 4
extern int _end [];
// extern int _dso_handle[];
extern int __bss_start;
# define DATAEND (_end)
# define DATASTART (__bss_start)
# define STACKBOTTOM ((ptr_t) ps3_get_stack_bottom ())
# define USE_GENERIC_PUSHREGS
# endif
# ifdef NOSYS
# define ALIGNMENT 4
# define OS_TYPE "NOSYS"
@@ -1392,12 +1376,7 @@
# define DATAEND (_end)
extern int __data_start[];
# define DATASTART ((ptr_t)(__data_start))
# if defined(_MIPS_SZPTR) && (_MIPS_SZPTR == 64)
# define ALIGNMENT 8
# define CPP_WORDSZ 64
# else
# define ALIGNMENT 4
# endif
# define ALIGNMENT 4
# define USE_GENERIC_PUSH_REGS
# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2 || __GLIBC__ > 2
# define LINUX_STACKBOTTOM
@@ -1889,8 +1868,6 @@
# include <features.h>
# if defined(__GLIBC__) && __GLIBC__ >= 2
# define SEARCH_FOR_DATA_START
# elif defined(PLATFORM_ANDROID)
# define SEARCH_FOR_DATA_START
# else
extern char **__environ;
# define DATASTART ((ptr_t)(&__environ))
@@ -2384,13 +2361,8 @@
GC_amiga_get_mem((size_t)bytes + GC_page_size) \
+ GC_page_size-1)
# else
# if defined(SN_TARGET_PS3)
extern void *ps3_get_mem (size_t size);
# define GET_MEM(bytes) (struct hblk*) ps3_get_mem (bytes)
# else
extern ptr_t GC_unix_get_mem();
# define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
#endif
# endif
# endif
# endif
+1 -3
View File
@@ -81,8 +81,6 @@
/* dyn_load.c isn't linked in. */
#ifdef DYNAMIC_LOADING
# define GC_REGISTER_MAIN_STATIC_DATA() GC_register_main_static_data()
#elif defined(GC_DONT_REGISTER_MAIN_STATIC_DATA)
# define GC_REGISTER_MAIN_STATIC_DATA() FALSE
#else
# define GC_REGISTER_MAIN_STATIC_DATA() TRUE
#endif
@@ -481,7 +479,7 @@ void GC_init()
BOOL (WINAPI *pfn) (LPCRITICAL_SECTION, DWORD) = NULL;
HMODULE hK32 = GetModuleHandle(_T("kernel32.dll"));
if (hK32)
pfn = GetProcAddress(hK32,
(FARPROC) pfn = GetProcAddress(hK32,
"InitializeCriticalSectionAndSpinCount");
if (pfn)
pfn(&GC_allocate_ml, 4000);
+3 -12
View File
@@ -54,7 +54,7 @@
# endif
# include <stdio.h>
# if defined(MSWINCE) || defined (SN_TARGET_PS3)
# if defined(MSWINCE)
# define SIGSEGV 0 /* value is irrelevant */
# else
# include <signal.h>
@@ -336,13 +336,6 @@ char *GC_parse_map_entry(char *buf_ptr, word *start, word *end,
{
extern ptr_t GC_find_limit();
if (GC_no_dls)
/*
* Not needed, avoids the SIGSEGV caused by GC_find_limit which
* complicates debugging.
*/
return;
# ifdef LINUX
/* Try the easy approaches first: */
if ((ptr_t)__data_start != 0) {
@@ -511,7 +504,7 @@ void GC_enable_signals(void)
# if !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \
&& !defined(MSWINCE) \
&& !defined(MACOS) && !defined(DJGPP) && !defined(DOS4GW) \
&& !defined(NOSYS) && !defined(ECOS) && !defined(SN_TARGET_PS3)
&& !defined(NOSYS) && !defined(ECOS)
# if defined(sigmask) && !defined(UTS4) && !defined(HURD)
/* Use the traditional BSD interface */
@@ -1456,10 +1449,8 @@ void GC_register_data_segments()
/* hanging from it. We're on thin ice here ... */
extern caddr_t sbrk();
GC_ASSERT(DATASTART);
GC_add_roots_inner(DATASTART, (char *)sbrk(0), FALSE);
# else
GC_ASSERT(DATASTART);
GC_add_roots_inner(DATASTART, (char *)(DATAEND), FALSE);
# if defined(DATASTART2)
GC_add_roots_inner(DATASTART2, (char *)(DATAEND2), FALSE);
@@ -1514,7 +1505,7 @@ void GC_register_data_segments()
# if !defined(OS2) && !defined(PCR) && !defined(AMIGA) \
&& !defined(MSWIN32) && !defined(MSWINCE) \
&& !defined(MACOS) && !defined(DOS4GW) && !defined(SN_TARGET_PS3)
&& !defined(MACOS) && !defined(DOS4GW)
# ifdef SUNOS4
extern caddr_t sbrk();
+2 -10
View File
@@ -1010,11 +1010,7 @@ void GC_thr_init()
t -> flags = DETACHED | MAIN_THREAD;
#ifdef MONO_DEBUGGER_SUPPORTED
if (gc_thread_vtable && gc_thread_vtable->thread_created)
# ifdef GC_DARWIN_THREADS
gc_thread_vtable->thread_created (mach_thread_self (), &t->stop_info.stack_ptr);
# else
gc_thread_vtable->thread_created (pthread_self (), &t->stop_info.stack_ptr);
# endif
gc_thread_vtable->thread_created (pthread_self (), &t->stop_info.stack_ptr);
#endif
GC_stop_init();
@@ -1328,11 +1324,7 @@ void * GC_start_routine_head(void * arg, void *base_addr,
# endif /* IA64 */
#ifdef MONO_DEBUGGER_SUPPORTED
if (gc_thread_vtable && gc_thread_vtable->thread_created)
# ifdef GC_DARWIN_THREADS
gc_thread_vtable->thread_created (mach_thread_self(), &me->stop_info.stack_ptr);
# else
gc_thread_vtable->thread_created (my_pthread, &me->stop_info.stack_ptr);
# endif
gc_thread_vtable->thread_created (my_pthread, &me->stop_info.stack_ptr);
#endif
UNLOCK();
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
+4 -54
View File
@@ -1,61 +1,15 @@
2009-08-21 Ankit Jain <[email protected]>
* Makefile.am (man_MANS): Add xbuild.1
* xbuild.1: New.
2009-06-12 Jb Evain <[email protected]>
* mcs.1: update the /platform information.
2009-05-12 Tor Lillqvist <[email protected]>
* mkbundle.1: Document MONO_BUNDLED_OPTIONS.
2009-04-09 Jonathan Pryor <[email protected]>
* mdoc-update.1: Document -L, -r options.
2009-04-06 Jonathan Pryor <[email protected]>
* mdoc.5: Document //code/@src attribute.
2009-04-03 Andrés G. Aragoneses <[email protected]>
* monolinker.1: Document -m modifier.
2009-03-31 Jonathan Pryor <[email protected]>
* mdoc-update.1: Fix --out=DIRECTORY formatting. (It was causing the
remaining text to be bolded within monodoc).
2009-03-30 Jonathan Pryor <[email protected]>
* mdoc-update.1: Add new --exceptions=added functionality.
2009-03-23 Massimiliano Mantione <[email protected]>
* mono.1: Updated the profiler documentation, removing the "gc-signal"
option (it does not exist anymore) and clarifying the role of signals
in heap profiling.
2009-03-20 Jonathan Pryor <[email protected]>
* mdoc-export-html.1: Document --force-update parameter.
2008-12-31 Massimiliano Mantione <[email protected]>
* mono.1: Updated the profiler documentation, removing the "ts"
option (it does not exist anymore) and explaining the defaults for
allocation and heap profiling.
* mono.1: Merged the profiler documentation from trunk (r122288),
removing the "ts" option (it does not exist anymore) and explaining
the defaults for allocation and heap profiling.
2008-12-12 Rolf Bjarne Kvinge <[email protected]>
* Makefile.am, vbnc.1: Remove vbnc.1. It's living in the
mono-basic module now.
2008-11-20 Rodrigo Kumpera <[email protected]>
* mono.1: Document env vars MONO_XDEBUG and MONO_VERBOSE_METHOD.
[Backport of r121406.]
2008-10-18 Jonathan Pryor <[email protected]>
@@ -295,7 +249,3 @@ Mon Jan 22 11:15:26 CET 2007 Paolo Molaro <[email protected]>
* mono-shlib-cop.1: Document another BUG/design issue that it doesn't check
for; formatting/style changes.
2009-05-22 Michael Barker <[email protected]>
* man.1: Added documentation for MONO_MESSAGING_PROVIDER environment
variable.
-2
View File
@@ -38,7 +38,6 @@ man_MANS = \
mono-xmltool.1 \
mozroots.1 \
oldmono.1 \
pdb2mdb.1 \
permview.1 \
prj2make.1 \
resgen.1 \
@@ -50,7 +49,6 @@ man_MANS = \
soapsuds.1 \
sqlsharp.1 \
wsdl.1 \
xbuild.1 \
xsd.1
EXTRA_DIST = $(man_MANS)
+3 -3
View File
@@ -6,7 +6,7 @@
.SH NAME
csharp, gsharp \- Interactive C# Shell
.SH SYNOPSIS
.B csharp [--attach PID] [file1 [file2]]
.B csharp [--attach PID]
[options]
.P
.B gsharp [file1 [file2]]
@@ -27,8 +27,8 @@ into the main loop of a Gtk# application, avoiding any problems
arising from the multi-threaded nature of injecting itself into a
target process.
.PP
Files specified in the command line will be loaded and executed as
scripts.
This version allows a number of scripts to be specified in the command
line.
.SH OPTIONS
.TP
.I "\-\-attach"
+3 -35
View File
@@ -136,18 +136,10 @@ precedence over the attributes.
Extracts the C#/XML documentation from the source code and stores in in
the given FILE.
.TP
.I \-errorreport
This flag is ignored by Mono's C# compiler and is present only to
allow MCS to be used as a CSC replacement for msbuild/xbuild.
.TP
.I \-\-fatal
This is used for debugging the compiler. This makes the error emission
generate an exception that can be caught by a debugger.
.TP
.I \-filealign
This flag is ignored by Mono's C# compiler and is present only to
allow MCS to be used as a CSC replacement for msbuild/xbuild.
.TP
.I \-keyfile:KEYFILE
Strongname (sign) the output assembly using the key pair present in
the specified strong name key file (snk). A full key pair is required
@@ -184,14 +176,6 @@ methods will lead to error.
Restrict compiler to use only the second ISO standardized features.
This allows the use of generics, static classes, iterators and
anonymous methods for example.
.TP
.I "3"
Restrict the compiler to use only the features available in C# 3.0
(a superset of ISO-1 and ISO-2).
.TP
.I "future"
Enables features from upcoming versions of the language. As of
May 2009 this includes support for C# 4 as released in Visual Studio 2010 beta 1.
.PP
Notice that this flag only controls the language features available to
the programmer, it does not control the kind of assemblies produced.
@@ -285,11 +269,6 @@ For more details see the PACKAGE section in this document
.ne
.RE
.TP
.I \-platform:ARCH
Used to specify the target platform. The possible values are: anycpu,
x86, x64 or itanium. As of June 2009, the Mono runtime only have support
to emit anycpu and x86 assemblies.
.TP
.I -resource:RESOURCE[,ID]
Embeds to the given resource file. The optional ID can be used to
give a different name to the resource. If not specified, the resource
@@ -380,15 +359,11 @@ Debugging. Turns on verbose yacc parsing.
Shows the compiler version.
.TP
.I \-warnaserror, \-warnaserror+
All compilers warnings will be reported as errors.
Treat warnings as errors.
.TP
.I \-warnaserror:W1,[Wn], -warnaserror+:W1,[Wn]
.I \-warnaserror:W1,[Wn]
Treats one or more compiler warnings as errors.
.TP
.I \-warnaserror-:W1,[Wn]
Sets one or more compiler warnings to be always threated as warnings.
Becomes useful when used together with -warnaserror.
.TP
.I \-warn:LEVEL
Sets the warning level. 0 is the lowest warning level, and 4 is the
highest. The default is 4.
@@ -405,14 +380,7 @@ assembly.
Use this to stop option parsing, and allow option-looking parameters
to be passed on the command line.
.PP
.SH PACKAGES AND LIBRARIES
When referencing an assembly, if the name of the assembly is a path,
the compiler will try to load the assembly specified in the path. If
it does not, then the compiler will try loading the assembly from the
current directory, the compiler base directory and if the assembly is
not found in any of those places in the directories specified as
arguments to the -lib: command argument.
.PP
.SH PACKAGES
Depending on the invocation for the C# compiler (mcs, gmcs, or smcs)
you will get a default set of libraries and versions of those
libraries that are referenced.
+5 -10
View File
@@ -18,21 +18,13 @@ mdoc export-html \- Convert \fBmdoc\fR(5) XML to HTML.
documentation XML files within \fIDIRECTORIES\fR.
.SH OPTIONS
.TP
.B \-\-default\-template
Writes the default XSLT used to \fIstdout\fR.
.TP
\fB\-\-ext\fR=\fIEXTENSION\fR
The file extension to use for created files.
.Sp
This defaults to \fIhtml\fR.
.TP
\fB\-\-force-update\fR
Always generate new files. If not specified,
will only generate a new output file if the source
documentation file is newer than the target output file.
.TP
\fB\-o\fR, \fB\-\-out\fR=\fIDIRECTORY\fR
Write the created files within directory \fIDIRECTORY\fR.
.B \-\-default\-template
Writes the default XSLT used to \fIstdout\fR.
.TP
\fB\-\-template\fR=\fIFILE\fR
An XSLT file to use to generate the created files.
@@ -41,6 +33,9 @@ If not specified, uses the template produced by \fI\-\-dump\-template\fR.
.Sp
See the \fITEMPLATE FORMAT\fR section below for more information.
.TP
\fB\-o\fR, \fB\-\-out\fR=\fIDIRECTORY\fR
Write the created files within directory \fIDIRECTORY\fR.
.TP
\fB\-h\fR, \fB\-?\fR, \fB\-\-help\fR
Display a help message and exit.
.SH TEMPLATE FORMAT
Loaded 100 of 7788 files, more files were not shown because too many files have changed in this diff. Show more