Compare commits

..
Author SHA1 Message Date
Zoltan Varga db39bf4937 2008-07-22 Zoltan Varga <[email protected]>
* mini.c (mini_method_compile): Rename the COUNT env variable to
	MONO_COUNT.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=108449
2008-07-22 10:28:37 +00:00
Zoltan Varga e69505ce7e Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=108396
2008-07-21 18:04:28 +00:00
Zoltan Varga dbcd6bfaab 2008-07-21 Zoltan Varga <[email protected]>
* method-to-ir.c (mini_emit_load_intf_bit_reg_class): Fix the aot case.

	* debug-mini.c (mono_debug_close_method): Use cfg->locals/args instead of
	indexing into the varinfo array.
	(write_variable): Handle dead variables more gracefully.

	* method-to-ir.c (UNVERIFIED): Sync with the version in mini.c.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=108395
2008-07-21 17:58:37 +00:00
Zoltan Varga f5c7674018 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=108368
2008-07-21 16:13:16 +00:00
Zoltan Varga 8d5b97e1c8 2008-07-21 Zoltan Varga <[email protected]>
* method-to-ir.c: Merge all the remaining mini.c changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=108345
2008-07-21 14:21:07 +00:00
Zoltan Varga 88eaa3b38d 2008-07-16 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Merge ldtoken sharing changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=108083
2008-07-16 19:34:29 +00:00
Zoltan Varga 6e15e7cc94 2008-07-16 Zoltan Varga <[email protected]>
* mini.c method-to-ir.c mini-amd64.c: More generic sharing updates.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=108082
2008-07-16 19:19:29 +00:00
Zoltan Varga 851b6d558e 2008-07-16 Zoltan Varga <[email protected]>
* mini.c jit-icalls.h jit-icalls.c: Move mono_object_castclass () to
	jit-icalls.c.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=108049
2008-07-16 15:45:46 +00:00
Zoltan Varga d65ffcd876 2008-07-16 Zoltan Varga <[email protected]>
* method-to-ir.c: Merge unbox sharing changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=108026
2008-07-16 13:16:05 +00:00
Zoltan Varga db8f861d24 2008-07-15 Zoltan Varga <[email protected]>
* method-to-ir.c (emit_get_rgctx): Fix some FIXMEs.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=107938
2008-07-15 10:25:27 +00:00
Zoltan Varga 1d23cf4603 2008-07-14 Zoltan Varga <[email protected]>
* method-to-ir.c: Clean up the get_runtime_generic_context functions a bit:
	rename them to emit_get_rgctx_..., reduce number of parameters, pass the
	important parameters last.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=107912
2008-07-14 21:58:26 +00:00
Zoltan Varga 9fe8127292 Merge some of the generic sharing changes.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=107909
2008-07-14 21:31:01 +00:00
Zoltan Varga fb276e9c81 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=107904
2008-07-14 20:41:06 +00:00
Zoltan Varga 2829e1c9c3 2008-06-26 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Handle cases when ldfld is called with
	a vtype on the stack, instead of an address.

	* iltests.il.in (HAS_VALUE): Add a test.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=106684
2008-06-26 20:56:11 +00:00
Zoltan Varga bd6b57c749 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=106677
2008-06-26 20:02:54 +00:00
Zoltan Varga a0839a37b6 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=105508
2008-06-10 22:26:43 +00:00
Zoltan Varga c93c6dcb39 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=104647
2008-06-02 10:26:15 +00:00
Zoltan Varga b01cdd4f72 2008-05-30 Zoltan Varga <[email protected]>
* ir-emit.h (NEW_VARLOADA): Mark the component vars of a long var INDIRECT
	as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=104520
2008-05-30 13:55:07 +00:00
Zoltan Varga b937cc95bb 2008-05-30 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_local_regalloc): Fix some issues related to fixed sreg2
	allocation.

	* Makefile.am: Don't run bench.exe on make check, it takes too much time.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=104514
2008-05-30 13:38:36 +00:00
Zoltan Varga 324255795e 2008-05-22 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Merge more generic sharing changes missed
	earlier.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=103805
2008-05-22 16:33:31 +00:00
Zoltan Varga 36963777d7 2008-05-19 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Remove non-vtype restriction for
	generic sharing of NEWARR.

	* mini.c (mini_method_compile): Use cfg->args [0] for accessing the this 
	argument.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=103434
2008-05-18 23:33:42 +00:00
Zoltan Varga 372fcb7b55 2008-05-19 Zoltan Varga <[email protected]>
* mini.h (get_vreg_to_inst): Use braces around the argument.

	* method-to-ir.c: Check unverifiable status after calls to handle_stack_args ().
	Update FIXMEs.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=103433
2008-05-18 23:08:39 +00:00
Zoltan Varga 4213167b49 2008-05-19 Zoltan Varga <[email protected]>
* method-to-ir.c: Merge --debug=casts support.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=103431
2008-05-18 22:50:22 +00:00
Zoltan Varga 33d387f065 2008-05-18 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Merge generic sharing changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=103428
2008-05-18 21:11:00 +00:00
Zoltan Varga bd2a5787a7 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=103425
2008-05-18 19:11:50 +00:00
Zoltan Varga 8ef2943e88 2008-05-07 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Optimize ldobj+stobj pairs.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=102739
2008-05-07 16:30:22 +00:00
Zoltan Varga dc8de752d2 2008-04-17 Zoltan Varga <[email protected]>
* branch-opts.c (mono_if_conversion): Remove some restrictions which are not
	 needed.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100957
2008-04-16 23:26:04 +00:00
Zoltan Varga 5d8cd8a1e8 2008-04-14 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_local_regalloc): Free the hreg of a dreg even if the
	dreg is alive since the branches inside bblocks problem doesn't exist on
	the linear IR branch.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100634
2008-04-14 12:16:03 +00:00
Zoltan Varga 20941b9e22 2008-04-14 Zoltan Varga <[email protected]>
* branch-opts.c (mono_if_conversion): Re-run the if conversion on merged blocks
	too. Rerun local optimizations if there was an if-conversion.

	* local-propagation.c (mono_local_deadce): Use MONO_INS_HAS_NO_SIDE_EFFECT.

	* mini.h (MONO_INS_HAS_NO_SIDE_EFFECT): Moved here from branch-opts.c, renamed from
	INS_HAS_NO_SIDE_EFFECT, added more instructions.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100615
2008-04-14 00:35:10 +00:00
Zoltan Varga 549e9e15d2 2008-04-14 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_deadce): Eliminate OP_IADD_IMM/OP_ISUB_IMM
	as well.
	(mono_local_cprop2): Allow further iterations after a constant fold. Also
	special case ISUB/IADD pairs.

	* mini-codegen.c (mono_local_regalloc): If CLOB is '1', try to allocate
	sreg1 to the same hreg as dreg, to avoid a copy later.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100614
2008-04-13 23:52:43 +00:00
Zoltan Varga f850c091e9 2008-04-13 Zoltan Varga <[email protected]>
* method-to-ir.c (type_from_op): Set ins->klass if ins->type is STACK_MP.
	(mono_spill_global_vars): Handle soft float.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100584
2008-04-13 18:45:55 +00:00
Zoltan Varga 265e667831 2008-04-13 Zoltan Varga <[email protected]>
* mini-arm.c (mono_arch_emit_call): Fix passing of r4 arguments on the stack in
	the soft float case.

	* mini.c (mono_op_imm_to_op): Use OP_IADD/OP_LADD instead of OP_PADD since the
	later is mapped to CEE_ADD.

	* method-to-ir.c (mono_handle_soft_float): Fix a typo.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100552
2008-04-13 13:20:23 +00:00
Zoltan Varga cf8e05c0a0 2008-04-11 Zoltan Varga <[email protected]>
* mini.c (mini_method_compile): Set cfg->opt by disabling SSAPRE instead of
	enabling everything.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100465
2008-04-11 18:56:16 +00:00
Zoltan Varga fe5e127c24 2008-04-11 Zoltan Varga <[email protected]>
* mini-ppc.c (NEW_INS): Use mono_bblock_insert_after_ins ().

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100462
2008-04-11 18:38:30 +00:00
Paolo Molaro 069f0ce2c5 Fri Apr 11 18:44:31 CEST 2008 Paolo Molaro <[email protected]>
* cpu-ppc.md, mini-ppc.c, mini-ppc.h, mini.h, decompose.c: first cut
	of powerpc port.


svn path=/branches/vargaz/mini-linear-il/mono/; revision=100454
2008-04-11 16:45:47 +00:00
Zoltan Varga a38a9a8d66 2008-04-11 Zoltan Varga <[email protected]>
* mini-arm.c (NEW_INS): Fix this after the ins_list changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100440
2008-04-11 15:20:37 +00:00
Zoltan Varga e3c5aabf6c 2008-04-11 Zoltan Varga <[email protected]>
* method-to-ir.c: Remove a FIXME, we are now faster on scimark as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100430
2008-04-11 13:12:16 +00:00
Zoltan Varga c2e8cce063 2008-04-11 Zoltan Varga <[email protected]>
* mini-amd64.h (MONO_ARCH_EMIT_BOUNDS_CHECK): Add MONO_ARCH_EMIT_BOUNDS_CHECK
	definition which somehow got missing.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100429
2008-04-11 13:08:12 +00:00
Zoltan Varga fff996aae3 2008-04-07 Zoltan Varga <[email protected]>
* method-to-ir.c (MONO_ARCH_EMIT_BOUNDS_CHECK): Move the arch-specific definitions
	to mini-amd64.h/mini-x86.h.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=100024
2008-04-07 15:48:09 +00:00
Zoltan Varga 3df8dbd498 2008-04-07 Zoltan Varga <[email protected]>
* method-to-ir.c: Add a FIXME.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99988
2008-04-06 23:14:43 +00:00
Zoltan Varga 7794268a51 2008-04-07 Zoltan Varga <[email protected]>
* method-to-ir.c: Move the branch+bblock macros to ir-emit.h as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99987
2008-04-06 23:02:43 +00:00
Zoltan Varga e32f635d7f 2008-04-07 Zoltan Varga <[email protected]>
* method-to-ir.c: Split up this now giant file a bit: Move the instruction 
	emission macros to ir-emit.h, and the various decompose functions to 
	decompose.c.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99986
2008-04-06 22:52:56 +00:00
Zoltan Varga e8fbd6100c 2008-04-05 Zoltan Varga <[email protected]>
* local-propagation.c: Move the if-conversion pass to branch-opts.c where it belongs.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99902
2008-04-05 10:35:42 +00:00
Zoltan Varga b5996d4d56 2008-04-05 Zoltan Varga <[email protected]>
* mini.c: Enable MONO_OPT_SSA if abcrem or ssapre is enabled, so code only needs to
	check whenever SSA is enabled.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99901
2008-04-05 10:33:02 +00:00
Zoltan Varga ab05d88d85 2008-04-02 Zoltan Varga <[email protected]>
* local-propagation.c (mono_branch_to_cmov): Rename this to mono_if_conversion ().

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99695
2008-04-02 21:41:56 +00:00
Zoltan Varga 64f8723ff7 2008-04-02 Zoltan Varga <[email protected]>
* mini.h mini.c method-to-ir.c: Rename cfg->disable_extended_bblocks to 
	cfg->enable_extended_bblocks. Add some comments as to why it is currently 
	disabled.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99692
2008-04-02 21:23:46 +00:00
Zoltan Varga 1b47579f1f 2008-04-01 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_handle_global_vregs): Make the component vregs of a long
	vreg volatile if the IR also uses the original vreg.

	* mini.c (mono_compile_create_var_for_vreg): Only make the component vregs of
	a long vreg volatile if it is needed by optimizations.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99574
2008-04-01 20:15:05 +00:00
Zoltan Varga c667560e5e 2008-04-01 Zoltan Varga <[email protected]>
* mini-x86.c (mono_arch_emit_inst_for_method): Add support for Min/Max.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99567
2008-04-01 19:39:03 +00:00
Zoltan Varga dda1fa727c 2008-04-01 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_cprop2): Avoid copy propagation if it would
	make it impossible to use reverse copy propagation later.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99566
2008-04-01 19:38:15 +00:00
Zoltan Varga 25c754f99d 2008-04-01 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_cprop2): Make def_index a gint32, so the
	def_index checks actually work. Also, disable copy propagation for floats.

	* method-to-ir.c (mono_spill_global_vars): Avoid using a previous lvreg for the
	destination, since this makes little sense, and it makes the liveness interval of
	the lvreg longer, leading to worse generated code.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99559
2008-04-01 18:36:04 +00:00
Zoltan Varga c6be527773 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=99550
2008-04-01 17:08:37 +00:00
Zoltan Varga 2971a77ea3 2008-04-01 Zoltan Varga <[email protected]>
* mini-s390.c (add_stackParm): Increase sz->stack_size.
	(mono_arch_allocate_vars): Handle vtype addresses passed on the stack.
	(mono_arch_output_basic_block): Fix OP_ADDCC.
	(mono_arch_decompose_long_opts): Remove OP_LADD, the generic code works for that
	too.

	* object.cs: Add tests for passing a vtype addr on the stack on s390.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99539
2008-04-01 16:05:34 +00:00
Zoltan Varga a18944c912 2008-04-01 Zoltan Varga <[email protected]>
* mini-s390.c (mono_arch_output_basic_block): Fix OP_ICONV_TO_I1/I2.

	* basic.cs: Add new tests.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99484
2008-03-31 22:40:22 +00:00
Zoltan Varga d5db38f930 2008-03-31 Zoltan Varga <[email protected]>
* method-to-ir.c (mini_emit_inst_for_method): Use LEA in the get_Chars 
	implementation.

	* mini-amd64.c (mono_arch_output_basic_block): Avoid a rex prefix in
	LOADU1/LOADU2_MEMBASE.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99432
2008-03-31 16:06:53 +00:00
Zoltan Varga 47ee6f6b0d 2008-03-31 Zoltan Varga <[email protected]>
* mini-s390.c (mono_arch_emit_call): Fix a problem when passing a vtype address 
	on the stack.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99421
2008-03-31 13:41:15 +00:00
Zoltan Varga d446baf6df 2008-03-31 Zoltan Varga <[email protected]>
* mini-s390.c (mono_arch_output_basic_block): Fix SUBCC implementation.
	(mono_arch_decompose_long_opts): Remove LSUB, the generic code works on s390 too.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99417
2008-03-31 12:36:04 +00:00
Zoltan Varga 147e8a0e8f 2008-03-30 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_local_regalloc): Add asserts for some situations which are
	not yet handled.

	* cpu-s390.md: Remove clob:1 from some opcodes where it is not needed to avoid
	tripping up the local register allocator.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99348
2008-03-30 16:29:26 +00:00
Zoltan Varga f0be15f518 2008-03-30 Zoltan Varga <[email protected]>
* method-to-ir.c (decompose_opcode): Handle OP_LCONV_TO_OVF_U8_UN.

	* mini.c (mono_decompose_op_imm): Set bb->max_vreg.

	* mini-s390.c: Fix build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99316
2008-03-30 10:21:04 +00:00
Zoltan Varga 590f425785 2008-03-29 Zoltan Varga <[email protected]>
* mini-s390.c: Fix build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99308
2008-03-29 21:19:31 +00:00
Zoltan Varga 53767b2294 2008-03-29 Zoltan Varga <[email protected]>
* mini-s390x.c (mono_arch_allocate_vars): Fix vararg calls which return a 
	vtype.

	* cpu-s390x.md: Avoid clob:1 on some opcodes, since mono_arch_output_basic_block
	already handles them.

	* mini-s390.c (get_call_info): Fix passing of small float/double structures.
	
	* mini-s390x.c (get_call_info): Fix passing of small float/double structures.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99305
2008-03-29 19:22:01 +00:00
Zoltan Varga cbfd23cf41 2008-03-29 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Add sign extension to the SWITCH 
	implementation just as in inssel.brg.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99292
2008-03-29 16:23:29 +00:00
Zoltan Varga a402181ea7 2008-03-29 Zoltan Varga <[email protected]>
* cpu-s390x.md mini-s390x.c: Add int_conv_to_r_un.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99270
2008-03-29 05:06:49 +00:00
Zoltan Varga 68e9866d6c 2008-03-28 Zoltan Varga <[email protected]>
* inssel-s390x.brg cpu-s390x.md mini-s390x.h mini-s390x.c: Finish S390 port.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99229
2008-03-28 18:00:59 +00:00
Zoltan Varga 31f07bcf5f 2008-03-28 Zoltan Varga <[email protected]>
* mini.c (mini_method_compile): Print a different message when a shared method is
	compiled.

	* mini-s390.c (emit_load_volatile_registers): Fix a merge problem.

	* method-to-ir.c (mono_method_to_ir2): Fix build on platforms without
	MONO_ARCH_VTABLE_REG defined.

	* cpu-s390x.md mini-s390x.h mini-s390x.c: Implement long/float/call support.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99185
2008-03-28 11:36:39 +00:00
Zoltan Varga 551e4073dd 2008-03-26 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Fix generic sharing support in ldtoken.

	* gshared.cs: Add new tests.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99043
2008-03-26 17:22:40 +00:00
Zoltan Varga c8ea79a789 2008-03-26 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Ongoing generic sharing work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=99000
2008-03-26 00:17:26 +00:00
Zoltan Varga c29ddc5aea 2008-03-25 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Implement generic sharing of NEWOBJ and
	LDTOKEN.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98992
2008-03-25 20:12:32 +00:00
Zoltan Varga 83e83befee 2008-03-25 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Simplify the newobj vtype code a bit.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98989
2008-03-25 19:20:23 +00:00
Zoltan Varga d80a88ab66 2008-03-25 Zoltan Varga <[email protected]>
* method-to-ir.c: Disable generic sharing for most opcodes to avoid running into
	not-implemented parts.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98986
2008-03-25 18:52:25 +00:00
Zoltan Varga 952d650bd9 2008-03-25 Zoltan Varga <[email protected]>
* method-to-ir.c: Port some of the generic sharing changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98977
2008-03-25 16:06:08 +00:00
Zoltan Varga a4f96fc6d0 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=98948
2008-03-25 09:23:50 +00:00
Zoltan Varga 28279efc6c 2008-03-25 Zoltan Varga <[email protected]>
* mini-amd64.c (add_valuetype): Fix handling of vtypes in the managed case.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98939
2008-03-25 07:37:11 +00:00
Zoltan Varga d046baba56 2008-03-24 Zoltan Varga <[email protected]>
* method-to-ir.c (NEW_I8CONST): Set ins->type.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98923
2008-03-24 21:43:28 +00:00
Zoltan Varga 60eb63cb61 2008-03-24 Zoltan Varga <[email protected]>
* cpu-amd64.md (lcompare_imm): Move the _membase_imm opcodes to one place.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98916
2008-03-24 21:07:29 +00:00
Zoltan Varga f4493b5cb9 2008-03-24 Zoltan Varga <[email protected]>
* method-to-ir.c (op_to_op_src1_membase): Disable OP_X86_COMPARE_MEMBASE8_IMM on
	amd64 as well.
	(decompose_opcode): Add some missing opcodes.

	* cpu-amd64.md: Add amd64_sub_membase_imm, fix the lengths of the load_mem 
	opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98915
2008-03-24 21:01:17 +00:00
Zoltan Varga b98f9a9770 2008-03-24 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Fix the amd64 build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98905
2008-03-24 19:24:09 +00:00
Zoltan Varga bb86d1ae82 2008-03-24 Zoltan Varga <[email protected]>
* mini-<ARCH>.c (mono_arch_emit_call): Remove the unused 'is_virtual' argument.

	* mini-x86.c method-to-ir.c mini.c local-propagation.c: Fix some small bugs.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98904
2008-03-24 19:22:39 +00:00
Zoltan Varga 228b794298 2008-03-24 Zoltan Varga <[email protected]>
* mini-x86.c (mono_arch_emit_call): Fix win32 and apple support.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98872
2008-03-24 14:25:27 +00:00
Zoltan Varga 993e2006bf 2008-03-24 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_decompose_long_opts): Handle OP_LCONV_TO_OVF_U and
	OP_LCONV_TO_OVF_U_UN.

	* mini-x86.c: Fix x86 build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98856
2008-03-24 12:16:21 +00:00
Zoltan Varga cab239fbc1 2008-03-23 Zoltan Varga <[email protected]>
* mini-s390.c (mono_arch_emit_call): Remove some dead code.

	* mini-s390x.h mini-s390x.c cpu-s390x.md: Ongoing S390x porting work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98835
2008-03-23 18:41:06 +00:00
Zoltan Varga d3a68ca7da Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=98832
2008-03-23 15:58:06 +00:00
Zoltan Varga 6424a77dec 2008-03-22 Zoltan Varga <[email protected]>
* mini-s390.h mini-s390.c: Avoid using the same registers for local and global 
	reg allocation. Finish the S390 port.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98776
2008-03-21 23:59:58 +00:00
Zoltan Varga 078b428610 2008-03-21 Zoltan Varga <[email protected]>
* inssel.brg: Use MONO_INST_NEW in MONO_EMIT_NEW_ICONST () since that is called
	by the backends.

	* method-to-ir.c (mini_emit_inst_for_method): Fix an assert on 32 bit platforms.
	(mono_method_to_ir2): Fix the LDLOCA+INITOBJ optimization in case of primitive types.

	* mini-s390.c mini-ops.h cpu-s390.md: Ongoing S390 porting work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98773
2008-03-21 21:27:41 +00:00
Zoltan Varga f39cfca18c 2008-03-21 Zoltan Varga <[email protected]>
* abcremoval2.c (mono_perform_abc_removal2): Fix reading of invalid memory.

	* method-to-ir.c (MONO_INST_NEW): Initialize ins->type as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98760
2008-03-21 18:39:50 +00:00
Zoltan Varga c84225f927 2008-03-21 Zoltan Varga <[email protected]>
* method-to-ir.c (decompose_opcode): Call an arch-specific decompose function if
	defined.
	(mono_spill_global_vars): Fix a bug when converting moves into stores.

	* mini.c (mono_op_imm_to_op): Handle LOCALLOC_IMM.

	* mini-ops.h mini-s390.h mini-s390.c cpu-s390.md: Ongoing S390 porting work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98749
2008-03-21 17:06:59 +00:00
Zoltan Varga c466b866be Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=98673
2008-03-20 14:44:50 +00:00
Zoltan Varga 10157d6d4f 2008-03-19 Zoltan Varga <[email protected]>
* mini-x86.c: Fix the x86 port after the ins list changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98623
2008-03-19 19:09:43 +00:00
Zoltan Varga 908338ed49 2008-03-19 Zoltan Varga <[email protected]>
* mini-amd64.c (mono_arch_peephole_pass_2): Remove some dead code.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98620
2008-03-19 18:47:46 +00:00
Zoltan Varga 8810665a8e 2008-03-19 Zoltan Varga <[email protected]>
* mini-s390.c (calculate_sizes): Rename this to get_call_info for consistency
	with the other architectures, add an 'mp' argument, fold 'sz' argument into the
	return value.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98619
2008-03-19 18:28:13 +00:00
Zoltan Varga f6c598d72a 2008-03-19 Zoltan Varga <[email protected]>
* mini-s390.c (mono_arch_peephole_pass_2): Fix this after the ins list changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98611
2008-03-19 18:16:17 +00:00
Zoltan Varga 876ad302da 2008-03-19 Zoltan Varga <[email protected]>
* mini.c (mono_replace_ins): Fix some issues after the ins list changes.

	* regalloc2.c: Fix compilation on non-amd64 platforms.

	* mini-s390.c: Ongoing porting work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98607
2008-03-19 16:56:32 +00:00
Zoltan Varga 5d5eb8da74 2008-03-19 Zoltan Varga <[email protected]>
* method-to-ir.c (MONO_EMIT_BOUNDS_CHECK): Decompose this early if abcrem is
	disabled to help some local optimizations.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98599
2008-03-19 14:56:57 +00:00
Zoltan Varga 481d770f90 2008-03-19 Zoltan Varga <[email protected]>
* mini-codegen.c: Remove some dead code and add micro optimizations from HEAD.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98592
2008-03-19 13:16:11 +00:00
Zoltan Varga f516f33648 2008-03-19 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_cprop2): Clean up the div/rem strength 
	reduction stuff.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98590
2008-03-19 12:38:18 +00:00
Zoltan Varga f648837255 2008-03-19 Zoltan Varga <[email protected]>
* *.h *.c: Transition to using prev-next pointers on MonoInst's using more user
	friendly APIs.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98588
2008-03-19 12:25:00 +00:00
Zoltan Varga 319b1c1f25 2008-03-17 Zoltan Varga <[email protected]>
* mini-amd64.h mini-amd64.c: Emit the IMT argument right before the call to make
	it easier for mono_arch_find_imt_method () to find it.

	* regalloc2.c: New unified local/global register allocator implementation.

	* mini.h mini.c mini-amd64.c: Changes required by the new register allocator.

	* tests.cs: Tests for the new register allocator.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98493
2008-03-17 20:56:48 +00:00
Zoltan Varga 1cc761e82d 2008-03-13 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_op_to_op_imm): Handle OP_LOCALLOC as well.
	(mono_method_to_ir2): Don't convert OP_LOCALLOC to OP_LOCALLOC_IMM here, it is
	done automatically by the constant propagation pass.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98192
2008-03-13 17:50:47 +00:00
Zoltan Varga 791a25ab22 2008-03-12 Zoltan Varga <[email protected]>
* mini-ops.h: Add OP_TAILCALL.
	
	* mini.h (MonoCallInst): Add a 'tail_call' flag.

	* mini.h (MONO_IS_CALL): Consider OP_TAILCALL as well.

	* method-to-ir.c: Handle tail calls similarly to normal calls by emitting argument
	passing code in mono_arch_emit_call (). This eliminates the need to mark arguments
	as volatile and also eliminates emit_load_volatile_arguments ().

	* mini-amd64.c cpu-amd64.md: Add support for OP_TAILCALL.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=98041
2008-03-12 12:29:33 +00:00
Zoltan Varga 8756e99a2b 2008-03-08 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_cprop2): Optimize the sext+storei1/storei2
	instruction combination.
	(mono_local_deadce): Ditto.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97749
2008-03-08 12:18:14 +00:00
Zoltan Varga e29d2b0cb8 2008-03-07 Zoltan Varga <[email protected]>
* cpu-amd64.md: Add clob:1 to some float opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97708
2008-03-07 17:36:59 +00:00
Zoltan Varga 8f81bc5524 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=97685
2008-03-07 13:06:46 +00:00
Zoltan Varga df2f145eb7 2008-03-05 Zoltan Varga <[email protected]>
* mini-ops.h: Add some new s390 opcodes.

	* method-to-ir.c (mono_decompose_long_opts): Add a new arch-specific function to
	decompose some long opcodes.

	* mini-s390.h mini-s390.c cpu-s390.md: Ongoing s390 work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97418
2008-03-05 17:05:39 +00:00
Zoltan Varga deb6a69d00 2008-03-04 Zoltan Varga <[email protected]>
* mini-amd64.c mini.h mini.c: Add support for passing small valuetypes in
	registers in managed methods.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97299
2008-03-04 13:45:04 +00:00
Zoltan Varga 2198893997 2008-03-04 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_deadce): Do reverse copyprop for OP_VMOVE as
	well.

	* mini-amd64.c (mono_arch_get_this_arg_reg): New arch-specific function used
	to return the index of the register holding the this argument for a call.

	* tramp-amd64.c (mono_arch_get_unbox_trampoline): Use mono_arch_get_this_arg_reg.

	* mini-amd64.c method-to-ir.c mini.c: Add support for returning small valuetypes 
	in registers in managed methods.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97286
2008-03-04 11:39:13 +00:00
Zoltan Varga 327e3d216f 2008-03-04 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_print_ins_index): Add special support for a few opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97265
2008-03-04 02:09:52 +00:00
Zoltan Varga 4bda4ad9ac 2008-03-04 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_deadce): Avoid treating the inputs of
	eliminated instructions as used.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97262
2008-03-04 00:53:55 +00:00
Zoltan Varga a67ffdfcf3 2008-03-04 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Optimize the ldloca+initobj combination.

	* generics.cs: Add a test for the ldloca+initobj optimization.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97249
2008-03-03 22:32:03 +00:00
Zoltan Varga 8ea4979701 2008-03-03 Zoltan Varga <[email protected]>
* local-propagation.c (mono_branch_to_cmov): Fix checking of whenever negation
	of the condition is needed.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97222
2008-03-03 19:45:46 +00:00
Zoltan Varga e4466d9011 2008-03-02 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_deadce): Avoid reverse copyprop on hard
	registers.

	* method-to-ir.c (mono_method_check_inlining): Avoid disabling inlining if the
	called methods class has no cctor.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97140
2008-03-02 18:22:40 +00:00
Zoltan Varga c392ee6831 2008-03-02 Zoltan Varga <[email protected]>
* mini-amd64.c (mono_arch_emit_call): Emit most parameters in non-reverse order.
	(mono_arch_emit_prolog): Re-enable the first bblock optimization.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97137
2008-03-02 17:13:04 +00:00
Zoltan Varga 9093e4963c 2008-03-02 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_deadce): Make the reverse copyprop optimization
	more generic.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=97120
2008-03-02 10:12:44 +00:00
Zoltan Varga f8fa2262b8 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=96987
2008-02-29 16:39:30 +00:00
Zoltan Varga 6bab05b864 2008-02-29 Zoltan Varga <[email protected]>
* mini-ops.h mini-s390.c inssel-s390.brg: Ongoing S390 work.

	* method-to-ir.c (mono_spill_global_vars): Fix a comment.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=96955
2008-02-29 11:56:22 +00:00
Zoltan Varga 56850a7131 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=96068
2008-02-18 16:19:48 +00:00
Zoltan Varga 236fd96e77 2008-02-16 Zoltan Varga <[email protected]>
* mini-s390.c cpu-s390.md: Ongoing s390 work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95899
2008-02-16 16:26:48 +00:00
Zoltan Varga ebe33a4f92 2008-02-15 Zoltan Varga <[email protected]>
* mini-s390.h mini-s390.c cpu-s390.md mini-ops.h: Ongoing s390 work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95758
2008-02-15 14:48:17 +00:00
Zoltan Varga aaba542d2d 2008-02-15 Zoltan Varga <[email protected]>
* exceptions-arm.c mini-arm.c cpu-arm.md: Fix arm build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95743
2008-02-15 12:16:38 +00:00
Zoltan Varga c5f77e70fa 2008-02-15 Zoltan Varga <[email protected]>
* method-to-ir.c (mini_emit_inst_for_method): Fix 64 bit issues in array access
	implementation.
	(mini_emit_ldelema_1_ins): Ditto.

	* mini-ia64.c cpu-ia64.md: Fix ia64 build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95734
2008-02-15 11:52:35 +00:00
Zoltan Varga d8968fd609 2008-02-14 Zoltan Varga <[email protected]>
* cpu-sparc.md mini-sparc.c: Fix sparc build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95672
2008-02-14 17:56:04 +00:00
Zoltan Varga 046ec6ac45 2008-02-14 Zoltan Varga <[email protected]>
* mini-x86.c (mono_arch_emit_outarg_vt): Pass a reasonable alignment to
	mini_emit_memcpy2 ().

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95651
2008-02-14 17:02:44 +00:00
Zoltan Varga 729e6679af 2008-02-14 Zoltan Varga <[email protected]>
* cpu-x86.md mini-x86.c: Fix x86 build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95647
2008-02-14 16:58:38 +00:00
Zoltan Varga c86794f081 2008-02-13 Zoltan Varga <[email protected]>
* mini-amd64.c (mono_arch_emit_outarg_vt): Pass a reasonable alignment to
	mini_emit_memcpy2 ().

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95596
2008-02-13 20:48:27 +00:00
Zoltan Varga 8dad606832 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=95547
2008-02-12 19:29:39 +00:00
Zoltan Varga bb2d55478f 2008-02-06 Zoltan Varga <[email protected]>
* mini-s390.c cpu-s390.md: Preliminary S390 port work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95056
2008-02-06 17:56:48 +00:00
Zoltan Varga 52c1e83d9b 2008-02-06 Zoltan Varga <[email protected]>
* linear-scan.c (mono_linear_scan2): Avoid using GMAXINT32 which is not
	defined in older glib versions.

	* local-propagation.c: Add a default definition for MONO_ARCH_IS_OP_MEMBASE ()
	if not defined.

	* mini-<ARCH>.h: Remove MONO_ARCH_IS_OP_MEMBASE () definition.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=95027
2008-02-06 14:44:06 +00:00
Zoltan Varga 3d64c600c8 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=95002
2008-02-06 08:50:25 +00:00
Zoltan Varga 9bf91b4feb 2008-02-06 Zoltan Varga <[email protected]>
* mini-s390.c mini-s390x.c: Get rid of CEE_ opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94970
2008-02-05 23:05:18 +00:00
Zoltan Varga 9207376076 2008-02-06 Zoltan Varga <[email protected]>
* cpu-<ARCH>.md mini-<ARCH>.c: Get rid of the unused CEE_LDIND/STIND opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94967
2008-02-05 22:48:07 +00:00
Zoltan Varga f9dbaee0fe Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=94963
2008-02-05 21:48:54 +00:00
Zoltan Varga 76a62bb09b Merge tests missed earlier.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=94961
2008-02-05 21:41:16 +00:00
Zoltan Varga bfce304e49 2008-02-05 Zoltan Varga <[email protected]>
* cpu-<ARCH>.md mini-<ARCH>.md: Get rid of CEE_ opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94960
2008-02-05 21:40:06 +00:00
Zoltan Varga d9fe12e558 2008-02-05 Zoltan Varga <[email protected]>
* cpu-amd64.md mini-amd64.c: Remove unused opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94945
2008-02-05 20:35:35 +00:00
Zoltan Varga 10eefa8410 2008-02-05 Zoltan Varga <[email protected]>
* mini.c (mono_normalize_opcodes): New pass to get rid of CEE_ opcodes.

	* mini-amd64.c mini-amd64.c: Get rid of CEE_ opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94930
2008-02-05 19:26:45 +00:00
Zoltan Varga 68aa9c4146 2008-02-05 Zoltan Varga <[email protected]>
* cpu-amd64.md: Fix x86_mul_membase.

	* inssel.brg: Pass OP_CALL to backends instead of CEE_CALL.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94925
2008-02-05 19:10:54 +00:00
Zoltan Varga ff5bdc0608 2008-02-03 Zoltan Varga <[email protected]>
* mini-x86.c (mono_arch_emit_prolog): Add a missing assert.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94715
2008-02-03 19:13:04 +00:00
Zoltan Varga 05f47b9cef 2008-02-03 Zoltan Varga <[email protected]>
* mini-x86.c (mono_arch_emit_prolog): Increase the prolog size.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94714
2008-02-03 19:10:47 +00:00
Zoltan Varga 00a3294c55 2008-02-03 Zoltan Varga <[email protected]>
* local-propagation.c (mono_branch_to_cmov): Fix some asserts.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94702
2008-02-03 17:33:27 +00:00
Zoltan Varga 21c4c05ded 2008-02-03 Zoltan Varga <[email protected]>
* mini.c (mini_method_compile): Disable extended bblocks for now.
	(mono_replace_ins): Fix unlinking of bblocks.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94699
2008-02-03 17:03:46 +00:00
Zoltan Varga 1bfc685eac 2008-02-03 Zoltan Varga <[email protected]>
* local-propagation.c: Fix the div_imm strength reduction optimization.

	* mini-sparc.c (mono_arch_allocate_vars): Fix build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94698
2008-02-03 16:21:50 +00:00
Zoltan Varga d00c87d510 2008-02-03 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Merge the cctor call before alloc workaround
	from mini.c.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94694
2008-02-03 15:27:13 +00:00
Zoltan Varga d44b3b9cc5 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=94009
2008-01-26 18:42:30 +00:00
Zoltan Varga 02f3f27e5f 2008-01-26 Zoltan Varga <[email protected]>
* mini-sparc.c mini-ia64.c: Fix build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94004
2008-01-26 18:20:03 +00:00
Zoltan Varga 8d0d9f49c7 2008-01-26 Zoltan Varga <[email protected]>
* *.md: Remove op_ opcode prefixes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=94000
2008-01-26 18:12:18 +00:00
Zoltan Varga 04f50be0c5 2008-01-26 Zoltan Varga <[email protected]>
* method-to-ir.c: Implement the delegate ctor optimization.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=93994
2008-01-26 16:16:10 +00:00
Zoltan Varga c1a48dc4b4 2008-01-26 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Use the mono_helper_ldstr_mscorlib opt
	in the non AOT case as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=93989
2008-01-26 14:58:34 +00:00
Zoltan Varga d765ba339d 2008-01-26 Zoltan Varga <[email protected]>
* mini-amd64.c (peephole_pass): Ignore NOPs in the instruction stream.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=93988
2008-01-26 14:29:39 +00:00
Zoltan Varga a44448070c 2008-01-26 Zoltan Varga <[email protected]>
* mini.h: Remove some duplicate declarations which crept in during merges.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=93986
2008-01-26 13:59:39 +00:00
Zoltan Varga 58b959e8ea 2008-01-26 Zoltan Varga <[email protected]>
* mini.h mini.c method-to-ir.c: Only run the local opts pass after 
	spill_global_vars if it is useful.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=93985
2008-01-26 13:52:37 +00:00
Zoltan Varga 606b6694e7 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=93839
2008-01-24 21:21:52 +00:00
Zoltan Varga 0c60df0482 2008-01-24 Zoltan Varga <[email protected]>
* method-to-ir.c: Remove some macros which are in mini.h.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=93806
2008-01-24 15:36:36 +00:00
Zoltan Varga 517bb1122b Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=93801
2008-01-24 15:23:25 +00:00
Zoltan Varga f66359c448 Partial merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=93796
2008-01-24 14:17:46 +00:00
Zoltan Varga e04bca4458 2008-01-02 Zoltan Varga <[email protected]>
* method-to-ir.c (MONO_EMIT_NEW_BRANCH_BLOCK): Don't start a new basic block here.
	(mono_op_to_op_imm): Add OP_AMD64_ICOMPARE_MEMBASE_IMM.

	* mini.h (MonoBasicBlock): Add an 'extended' flag to mark whenever this bblock
	is extended.

	* mini.h (MonoCompile): Add a 'disable_extended_bblocks' flag.

	* mini.c (optimize_branches): Add an optimization for merging basic blocks into
	an extended basic block.

	* local-propagation.c ssa2.c mini-codegen.c: Add support for extended basic 
	blocks.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=92117
2008-01-02 16:55:59 +00:00
Zoltan Varga 40fca8ff0c 2007-12-22 Zoltan Varga <[email protected]>
* cpu-amd64.md: Fix the size of int opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91803
2007-12-22 02:07:16 +00:00
Zoltan Varga 85be7629a3 2007-12-22 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_decompose_long_opts): Fix a typo.

	* mini.c mini-ops.h inssel-long.brg inssel-long32.brg simple-mini-ops.h:
	Rename OP_LONG_SHRUN_32 to OP_LSHR_UN_32 for consistency.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91801
2007-12-22 01:58:07 +00:00
Zoltan Varga 887f84c05b 2007-12-20 Zoltan Varga <[email protected]>
* mini-amd64.c: Use OP_FMOVE instead of OP_AMD64_SET_XMMREG_R8 if possible.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91717
2007-12-20 16:35:53 +00:00
Zoltan Varga 24918e87d3 2007-12-20 Zoltan Varga <[email protected]>
* mini-amd64.c (add_outarg_reg2): Get rid of the 'arg' argument.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91669
2007-12-19 23:44:40 +00:00
Zoltan Varga 103368eca8 2007-12-19 Zoltan Varga <[email protected]>
* mini-ia64.c mini-sparc.c: Get rid of mono_arch_break (), use mono_break ()
	instead.

	* method-to-ir.c: Fix build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91663
2007-12-19 21:34:34 +00:00
Zoltan Varga 187ec8f8cc 2007-12-19 Zoltan Varga <[email protected]>
* *: Add soft-float support.

	* driver.c: Add a new debug option --break-at-bb to insert breakpoints at a
	specified bblock.

	* helpers.c: Fix disassembly on arm.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91659
2007-12-19 21:07:05 +00:00
Zoltan Varga 6c1c2cf55c 2007-12-18 Zoltan Varga <[email protected]>
* mempool.c (mono_mempool_destroy): Remove some debug cruft.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91507
2007-12-18 01:21:27 +00:00
Zoltan Varga 4261092d46 2007-12-16 Zoltan Varga <[email protected]>
* Add preliminary ARM port.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91397
2007-12-16 20:41:17 +00:00
Zoltan Varga 7555b4156c 2007-12-15 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_handle_global_vregs): Fix crashes on 32 bit systems.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91365
2007-12-15 22:14:33 +00:00
Zoltan Varga fd8196551d 2007-12-15 Zoltan Varga <[email protected]>
* method-to-ir.c (MINI_OP): Fix	breakage.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91364
2007-12-15 20:49:37 +00:00
Zoltan Varga a5d0cc42be 2007-12-15 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_handle_global_vregs): Compress the varinfo tables as
	lots of variables might be made dead by this pass.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91359
2007-12-15 19:25:28 +00:00
Zoltan Varga d52c8e9f1f 2007-12-15 Zoltan Varga <[email protected]>
* mini.c (mini_method_compile): Move the check for too-large methods later.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91358
2007-12-15 19:19:09 +00:00
Zoltan Varga c7acca34e3 2007-12-15 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_handle_global_vregs): Optimize this a little.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91353
2007-12-15 16:44:48 +00:00
Zoltan Varga ffd2295671 2007-12-15 Zoltan Varga <[email protected]>
* liveness.c (mono_analyze_liveness): Reorganize this to improve data locality
	a bit.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91352
2007-12-15 14:55:08 +00:00
Zoltan Varga 01a610385f 2007-12-14 Zoltan Varga <[email protected]>
* mini.h (MonoInst): Reorder members so frequently used members come first.

	* method-to-ir.c mini.c: Add flags to MonoCompile and MonoBasicBlock so the
	decompose_array_access_opts () pass is only run when needed.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91329
2007-12-14 21:05:07 +00:00
Zoltan Varga 89da65fa10 2007-12-14 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_handle_global_vregs): Disable some code which slows down
	compilation too much.

	* liveness.c (mono_analyze_liveness): Disable the new liveness code as it slows
	down compilation too much.

	* mini-codegen.c (mono_regstate_assign): Remove an unnecessary memset.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91301
2007-12-14 17:32:38 +00:00
Zoltan Varga d2d097a4f4 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=91293
2007-12-14 15:32:49 +00:00
Zoltan Varga 6808cf4f0a 2007-12-14 Zoltan Varga <[email protected]>
* mini-<ARCH>.c: Add a 'src' argument to mono_arch_emit_outarg_vt () to remove
	some duplicated code.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91288
2007-12-14 14:36:35 +00:00
Zoltan Varga 565a2cd8a5 2007-12-12 Zoltan Varga <[email protected]>
* method-to-ir.c (decompose_opcode): Handle OP_FCONV_TO_R8 here.

	* mini-<ARCH>.c cpu-<ARCH>.md: Remove OP_FCONV_TO_R8.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=91159
2007-12-12 15:58:47 +00:00
Zoltan Varga b40839ac01 2007-12-04 Zoltan Varga <[email protected]>
* local-propagation.c (mono_branch_to_cmov): Only run this if MONO_ARCH_HAVE_CMOV_OPTS is defined.

	* mini-amd64.h mini-x86.h: Define the cmov define.

	* mini-ops.h: Add OP_SWITCH opcode.

	* mini.h: Move the IS_JUMP_INFO defines here from mini.c.

	* ssa2.c (visit_inst): Handle OP_SWITCH.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=90713
2007-12-04 21:06:53 +00:00
Zoltan Varga d39f7be3a6 2007-12-04 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_op_to_op_imm): Add more opcodes.
	
	* mini-amd64.c (mono_arch_lowering_pass): Use mono_op_to_op_imm () here.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=90699
2007-12-04 17:03:08 +00:00
Zoltan Varga c3ad8125e8 2007-12-04 Zoltan Varga <[email protected]>
* mini-ia64.c (mono_arch_emit_call): Move some small stuff to arch independent
	code.

	* mini-sparc.c (mono_arch_emit_call): Ditto.

	* mini-amd64.c (mono_arch_emit_call): Ditto.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=90688
2007-12-04 16:03:40 +00:00
Zoltan Varga 984d68baf7 2007-11-29 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_op_to_op_imm): Add more opcodes.

	* mini-x86.c (mono_arch_lowering_pass): Lower some div/rem opcodes here.
	(mono_arch_output_basic_block): Remove opcodes lowered earlier.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=90451
2007-11-29 18:14:16 +00:00
Zoltan Varga eb61b825f6 2007-11-28 Zoltan Varga <[email protected]>
* mini.c (mono_bblock_insert_after_ins): New helper function.

	* mini-x86.c mini-amd64.c mini-ia64.c: Use the new helper function.

	* mini-x86.c cpu-x86.md: Add cmov opcodes.

	* local-propagation.c: Add div imm optimizations from the current JIT.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=90395
2007-11-28 17:43:38 +00:00
Zoltan Varga 05a2d66932 2007-11-21 Zoltan Varga <[email protected]>
* method-to-ir.c (handle_unbox_nullable): Disable AOT here since we can't encode
	the method reference.
	(handle_box): Ditto.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=90096
2007-11-21 17:29:59 +00:00
Zoltan Varga 9b8d3cc5fd 2007-11-21 Zoltan Varga <[email protected]>
* local-propagation.c (mono_branch_to_cmov): Implement another form
	of branch->cmov conversion.

	* mini.c (mini_method_compile): Reorder order of optimizations a bit.

	* mini.c: Export some bblock related functions.

	* basic.cs: Add more branch->cmov tests.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=90092
2007-11-21 16:52:58 +00:00
Zoltan Varga df455992b7 2007-11-21 Zoltan Varga <[email protected]>
* mini-ops.h: Add CMOV opcodes.

	* cpu-amd64.md mini-amd64.c: Implement CMOV opcodes.

	* local-propagation.c: Add a branch->conditional move transformation pass.

	* driver.c: Add CMOV to default optimizations.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=90057
2007-11-21 01:52:09 +00:00
Zoltan Varga a14418ee56 2007-11-20 Zoltan Varga <[email protected]>
* mini-ops.h: Add OP_IMIN,OP_IMAX,OP_LMIN,OP_LMAX opcodes.

	* mini-amd64.c: Implement cpuid function. Implement min/max intrinsics based
	on conditional moves.

	* basic-math.cs: Add min/max tests.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=90010
2007-11-20 18:44:40 +00:00
Zoltan Varga ac8f008e4f 2007-11-19 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_cprop2): Fix detection of MONO_ARCH_USE_FPSTACK. Allow the result of a call to be copy propagated.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=89912
2007-11-19 04:37:12 +00:00
Zoltan Varga 04c7025aa6 2007-11-19 Zoltan Varga <[email protected]>
* method-to-ir.c (handle_isinst): Remove unused ip argument.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=89911
2007-11-19 00:28:21 +00:00
Zoltan Varga 713ea6f2b9 2007-11-18 Zoltan Varga <[email protected]>
* mini-ops.h: Add new opcode OP_NOT_NULL.

	* mini.h: Add MONO_CFG_HAS_CHECK_THIS cfg flag.

	* method-to-ir.c: Emit OP_NOT_NULL instructions in a few places. Set
	the CHECK_THIS flag when emitting OP_CHECK_THIS instructions.

	* abcremoval2.c (process_block): Eliminate needless OP_CHECK_THIS instructions.

	* cpu-<ARCH>.md mini-<ARCH>.c: Add support for OP_NOT_NULL instruction.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=89902
2007-11-18 20:23:12 +00:00
Zoltan Varga 8f2279a65a 2007-11-18 Zoltan Varga <[email protected]>
* abcremoval2.c (remove_abc_from_inst): Derive relations from bounds check
	instructions in order to optimize array accesses made with the same index
	variable.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=89900
2007-11-18 18:14:49 +00:00
Zoltan Varga c0327f0f50 2007-11-18 Zoltan Varga <[email protected]>
* method-to-ir.c: Merge generic sharing changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=89880
2007-11-18 01:02:03 +00:00
Zoltan Varga ef733eeed7 2007-11-18 Zoltan Varga <[email protected]>
* mini-amd64.c mini-x86.c mini-ia64.c: Remove usage of OP_ICONV_TO_I4 which is
	never passed to the back ends.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=89879
2007-11-18 00:22:09 +00:00
Zoltan Varga 29c77cd0ff Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=89864
2007-11-17 17:13:34 +00:00
Zoltan Varga ea6af8b79a Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=89824
2007-11-17 01:13:47 +00:00
Zoltan Varga 5c1f284b62 2007-09-03 Zoltan Varga <[email protected]>
* mini-sparc.c (mono_arch_allocate_vars): Fix sparc build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=85232
2007-09-03 14:42:19 +00:00
Zoltan Varga ddfa475f63 2007-09-03 Zoltan Varga <[email protected]>
* mini.c (mono_compile_create_var_for_vreg): Handle enums whose basetype is i8.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=85204
2007-09-02 22:05:58 +00:00
Zoltan Varga 970c942354 2007-09-03 Zoltan Varga <[email protected]>
* mini-x86.c cpu-x86.md: Fix x86 build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=85203
2007-09-02 21:38:51 +00:00
Zoltan Varga cf28984e4f 2007-09-02 Zoltan Varga <[email protected]>
* cpu-sparc.md (endfilter): Add missing src1:i argument.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=85202
2007-09-02 20:53:40 +00:00
Zoltan Varga 484e2bec5c 2007-09-02 Zoltan Varga <[email protected]>
* mini-sparc.c (mono_arch_output_basic_block): Fix OP_IDIV_IMM.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=85200
2007-09-02 20:04:04 +00:00
Zoltan Varga 0e60bd47c0 2007-09-01 Zoltan Varga <[email protected]>
* ssa2.c (mono_ssa_compute2): Increase the stack history size.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=85177
2007-09-01 20:20:56 +00:00
Zoltan Varga 045c3aea88 2007-08-31 Zoltan Varga <[email protected]>
* method-to-ir.c: Fix the CAS functionality.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=85142
2007-08-31 16:34:22 +00:00
Zoltan Varga 831ae6261e 2007-08-30 Zoltan Varga <[email protected]>
* method-to-ir.c: Remove the can_access_ functions and use the 
	mono_method_can_access_ functions instead.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=85070
2007-08-30 19:48:20 +00:00
Zoltan Varga 2bbb6155a6 2007-08-30 Zoltan Varga <[email protected]>
* method-to-ir.c: Merge the memcpy/memset changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=85067
2007-08-30 19:10:57 +00:00
Zoltan Varga 0af8b3422d Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=85066
2007-08-30 19:03:01 +00:00
Zoltan Varga c0759cfa4a Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=81358
2007-07-04 22:41:37 +00:00
Zoltan Varga 1d6f8750e5 2007-07-04 Zoltan Varga <[email protected]>
* method-to-ir.c: Merge r81282.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=81356
2007-07-04 21:27:09 +00:00
Zoltan Varga c2609195b3 2007-06-07 Zoltan Varga <[email protected]>
* mini-amd64.c (peephole_pass): Merge the peephole_pass () from HEAD.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78849
2007-06-07 15:19:53 +00:00
Zoltan Varga c8092bd0c2 2007-06-07 Zoltan Varga <[email protected]>
* arrays.cs: Add new regression test.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78841
2007-06-07 14:33:09 +00:00
Zoltan Varga e49ff0c74e 2007-06-07 Zoltan Varga <[email protected]>
* method-to-ir.c: Merge r78640.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78840
2007-06-07 14:24:53 +00:00
Zoltan Varga d93412a781 2007-06-05 Zoltan Varga <[email protected]>
* method-to-ir.c: Remove a FIXME.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78666
2007-06-05 19:33:48 +00:00
Zoltan Varga 3e97f03f46 2007-06-05 Zoltan Varga <[email protected]>
* method-to-ir.c: Merge 77433.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78664
2007-06-05 19:07:50 +00:00
Zoltan Varga fe760be8a3 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=78653
2007-06-05 17:45:35 +00:00
Zoltan Varga 180674b76a 2007-05-31 Zoltan Varga <[email protected]>
* tramp-ia64.c (mono_arch_create_trampoline_code): Revert this.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78330
2007-05-31 13:57:02 +00:00
Zoltan Varga c1ea6216d6 2007-05-31 Zoltan Varga <[email protected]>
* tramp-ia64.c (mono_arch_create_trampoline_code): Fix ia64 build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78329
2007-05-31 13:55:16 +00:00
Zoltan Varga 1a12c25791 2007-05-28 Zoltan Varga <[email protected]>
* mini.c (mini_select_instructions): Add MONO_INST_NEW in one place.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78078
2007-05-28 17:08:44 +00:00
Zoltan Varga b41410c253 2007-05-28 Zoltan Varga <[email protected]>
* mini-codegen.c: Remove unused regstate2 functions.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78072
2007-05-28 16:40:12 +00:00
Zoltan Varga 20eb9b1dfa 2007-05-28 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Fix loading of static fields of type i8.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78068
2007-05-28 15:44:03 +00:00
Zoltan Varga 7f29417833 2007-05-27 Zoltan Varga <[email protected]>
* abcremoval2.c (mono_perform_abc_removal2): Avoid using alloca.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=78013
2007-05-27 15:30:00 +00:00
Zoltan Varga f7d71dbc54 2007-05-20 Zoltan Varga <[email protected]>
* mini-amd64.c (peephole_pass_1): Handle OP_LCOMPARE_IMM as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77729
2007-05-20 19:40:01 +00:00
Zoltan Varga 781e368c6e 2007-05-19 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_local_regalloc): Fix long-shift-regalloc on amd64.
	(mono_local_regalloc): Clean up the code a bit.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77697
2007-05-19 19:51:12 +00:00
Zoltan Varga 03199d3013 2007-05-18 Zoltan Varga <[email protected]>
* method-to-ir.c (decompose_opcode): Clean up int->long conversion a bit.

	* mini-amd64.c (mono_arch_output_basic_block): Clean up int->long conversion a bit.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77659
2007-05-18 17:51:05 +00:00
Zoltan Varga 4aff0a311b 2007-05-14 Zoltan Varga <[email protected]>
* method-to-ir.c: Merge r72357.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77342
2007-05-14 12:41:27 +00:00
Zoltan Varga e49e22eb09 2007-05-13 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Remove redundant setting of ins->cil_code.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77323
2007-05-13 16:15:34 +00:00
Zoltan Varga 1ba578b77a 2007-05-13 Zoltan Varga <[email protected]>
* method-to-ir.c: Remove some fixmes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77320
2007-05-13 16:07:40 +00:00
Zoltan Varga 0304e67009 2007-05-13 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Merge r71065 (Optimize InitArray () calls).

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77313
2007-05-13 14:54:26 +00:00
Zoltan Varga 0c63d2b3c0 2007-05-12 Zoltan Varga <[email protected]>
* mini-x86.c: Remove old definition of INST_IGNORES_CFLAGS.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77289
2007-05-12 17:44:43 +00:00
Zoltan Varga e5917b9b58 2007-05-12 Zoltan Varga <[email protected]>
* mini-x86.c: Merge apple changes missed earlier.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77288
2007-05-12 17:41:47 +00:00
Zoltan Varga 1de430b251 2007-05-12 Zoltan Varga <[email protected]>
* mini-codegen.c: Fix x86 build.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77283
2007-05-12 17:07:16 +00:00
Zoltan Varga 52891ff9ed 2007-05-10 Zoltan Varga <[email protected]>
* linear-scan.c (mono_linear_scan): Update mono_jit_stats.regvars.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77139
2007-05-10 15:22:21 +00:00
Zoltan Varga 70a9bee68d 2007-05-09 Zoltan Varga <[email protected]>
* method-to-ir.c (decompose_opcode): Fix OP_ICONV_TO_I8.

	* basic-long.cs: Add new test.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77085
2007-05-09 19:20:01 +00:00
Zoltan Varga 14ca5efab7 2007-05-09 Zoltan Varga <[email protected]>
* linear-scan.c (compare_by_interval_start_pos_func): Fix here too.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77039
2007-05-09 17:03:54 +00:00
Zoltan Varga f31fc60903 2007-05-09 Zoltan Varga <[email protected]>
* mini.c (compare_by_interval_start_pos_func): Fix comparison of empty intervals.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77036
2007-05-09 16:50:46 +00:00
Zoltan Varga fb86580a94 2007-05-09 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_spillvar_offset): Avoid an assert here.

	* method-to-ir.c (mono_method_to_ir2): Don't print after-method-to-ir IR in inlined
	methods.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77027
2007-05-09 15:12:57 +00:00
Zoltan Varga cac7518cc3 2007-05-09 Zoltan Varga <[email protected]>
* mini.c (mini_method_compile): Remove unused coalesce_pass.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=77000
2007-05-09 11:46:03 +00:00
Zoltan Varga 62c9f4d928 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=76999
2007-05-09 11:44:26 +00:00
Zoltan Varga 06cdbbfecf 2007-05-09 Zoltan Varga <[email protected]>
* method-to-ir.c (emit_stobj): Get rid of ip argument.
	(mono_emit_call_args): Ditto.
	(mono_emit_calli): Ditto.
	(mono_emit_method_call_full): Ditto.
	(mono_emit_method_call): Ditto.
	(mono_emit_native_call): Ditto.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=76974
2007-05-08 22:15:43 +00:00
Zoltan Varga fa52a4fa4a 2007-05-09 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Set cfg->ip while iterating through
	the IL code. Fixes debugging support.

	* mini.h (MONO_INST_NEW): Set ins->cil_code automatically using cfg->ip.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=76973
2007-05-08 22:05:05 +00:00
Zoltan Varga 00935c4a4f Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=76949
2007-05-08 17:48:23 +00:00
Zoltan Varga 4a514c05b4 2007-05-07 Zoltan Varga <[email protected]>
* mini.c (mini_method_compile): Only decompose_array_access_opts in the new IR.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=76876
2007-05-07 21:49:14 +00:00
Zoltan Varga be57f6b5e6 2007-05-04 Zoltan Varga <[email protected]>
* abcremoval2.c (get_relation_from_ins): Handle OP_IREM_UN as in bug #71576.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=76725
2007-05-04 20:17:37 +00:00
Zoltan Varga 4cb279d5bd 2007-05-04 Zoltan Varga <[email protected]>
* mini-ops.h: Add OP_NEWARR.

	* method-to-ir.c: Decompose CEE_NEWARR after abcrem.

	* abcremoval2.c (summarize_integer_value): Handle CEE_NEWARR too.

	* abcremoval2.c (get_relations_from_previous_bb): Handle OP_ICOMPARE_IMM too.
	
	* abcremoval2.c (mono_perform_abc_removal2): Add symmetric relations.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=76723
2007-05-04 19:54:51 +00:00
Zoltan Varga b999b3dcf6 2007-05-04 Zoltan Varga <[email protected]>
* abcremoval2.c (mono_perform_abc_removal2): Compute variable_value_kind as in the
	original implementation.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=76713
2007-05-04 16:06:20 +00:00
Zoltan Varga a4bf552b52 2007-05-02 Zoltan Varga <[email protected]>
* mini-ops.h: Add OP_LDLEN and OP_BOUNDS_CHECK.

	* method-to-ir.c: Decompose ldlen and bounds checks after abcrem in a separate
	pass.

	* abcremoval2.c: Port the abcrem pass to linear IR.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=76585
2007-05-02 18:40:47 +00:00
Zoltan Varga e3b5e53232 2007-04-29 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_print_ins_index): Remove debug printf.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=76468
2007-04-29 18:32:42 +00:00
Zoltan Varga bc00904dac 2007-04-29 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_print_ins_index): Fix printing of lowered opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=76467
2007-04-29 18:31:49 +00:00
Zoltan Varga c5222f9d8b Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=76260
2007-04-25 16:36:06 +00:00
Zoltan Varga 25cff7231d 2007-04-09 Zoltan Varga <[email protected]>
* method-to-ir.c (mini_emit_class_check_branch): New helper function.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=75537
2007-04-09 15:40:46 +00:00
Zoltan Varga b773326d0b Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=73554
2007-02-28 14:38:27 +00:00
Zoltan Varga 0806c840a0 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=73549
2007-02-28 14:09:09 +00:00
Zoltan Varga 61074d1708 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=73546
2007-02-28 14:03:54 +00:00
Zoltan Varga 1c0da4329d Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72904
2007-02-15 12:10:49 +00:00
Zoltan Varga ae63739d49 2007-02-15 Zoltan Varga <[email protected]>
* mini-x86.c (emit_load_volatile_arguments): Fix another merge problem.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=72903
2007-02-15 12:04:34 +00:00
Zoltan Varga 16a46697ed 2007-02-14 Zoltan Varga <[email protected]>
* method-to-ir.c (type_to_eval_stack_type): Fix bug introduced by merge.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=72849
2007-02-14 18:00:04 +00:00
Zoltan Varga c8c3d089ff 2007-02-14 Zoltan Varga <[email protected]>
* cpu-x86.md: Resurrect x86 support.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=72848
2007-02-14 17:52:27 +00:00
Zoltan Varga 29e77c4e06 2007-02-14 Zoltan Varga <[email protected]>
* mini-x86.c local-propagation.c mini-codegen.c: Resurrect x86 support.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=72834
2007-02-14 14:50:17 +00:00
Zoltan Varga 05efe1b3bc 2007-02-09 Zoltan Varga <[email protected]>
* method-to-ir.c (mini_emit_class_check): New helper function.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=72550
2007-02-09 17:52:46 +00:00
Zoltan Varga b58f9ed7c3 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72549
2007-02-09 17:23:03 +00:00
Zoltan Varga b1802a2da5 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72548
2007-02-09 17:22:42 +00:00
Zoltan Varga 9b92bf15c2 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72315
2007-02-05 17:46:57 +00:00
Zoltan Varga 55d23bf13b Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72311
2007-02-05 17:18:25 +00:00
Zoltan Varga 18fe3ba482 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72308
2007-02-05 17:04:53 +00:00
Zoltan Varga 6b04851f8e Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72307
2007-02-05 16:53:26 +00:00
Zoltan Varga adad70b7d0 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72306
2007-02-05 16:47:20 +00:00
Zoltan Varga cd824e97da Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72218
2007-02-03 13:17:39 +00:00
Zoltan Varga a930c3118b Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72217
2007-02-03 12:59:49 +00:00
Zoltan Varga 9b2e33f61d Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72115
2007-02-01 17:38:31 +00:00
Zoltan Varga e69749f927 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72114
2007-02-01 17:30:49 +00:00
Zoltan Varga e35102e995 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=72112
2007-02-01 17:07:15 +00:00
Zoltan Varga 8962ce85b9 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=66842
2006-10-20 18:01:56 +00:00
Zoltan Varga 7c530f8d05 2006-09-27 Zoltan Varga <[email protected]>
* method-to-ir.c: Add some new comments.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65945
2006-09-27 09:04:53 +00:00
Zoltan Varga 60afe7defb 2006-09-26 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_print_ins_index): Handle OP_LADD_IMM as well.

	* method-to-ir.c: Add a FIXME.

	* local-propagation.c: Add a new rule for optimizing op_ladd_imm + load_membase.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65922
2006-09-26 16:03:22 +00:00
Zoltan Varga 8669079ca7 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=65916
2006-09-26 12:22:02 +00:00
Zoltan Varga bc1a06afb3 2006-09-26 Zoltan Varga <[email protected]>
* mini-exceptions.c (mono_handle_exception): Special case ia64 too when determining
	whenever an exception is caught by a try block.

	* mini-ia64.c (mono_arch_allocate_vars): Fix an assert.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65908
2006-09-26 09:13:34 +00:00
Zoltan Varga b127149ecd 2006-09-26 Zoltan Varga <[email protected]>
* interlocked-2.2.cs: Fix problem with previous change.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65907
2006-09-26 09:08:05 +00:00
Zoltan Varga cc11906b28 Merge from HEAD. Fix up ia64 atomic ops.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=65906
2006-09-26 08:56:40 +00:00
Zoltan Varga a85aae1f0c 2006-09-26 Zoltan Varga <[email protected]>
* interlocked-2.2.cs: Fix long tests and add Interlocked.Exchange(long) test.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65902
2006-09-26 08:47:15 +00:00
Zoltan Varga eec8890307 2006-09-26 Zoltan Varga <[email protected]>
* method-to-ir.c mini-x86.h mini-x86.c mini-amd64.h mini-amd64.c: Move the rest of
	the Interlocked instrins creation code to mini_emit_inst_for_method () as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65900
2006-09-26 06:47:16 +00:00
Zoltan Varga 4b0d3705db 2006-09-26 Zoltan Varga <[email protected]>
* mini-amd64.c mini-amd64.c mini-x86.c mini-sparc.: Move check for OP_MEMORY_BARRIER
	from mini_emit_inst_for_method () to mini_emit_inst_for_method ().

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65898
2006-09-26 06:27:24 +00:00
Zoltan Varga bdd27a61b1 2006-09-24 Zoltan Varga <[email protected]>
* method-to-ir.c: Add a comment.

	* mini-codegen.c (mono_local_regalloc): Remove some unused variables.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65849
2006-09-24 13:00:39 +00:00
Zoltan Varga cbfcbd9fb0 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=65847
2006-09-24 12:20:48 +00:00
Zoltan Varga 1c780b4d1a 2006-09-22 Zoltan Varga <[email protected]>
* mini-x86.c (mono_arch_emit_inst_for_method): Add OP_MEMORY_BARRIER.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65810
2006-09-22 10:00:58 +00:00
Zoltan Varga 8721e312a1 2006-09-22 Zoltan Varga <[email protected]>
* *.h *.c: Unify int/fp vregs in the old JIT as well. Use this to simplify and 
	speed up the local register allocator.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65808
2006-09-22 06:38:30 +00:00
Zoltan Varga 48ca4f5393 2006-09-22 Zoltan Varga <[email protected]>
* inssel-amd64.brg (OP_OUTARG_VT): Use state->left->reg1 instead of state->left->dreg.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65807
2006-09-22 06:20:17 +00:00
Zoltan Varga 3b1f1ce903 2006-09-22 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_cprop_bb): Fix some warnings.

	* ssa2.c (mono_ssa_rename_vars2): Fix a warning.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65806
2006-09-22 05:52:41 +00:00
Zoltan Varga 0d2d623982 2006-09-21 Zoltan Varga <[email protected]>
* method-to-ir.c: Add some TODOs.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65794
2006-09-21 20:06:49 +00:00
Zoltan Varga c1f22693fe 2006-09-09 Zoltan Varga <[email protected]>
* mini-amd64.c (mono_arch_lowering_pass): Handle OP_IDIV_UN_IMM/OP_IREM_UN_IMM as well.

	* *: Change bb->dominated to a GSList. Allocate the list items from the cfg mempool.
	
	* mini.c (replace_out_block_in_code): Handle the AOT case of jump tables as well.
	(mono_merge_basic_blocks): Ditto.

	* method-to-ir.c (mono_spill_global_vars): Get rid of an allocation.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65146
2006-09-09 11:56:20 +00:00
Zoltan Varga fb996bb222 2006-09-09 Zoltan Varga <[email protected]>
* method-to-ir.c: Avoid the op->op_imm optimization for opcodes which are emulated.

	* mini-ia64.c (mono_arch_emit_call): Port the vararg changes to ia64.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65145
2006-09-09 10:53:51 +00:00
Zoltan Varga 54cac13960 2006-09-09 Zoltan Varga <[email protected]>
* mini-sparc.c (emit_sig_cookie2): Port the vararg changes to sparc.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65144
2006-09-09 10:20:43 +00:00
Zoltan Varga b09cf46ef1 2006-09-09 Zoltan Varga <[email protected]>
* *: More rationalizing of opcodes: Get rid of the CEE_... versions of some
	opcodes, use OP_... versions everywhere.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=65138
2006-09-08 22:52:04 +00:00
Zoltan Varga ae25d9d76d Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=65123
2006-09-08 18:23:32 +00:00
Zoltan Varga 8bb5267bc1 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=64795
2006-09-03 10:06:58 +00:00
Zoltan Varga 2c1856150b Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=63680
2006-08-13 13:33:03 +00:00
Zoltan Varga 1e1b63b161 2006-06-24 Zoltan Varga <[email protected]>
* interlocked-2.2.cs: Add Interlocked.Read (long) test.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=62023
2006-06-24 19:13:53 +00:00
Zoltan Varga 19afb00c1a 2006-06-24 Zoltan Varga <[email protected]>
* mini-<ARCH>.c (mono_arch_emit_inst_for_method): Move Thread.MemoryBarrier () and
	Interlocked.Read (long) implementation to mini_emit_inst_for_emit () since it
	is the same for all platforms.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=62022
2006-06-24 19:12:45 +00:00
Zoltan Varga 68a6211030 2006-06-24 Zoltan Varga <[email protected]>
* mini-amd64.c (mono_arch_emit_inst_for_method): Fix Interlocked.Add.

	* mini-ops.h: Fix OP_ATOMIC_ADD_NEW_I8.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=62019
2006-06-24 17:52:06 +00:00
Zoltan Varga dc440f6392 2006-06-23 Zoltan Varga <[email protected]>
* ssa.c: Revert this to the version from HEAD since all the new code is in ssa2.c.

	* *.c: Use OP_NOP everywhere instead of CEE_NOP.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=61996
2006-06-23 21:22:27 +00:00
Zoltan Varga a5542cb6af 2006-06-23 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_local_regalloc): Spill fp regs on calls even on x86.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=61984
2006-06-23 17:00:01 +00:00
Zoltan Varga 4ebd599daf 2006-06-23 Zoltan Varga <[email protected]>
* mini-x86.c (mono_arch_emit_inst_for_method): Fix Interlocked.Add.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=61983
2006-06-23 16:26:23 +00:00
Zoltan Varga e777f5a6cb Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=61921
2006-06-21 22:10:30 +00:00
Zoltan Varga 555b42294b 2006-06-21 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_op_to_op_imm): Enable div/rem -> div_imm/rem_imm conversion.

	* mini-x86.c cpu-pentium.md: Finish support for div/rem imm.

	* mini-codegen.c (mono_local_regalloc): When emitting a copy to put sreg1 in the
	proper fixed reg, update ins->sreg1 as well.

	* basic.cs: Add tests.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=61918
2006-06-21 20:58:40 +00:00
Zoltan Varga 88181bc767 2006-06-19 Zoltan Varga <[email protected]>
* local-propagation.c (mono_local_deadce): Fix a typo in reverse copyprop.

	* method-to-ir.c local-propagation.c mini-x86.c cpu-pentium.md cfold.c: Add
	beginnings of support for DIV/REM_IMM opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=61842
2006-06-19 14:36:02 +00:00
Zoltan Varga 8d4f0d1a9a 2006-06-15 Zoltan Varga <[email protected]>
* linear-scan.c (compare_by_interval_start_pos_func): Fix sorting of variables.

	* liveness.c (mono_analyze_liveness): Fix an assert when COUNT=0 is used.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=61768
2006-06-15 19:22:10 +00:00
Zoltan Varga 416e7d3dab 2006-05-29 Zoltan Varga <[email protected]>
* mini.c local-propagation.c: Move local cprop/copyprop/deadce to local-propagation.c.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=61233
2006-05-29 15:05:35 +00:00
Zoltan Varga b94f833d2c Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=61214
2006-05-28 17:17:15 +00:00
Zoltan Varga 01030d3c43 2006-05-19 Zoltan Varga <[email protected]>
* linear-scan.c (mono_linear_scan2): Avoid negative 'gains'.

	* mini.h (MonoJitStats): Add a 'regvars' statistics.

	* liveness.c linear-scan.c: Improve debug output.

	* mini.c (mono_allocate_stack_slots_full2): Fix some problems with the original
	code, add comments and debug code.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60878
2006-05-19 20:17:46 +00:00
Zoltan Varga b442ebdc98 Fix merge error.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=60869
2006-05-19 15:29:58 +00:00
Zoltan Varga b7738e7af9 2006-05-19 Zoltan Varga <[email protected]>
* mini.c (mono_allocate_stack_slots_full2): A variant of the original 
	allocate_stack_slots () function using the interval based liveness information.

	* method-to-ir.c (mono_spill_global_vars): Handle dead I8/U8 variables without
	asserting.

	* mini.h (MonoJitStats): Add a new statistics 'locals_stack_size'.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60868
2006-05-19 15:28:44 +00:00
Zoltan Varga 67ead555a0 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=60842
2006-05-18 21:32:42 +00:00
Zoltan Varga 12777dc0ab 2006-05-13 Zoltan Varga <[email protected]>
* liveness.c (mono_analyze_liveness2): Make this work on 64 bit machines.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60677
2006-05-13 13:57:01 +00:00
Zoltan Varga 01ca8a9870 2006-05-13 Zoltan Varga <[email protected]>
* liveness.c (mono_analyze_liveness2): Optimize this a bit.

	* linear-scan.c: Add a variant of the linear scan allocator which operates on
	liveness intervals, not ranges.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60672
2006-05-12 23:08:53 +00:00
Zoltan Varga 8e285f653b 2006-05-10 Zoltan Varga <[email protected]>
* mini.h (MonoLiveInternal): New structure for representing liveness intervals
	by a list of liveness ranges.

	* liveness.c (mono_analyze_liveness2): A variant of the liveness computation
	algorithm which uses liveness intervals instead of just one liveness range.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60555
2006-05-10 20:36:11 +00:00
Zoltan Varga d7d8b22c24 2006-05-07 Zoltan Varga <[email protected]>
* liveness.c (optimize_initlocals): Eliminate R8CONST as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60390
2006-05-07 21:02:14 +00:00
Zoltan Varga 16aac1dcdf 2006-05-07 Zoltan Varga <[email protected]>
* liveness.c (optimize_initlocals): A new, simple optimization pass to eliminate
	some of the redundant initialization code added by 'locals init'.

	* mini-amd64.c (mono_arch_compute_omit_fp): Omit fp for vtype returns as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60389
2006-05-07 20:42:47 +00:00
Zoltan Varga 1f2264e345 2006-05-04 Zoltan Varga <[email protected]>
* mini.h (MonoCompile): Add 'cil_offset_to_bb' field.

	* mini.c method-to-ir.c ssa2.c branch-opts.c: Use an array instead of a hash
	table for storing the cil offset->bblock associations.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60259
2006-05-04 13:56:09 +00:00
Zoltan Varga 4df381a138 2006-05-03 Zoltan Varga <[email protected]>
* monobitset.c: Fix mono_bitset_sub again: Use src->size instead of dest->size.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60237
2006-05-03 21:05:32 +00:00
Zoltan Varga ddf9d1e10e 2006-05-03 Zoltan Varga <[email protected]>
* mini.h *.c: Make cfg->vars an array of structures instead of pointers to 
	cut back on the number of indirections.

	* liveness.c dominators.: Use the new mono_bitset_<XXX>_fast functions.

	* mini.c (mono_local_cprop2): Allocate memory from the cfg mempool.

	* mini.c (mono_local_deadce): Allocate memory from the cfg mempool.	

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60228
2006-05-03 16:48:13 +00:00
Zoltan Varga ea9865e9f7 2006-05-03 Zoltan Varga <[email protected]>
* monobitset.h monobitset.c: Add new macros for performing copy/union operations
	with little overhead.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60223
2006-05-03 15:58:01 +00:00
Zoltan Varga aab000379e 2006-05-02 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_spill_global_vars): Fix printing of instruction specs.

	* mini.c (mono_local_cprop2): Fix cprop of I8CONST on 32 bit platforms.

	* mini-ops.h: Add some missing OP_L<XXX>_IMM opcodes for consistency.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=60194
2006-05-02 20:05:18 +00:00
Zoltan Varga b9a93c9402 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=60047
2006-04-28 17:53:10 +00:00
Zoltan Varga db2154869c 2006-04-24 Zoltan Varga <[email protected]>
* mini.h *.c: Convert ins_info from an array of strings to an array of characters.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59803
2006-04-24 10:00:13 +00:00
Zoltan Varga 63039e7682 2006-04-20 Zoltan Varga <[email protected]>
* mini-sparc.c (emit_pass_vtype): Fix passing of vtype addresses on the stack.

	* objects.cs: Add test for passing vtype addresses on the stack on sparc.	

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59708
2006-04-20 19:01:25 +00:00
Zoltan Varga 846a69ca81 2006-04-20 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_check_inlining): Fix warnings.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59692
2006-04-20 12:00:46 +00:00
Zoltan Varga a38f1cb11b 2006-04-19 Zoltan Varga <[email protected]>
* mini.c (mono_local_cprop2): Allow copy propagation of OP_VMOVEs across calls.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59651
2006-04-19 16:29:28 +00:00
Zoltan Varga 3a0e532091 2006-04-19 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_check_inlining): Remove some inlining restrictions.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59649
2006-04-19 16:00:46 +00:00
Zoltan Varga 6516d02466 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=59646
2006-04-19 15:24:53 +00:00
Zoltan Varga 0e314c33e3 2006-04-18 Zoltan Varga <[email protected]>
* mini.h method-to-ir.c mini-<ARCH>.c: Put back the 'is_virtual' argument to
	mono_arch_emit_call () as it is needed on x86.

	* method-to-ir.c (mono_spill_global_vars): Reenable the lvreg optimization.

	* mini-x86.c mini-x86.h: Enable the second argument of div/rem opcodes to be
	allocated to %edx, and handle this case in the opcodes themselves.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59595
2006-04-18 15:14:55 +00:00
Zoltan Varga 630fa7a498 2006-04-18 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_spill_global_vars): Disable the lvreg optimization for
	now since it leads to unsolvable situations in the local register allocator.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59590
2006-04-18 14:09:57 +00:00
Zoltan Varga f36459fbfa 2006-04-16 Zoltan Varga <[email protected]>
* mini-ops.h: Add OP_VTARG_ADDR opcode.

	* method-to-ir.c (mono_spill_global_vars): Add support for architectures where
	vtypes are passed by reference, i.e. their address is passed as a parameter.

	* mini-codegen.c (mono_local_regalloc): Clear rs->iassign[] entry for vregs clobbered
	by a call.

	* cpu-sparc.md mini-sparc.c: Sparc porting work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59530
2006-04-16 22:06:02 +00:00
Zoltan Varga 6ff559c27a 2006-04-16 Zoltan Varga <[email protected]>
* mini-sparc.c: Sparc porting work.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59527
2006-04-16 18:08:31 +00:00
Zoltan Varga 5a655dfc01 2006-04-16 Zoltan Varga <[email protected]>
* mini-<ARCH>.c: Rename mono_arch_call_opcode2 () to mono_arch_emit_call () and simplify its signature.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59526
2006-04-16 16:50:36 +00:00
Zoltan Varga 99ca92c254 2006-04-16 Zoltan Varga <[email protected]>
* mini-ia64.c (mono_arch_call_opcode2): Simplify the code a bit.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59525
2006-04-16 16:36:22 +00:00
Zoltan Varga 281a76e668 2006-04-16 Zoltan Varga <[email protected]>
* mini-ia64.c: Remove opcode_to_type () which is now in mini-codegen.c.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59524
2006-04-16 16:11:44 +00:00
Zoltan Varga 252a0ee332 2006-04-16 Zoltan Varga <[email protected]>
* mini.c (mono_compile_create_vars): Print the definitions of the arguments etc.
	when in verbose mode.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59523
2006-04-16 16:00:39 +00:00
Zoltan Varga 7b0cb8935a 2006-04-16 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_decompose_long_opts): Add LNEG implementation for sparc.

	* cpu-sparc.md mini-sparc.h mini-sparc.c: Sparc porting work.	

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59522
2006-04-16 15:17:11 +00:00
Zoltan Varga e614a0c943 2006-04-16 Zoltan Varga <[email protected]>
* cpu-sparc.md mini-sparc.c: Sparc porting work.

	* method-to-ir.c (mono_method_to_ir2): Avoid transforming long shift to shift_imm 
	if long shifts need to be emulated.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59516
2006-04-16 01:35:41 +00:00
Zoltan Varga 957beea092 2006-04-16 Zoltan Varga <[email protected]>
* mini-ops.h: Correct metadata of OP_SETFRET.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59515
2006-04-16 00:54:52 +00:00
Zoltan Varga 04961c5299 2006-04-16 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_spill_global_vars): Fix handling of long vregs on 
	big-endian platforms.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59514
2006-04-16 00:23:28 +00:00
Zoltan Varga 995572c1b9 2006-04-16 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_opcode_to_type): New helper function.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59513
2006-04-15 22:48:48 +00:00
Zoltan Varga cf9807e75d 2006-04-15 Zoltan Varga <[email protected]>
* mini-ia64.c (mono_arch_allocate_vars): Fix the computation of some stack slots
	when fp is eliminated.

	* method-to-ir.c: Add a FIXME.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59511
2006-04-15 20:40:48 +00:00
Zoltan Varga 4ed7b6c20e 2006-04-15 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_spill_global_vars): Optimize the lvreg optimization, and fix
	some small bugs.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59509
2006-04-15 19:28:11 +00:00
Zoltan Varga 9ea44fb478 Beginnings of SPARC support.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=59505
2006-04-15 03:58:16 +00:00
Zoltan Varga 0fa8cdce35 2006-04-15 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_local_regalloc): Fix yet another bug in the handling of
	fixed sreg1.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59503
2006-04-15 02:27:28 +00:00
Zoltan Varga b89f112003 2006-04-15 Zoltan Varga <[email protected]>
* method-to-ir.c (MONO_EMIT_BOUNDS_CHECK): Add a correct amd64 version.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59502
2006-04-15 01:53:08 +00:00
Zoltan Varga 43858207cb 2006-04-15 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_spill_global_vars): Fix a bug in the lvreg optimization.

	* mini-ops.h cpu-amd64.md mini-amd64.c: Add some membase_reg/membase_imm opcodes.

	* method-to-ir.c (op_to_op_dest_membase): Add amd64 membase_reg/membase_imm rules.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59501
2006-04-15 01:26:00 +00:00
Zoltan Varga 3f7d977e2d 2006-04-15 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_local_regalloc): Fix a bug in the handling of fixed
	sreg1.

	* method-to-ir.c (mono_spill_global_vars): Disable the lvreg optimization for
	volatile variables.

	* mini-amd64.c (peephole_pass_1): Add sub_imm -> lea optimization.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59500
2006-04-14 23:51:58 +00:00
Zoltan Varga 8dbf4265d3 2006-04-15 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_spillvar_offset): Allocate separate spill offsets for
	fp and non-fp variables.

	* method-to-ir.c (mono_spill_global_vars): Implement an optimization to get rid of
	redundant loads and stores.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59499
2006-04-14 22:23:38 +00:00
Zoltan Varga ab98403bbc 2006-04-14 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_handle_global_vregs): Avoid the global->local vreg
	optimization if the liveness internal of the vreg contains a call.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59498
2006-04-14 20:04:34 +00:00
Zoltan Varga 495e4c57a6 2006-04-14 Zoltan Varga <[email protected]>
* liveness.c (analyze_liveness_bb): Increment ins_index by 2s so the destination 
	and the source operands of an instruction no longer have overlapping live ranges.

	* mini.c (mono_local_cprop2): Avoid treating the destbasereg argument of a store
	as a definition.

	* ssa2.c (mono_ssa_remove): Add back the coalescing optimization of the current
	JIT.

	* method-to-ir.c: Remove obsolete FIXMEs.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59497
2006-04-14 18:46:08 +00:00
Zoltan Varga efd55b0142 2006-04-12 Zoltan Varga <[email protected]>
* cfold.c (mono_constant_fold_ins2): Merge mono_constant_fold_new () into this
	function.

	* mini-x86.c (mono_arch_output_basic_block): Add some micro-optimizations.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59400
2006-04-12 13:33:07 +00:00
Zoltan Varga d0a4d16d31 2006-04-11 Zoltan Varga <[email protected]>
* mini-ops.h cpu-amd64.md mini-amd64.c: Add some new reg-membase rules.
	
	* method-to-ir.c (op_to_op_src2_membase): Use the new rules.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59381
2006-04-11 21:39:39 +00:00
Zoltan Varga b0725e5ec1 2006-04-11 Zoltan Varga <[email protected]>
* mini.c method-to-ir.c mini-amd64.c mini-ia64.c mini-x86.c mini-codegen.c:
	Reduce allocations and other minor JIT performance improvements.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59379
2006-04-11 21:23:39 +00:00
Zoltan Varga dfae6cb8b2 2006-04-11 Zoltan Varga <[email protected]>
* mini-ops.h cpu-pentium.md mini-x86.c: Add some new reg-membase rules.
	
	* method-to-ir.c (op_to_op_src2_membase): Use the new rules.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59369
2006-04-11 17:27:33 +00:00
Zoltan Varga fbc585311e 2006-04-10 Zoltan Varga <[email protected]>
* mini.c (mono_local_cprop2): Fix the previous change.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59297
2006-04-10 12:59:42 +00:00
Zoltan Varga 209ff21711 2006-04-10 Zoltan Varga <[email protected]>
* mini.c (mono_local_cprop2): Enable copy propagation for floats on non-x86
	platforms.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59285
2006-04-10 02:00:01 +00:00
Zoltan Varga 3acdad7208 2006-04-10 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_local_regalloc): Relax a condition which was too strict.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59284
2006-04-10 01:58:42 +00:00
Zoltan Varga 4ce608df96 2006-04-10 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_method_to_ir2): Remove the special handling of
	ia64, do it in the arch specific code instead.

	* mini-ia64.c (mono_arch_lowering_pass): Add special handling for float_setcc
	opcodes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59278
2006-04-09 23:04:02 +00:00
Zoltan Varga 95117c9823 2006-04-10 Zoltan Varga <[email protected]>
* mini.c (move_basic_block_to_end): Handle CEE_BR as well.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59277
2006-04-09 22:24:13 +00:00
Zoltan Varga 6ecb3a6dfe 2006-04-09 Zoltan Varga <[email protected]>
* mini-ia64.h mini-ia64.c cpu-ia64.md: Port the ia64 backend to the new IR.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59275
2006-04-09 21:57:16 +00:00
Zoltan Varga 0ec234e1c5 2006-04-09 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_spillvar_offset): More alignment fixes.
	(mono_local_regalloc): Only do the OP_MOVE optimization if ins->dreg is a local
	hreg, not when its !global, since on ia64, there is a third category: stacked
	registers.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59274
2006-04-09 21:49:56 +00:00
Zoltan Varga 2149a25280 2006-04-09 Zoltan Varga <[email protected]>
* method-to-ir.c (mono_op_imm_to_op): New helper function.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59273
2006-04-09 21:48:16 +00:00
Zoltan Varga 9816c6e097 2006-04-09 Zoltan Varga <[email protected]>
* mini-codegen.c: Remove mono_opcode_to_stack_type which is only used by the
	ia64 backend.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59268
2006-04-09 17:26:22 +00:00
Zoltan Varga 791a6e2044 2006-04-09 Zoltan Varga <[email protected]>
* mini-ppc.c mini-arm.c: Remove NOT_IMPLEMENTED macro which is now in mini.h.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59267
2006-04-09 17:23:40 +00:00
Zoltan Varga 583a938c94 2006-04-09 Zoltan Varga <[email protected]>
* cpu-pentium.md mini-x86.c: Update x86 backend after latest changes.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59259
2006-04-09 03:13:09 +00:00
Zoltan Varga c7b80c5d97 2006-04-09 Zoltan Varga <[email protected]>
* mini-amd64.c (mono_arch_create_vars): Remove some redundant checks.
	(mono_arch_allocate_vars): Ditto.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59258
2006-04-09 03:00:47 +00:00
Zoltan Varga 0eaa6ca2da 2006-04-09 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_opcode_to_cond): Add more opcodes.

	* mini-amd64.c (mono_arch_create_vars): Move creation of cfg->var from here...

	* mini.c (mono_compile_create_vars): To here.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59257
2006-04-09 02:38:01 +00:00
Zoltan Varga dd49e96b89 2006-04-09 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_opcode_to_cond): Add more opcodes.

	* mini-amd64.c: Use mono_opcode_to_cond to simplify the emitting of conditional
	branches.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59256
2006-04-09 02:06:38 +00:00
Zoltan Varga 462e61d3a3 2006-04-09 Zoltan Varga <[email protected]>
* mini-ops.h: Add OP_VCALL2_... opcodes.

	* mini.h (MonoCompile): Add 'vret_addr' field.

	* method-to-ir.c mini-amd64.c: Use OP_VCALL2 opcodes for the decomposed 
	valuetype calls.

	* method-to-ir.c mini-amd64.c: Make cfg->ret a 'real' variable and use the
	new 'vret_addr' variable for representing the vtype return address.

	* mini-codegen.c (mono_opcode_to_cond): New helper function, moved here from
	mini-ia64.c.

	* mini-codegen.c (mono_opcode_to_stack_type): Ditto.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59255
2006-04-09 01:38:54 +00:00
Zoltan Varga ba02c83d6a 2006-04-09 Zoltan Varga <[email protected]>
* mini-*.c: Move definition of NOT_IMPLEMENTED to mini.h.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59254
2006-04-09 01:35:23 +00:00
Zoltan Varga eb004ccc21 2006-04-08 Zoltan Varga <[email protected]>
* mini.c (mini_init): Add missing opcode emulations.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59248
2006-04-08 18:06:14 +00:00
Zoltan Varga ba49ee774c 2006-04-08 Zoltan Varga <[email protected]>
* mini.h: Add a few new opcode classification macros.
	
	* mini-codegen.c (mono_spillvar_offset): Fix alignment issues.
	(mono_print_ins_index): Fix compilation on non-x86 platforms.

	* method-to-ir.c: Add a few FIXMEs.

	* method-to-ir.c: Fix compilation on non-x86 platforms.

	* method-to-ir.c (mono_method_to_ir2): Add support for architectures where
	fceq and its friends need an fcompare.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59247
2006-04-08 18:03:24 +00:00
Zoltan Varga ed163ea7f9 2006-04-07 Zoltan Varga <[email protected]>
* method-to-ir.c (decompose_opcode): Fix OP_LCONV_TO_OVF_I4_UN.

	* iltests.il: Delete a test which only worked on 32 bit machines.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59165
2006-04-07 00:14:12 +00:00
Zoltan Varga 65dad6f715 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=59161
2006-04-06 23:42:09 +00:00
Zoltan Varga f3f86debeb 2006-04-07 Zoltan Varga <[email protected]>
* ssa2.c (evaluate_ins): Fix the computation of the new variable state.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59159
2006-04-06 23:41:01 +00:00
Zoltan Varga d83f24a4f3 2006-04-07 Zoltan Varga <[email protected]>
* method-to-ir.c (decompose_opcode): Add some missing opcodes.

	* cpu-pentium.md: Add missing op_call opcode.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59154
2006-04-06 23:00:22 +00:00
Zoltan Varga 6e8b92ba33 2006-04-06 Zoltan Varga <[email protected]>
* mini.c (mono_local_deadce): Add some support for eliminating dead assignments
	to global vregs as well.

	* ssa2.c (mono_ssa_compute2): Use pruned SSA.

	* method-to-ir.c (mono_handle_global_vregs): Add ceq + store -> setcc-membase
	rules.

	* mini.c (mono_method_to_ir): Replace an OP_CALL with CEE_CALL which was missed
	earlier.

	* exceptions.cs: Add a test for the inline+throw problem.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59131
2006-04-06 17:58:49 +00:00
Zoltan Varga 27a4bde81a 2006-04-06 Zoltan Varga <[email protected]>
* mini-codegen.c (mono_local_regalloc): Don't set dreg_mask based on
	dest_dreg since the former is mandatory, while the later is not.

	* mini-codegen.c (mono_local_regalloc): Set preferred_mask with the result of
	MONO_ARCH_INST_FIXED_MASK too.

	* method-to-ir.c (mono_decompose_long_opts): Add missing long->u conversion.

	* iltests.il: Add new test for long->u conversion.

	* mini.h (MonoCompile): Add new 'ret_var_set' flag.
	
	* method-to-ir.c (inline_method): Handle the case when the inlined method
	doesn't set the return var.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=59115
2006-04-06 14:47:15 +00:00
Zoltan Varga 6d6de8f13c Revert to using CEE_CALL instead of OP_CALL in the old JIT.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=59101
2006-04-05 18:32:12 +00:00
Zoltan Varga 3bf547de0b Fix some branch optimizations. Remove reduntant printing of method names from some optimizations. Declare all new SSA variables as OP_LOCAL, since OP_ARG is ignored by optimizations.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58921
2006-04-02 20:59:27 +00:00
Zoltan Varga e444c648aa Fix a bug
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58827
2006-03-31 00:40:41 +00:00
Zoltan Varga cf75e7833c AMD64 optimizations.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58826
2006-03-31 00:21:06 +00:00
Zoltan Varga 8a6946b4f5 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58822
2006-03-30 21:31:32 +00:00
Zoltan Varga 944fbc010d Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58820
2006-03-30 21:15:17 +00:00
Zoltan Varga e60388aac2 Remove a FIXME
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58782
2006-03-30 14:33:48 +00:00
Zoltan Varga 4976c58126 General cleanup + implement SSA over valuetypes.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58780
2006-03-30 14:21:52 +00:00
Zoltan Varga 53fd5306f9 Part III of the valuetype reorganization: use vtype opcodes when passing/receiving vtypes in calls, and decompose them later. enable local copyprop/deadce for valuetypes.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58767
2006-03-29 22:56:12 +00:00
Zoltan Varga 6885553439 Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58681
2006-03-28 22:10:37 +00:00
Zoltan Varga 6052ef7187 Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58654
2006-03-28 14:40:27 +00:00
Zoltan Varga a4bf9168a3 Fix some bugs and FIXMEs.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58653
2006-03-28 13:36:24 +00:00
Zoltan Varga 30c510fa48 Fix some performance regression wrt the old JIT. Fix some FIXMEs.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58623
2006-03-27 22:06:13 +00:00
Zoltan Varga e3bac4d0b2 Remove some fp rules not needed by the new regalloc
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58556
2006-03-26 23:34:30 +00:00
Zoltan Varga bf9b06af8c Rewrite the handling of the fp stack within the local register allocator to
enable it to handle the code produced by the new JIT.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=58554
2006-03-26 22:59:44 +00:00
Zoltan Varga 07653b02de Cleanup the fp spill code a bit. Add OP_X86_FXCH. Fix fp stack leakage in CKFINITE
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58543
2006-03-26 13:36:20 +00:00
Zoltan Varga a5e0c55f99 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58484
2006-03-24 20:10:23 +00:00
Zoltan Varga 8419e52906 Some amd64 updates
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58481
2006-03-24 19:38:09 +00:00
Zoltan Varga ed591d9434 Merge from HEAD.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58240
2006-03-21 19:06:21 +00:00
Zoltan Varga 5801dc6493 Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58230
2006-03-21 17:14:04 +00:00
Zoltan Varga a40b1ad699 More vtype fixes/optimizations && amd64 fixes.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58222
2006-03-21 15:22:37 +00:00
Zoltan Varga 227b7078d5 Small vtype optimizations.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58208
2006-03-21 00:21:41 +00:00
Zoltan Varga a9d3290aba Beginnings of vtype optimizations.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58191
2006-03-20 17:21:56 +00:00
Zoltan Varga 001c19d6ad Part 2 of the vtype reorganization: remove code which is no longer needed.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58189
2006-03-20 16:01:06 +00:00
Zoltan Varga ff13dfd58f First part of the Big Valuetype Reorganization: Make vtypes first class
entities in the IR and decompose them later in a separate pass.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=58116
2006-03-17 18:49:00 +00:00
Zoltan Varga 6ba13ff395 2006-03-15 Zoltan Varga <[email protected]>
* mini-amd64.c (peephole_pass): Use OP_LXOR instead of CEE_XOR.

	* method-to-ir.c (mono_method_to_ir2): Fix a verification error with
	mkrefany.

	* ssa2.c (mono_ssa_compute2): Optimize the lvreg_stack stuff.

svn path=/branches/vargaz/mini-linear-il/mono/; revision=58014
2006-03-15 13:47:20 +00:00
Zoltan Varga e618fc272c Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=58009
2006-03-15 12:09:24 +00:00
Zoltan Varga 7c98a03bd1 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57918
2006-03-13 22:41:40 +00:00
Zoltan Varga b24f42f144 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57787
2006-03-10 19:11:42 +00:00
Zoltan Varga 61a04dda5f Small fix
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57706
2006-03-08 19:16:18 +00:00
Zoltan Varga db5bdd0dd6 Fix some bugs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57692
2006-03-08 15:00:15 +00:00
Zoltan Varga 0b07e9c6c6 Fix some bugs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57681
2006-03-08 01:25:05 +00:00
Zoltan Varga f3b5cfcdb9 Implement long_beq/bne without branches
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57677
2006-03-07 23:15:30 +00:00
Zoltan Varga c1080fdc53 Finish SSA consprop support
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57675
2006-03-07 22:36:47 +00:00
Zoltan Varga 85d8c2db9a x86 updates
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57614
2006-03-06 15:28:57 +00:00
Zoltan Varga 31dc821a50 Preliminary SSA constant propagation support
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57602
2006-03-05 22:33:53 +00:00
Zoltan Varga f5edc77d43 Small fixes
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57601
2006-03-05 18:52:31 +00:00
Zoltan Varga 2b2975c755 More perf improvements
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57600
2006-03-05 17:54:50 +00:00
Zoltan Varga 45a37da259 Perform another set of local optimizations after SSA
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57585
2006-03-04 19:40:26 +00:00
Zoltan Varga 97eff27fc4 Small perf improvements
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57561
2006-03-03 23:52:10 +00:00
Zoltan Varga 707b46648c Optimize mempool_alloc/alloc0 a bit
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57560
2006-03-03 23:49:30 +00:00
Zoltan Varga 4fb392ae7b Optimize floats on non-x86 platforms
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57528
2006-03-03 02:00:57 +00:00
Zoltan Varga 4034421a5f Simplify handle_global_vregs () and generalize local cprop and deadce to non-int types
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57526
2006-03-02 23:00:58 +00:00
Zoltan Varga 2abc877b89 Remove some dead code
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57524
2006-03-02 21:14:11 +00:00
Zoltan Varga 1f72b4d82a fix some FIXMEs and add support for SSA on floats
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57523
2006-03-02 21:09:54 +00:00
Zoltan Varga 4214aa6705 Fix a FIXME
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57512
2006-03-02 18:40:39 +00:00
Zoltan Varga 51feb3940f Add mono_bitset_get_fast () macro
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57500
2006-03-02 12:24:50 +00:00
Zoltan Varga 3ef00627a7 Optimize SSA construction some more + various other stuff
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57492
2006-03-02 00:05:21 +00:00
Zoltan Varga ef653fb04c Cleanup handling of CEE_SWITCH
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57471
2006-03-01 19:06:34 +00:00
Zoltan Varga 915eb474e7 Remove the compile_iterated_dfrontier2 function as it is no longer needed
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57458
2006-03-01 10:31:13 +00:00
Zoltan Varga 373821b1ec Small optimizations
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57456
2006-03-01 01:01:56 +00:00
Zoltan Varga 53f61023bd Add amd64 optimizations
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57455
2006-03-01 01:01:25 +00:00
Zoltan Varga 27b1f76522 Some minor optimizations
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57451
2006-02-28 23:25:51 +00:00
Zoltan Varga 2e24a939ed Optimize SSA construction a bit
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57444
2006-02-28 23:02:30 +00:00
Zoltan Varga 258edeed0e Optimize some perf critical functions
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57443
2006-02-28 23:01:26 +00:00
Zoltan Varga 12ea0ba6e0 Move SSA support for the new IR into a new file ssa2.c
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57294
2006-02-25 19:52:42 +00:00
Zoltan Varga 9eaed98931 Move SSA support for the new IR into a new file ssa2.c
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57293
2006-02-25 19:52:06 +00:00
Zoltan Varga 3259b60ab6 Remove SSA restrictions
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57279
2006-02-25 15:27:06 +00:00
Zoltan Varga e1d305621a Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57276
2006-02-25 14:41:43 +00:00
Zoltan Varga 6d6453173b amd64 updates
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57269
2006-02-25 02:35:35 +00:00
Zoltan Varga 162b1c133a Store vregs inside phi nodes instead of indexes. Implement SSA deadce
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57263
2006-02-24 22:17:56 +00:00
Zoltan Varga 3a6961242d Optimize branch optimizations
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57240
2006-02-24 17:00:07 +00:00
Zoltan Varga 7f998d0fa0 Various optimizations
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57219
2006-02-23 22:14:39 +00:00
Zoltan Varga 92cdf5a2e2 Finish conversion to-and-from SSA form
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57215
2006-02-23 20:55:18 +00:00
Zoltan Varga d0eed5a776 More SSA work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57211
2006-02-23 18:17:29 +00:00
Zoltan Varga e055e6022a Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57186
2006-02-22 23:46:54 +00:00
Zoltan Varga 9d794fd553 Ongoing work. Place locals into cfg->locals
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57180
2006-02-22 22:35:54 +00:00
Zoltan Varga f370fee9cd Fix a merge problem
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57059
2006-02-19 22:44:43 +00:00
Zoltan Varga e392ac4a1a Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57057
2006-02-19 22:07:50 +00:00
Zoltan Varga 99a407b03b Use printf instead of g_print as its faster. Also speed up disassembly a bit.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57055
2006-02-19 19:37:36 +00:00
Zoltan Varga e7d434fd2e Get rid of the aliasing between the two vregs used to implement longs on 32 bit machines, and the original long vreg. Simplify vreg_to_inst () as a result
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57054
2006-02-19 18:12:49 +00:00
Zoltan Varga 17c8ec4c44 Fix a FIXME
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57024
2006-02-17 22:42:20 +00:00
Zoltan Varga ec0d52819b Fix some amd64 issues
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57021
2006-02-17 22:31:13 +00:00
Zoltan Varga 882577dc26 Partly merge vfregs and viregs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=57019
2006-02-17 21:06:43 +00:00
Zoltan Varga 13c1cce325 Add some todos
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56996
2006-02-17 17:47:36 +00:00
Zoltan Varga a550d3af3a Preliminary SSA work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56994
2006-02-17 17:44:55 +00:00
Zoltan Varga 17cf4b8d7a Lazily compile icall wrappers
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56895
2006-02-15 18:29:17 +00:00
Zoltan Varga a517aa1ff2 Add a trampoline field to MonoJitICallInfo and initi it
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56894
2006-02-15 17:59:01 +00:00
Zoltan Varga e812606938 Implement the box+brtrue optimization
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56833
2006-02-13 15:34:47 +00:00
Zoltan Varga 1e21bb2dba amd64 updates
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56783
2006-02-11 02:42:47 +00:00
Zoltan Varga 9d32028420 Merge OP_STR_CHAR_ADDR optimization
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56777
2006-02-10 21:29:39 +00:00
Zoltan Varga 950176f7c4 Merge OP_STR_CHAR_ADDR optimization
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56776
2006-02-10 20:55:13 +00:00
Zoltan Varga f8b3efbcfe Kill some FIXMEs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56773
2006-02-10 20:34:03 +00:00
Zoltan Varga 20711c0bf8 Add LOCALLOC_IMM optimization
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56765
2006-02-10 17:41:55 +00:00
Zoltan Varga 433e6b437e Kill all NOT_IMPLEMENTEDs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56761
2006-02-10 16:34:20 +00:00
Zoltan Varga a010e9b91c Clean up aot code
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56758
2006-02-10 15:24:31 +00:00
Zoltan Varga c92f81de9e Implement AOT support
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56734
2006-02-09 23:25:43 +00:00
Zoltan Varga e42bef2476 Rename generics.2.cs to generics.cs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56711
2006-02-09 15:43:40 +00:00
Zoltan Varga d24c3db73f Handle nullable types in UNBOX
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56710
2006-02-09 15:43:07 +00:00
Zoltan Varga fa951d47a5 Fix some FIXMEs and bugs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56656
2006-02-07 23:32:54 +00:00
Zoltan Varga 7affefe26e Fix a few FIXMEs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56625
2006-02-07 17:30:18 +00:00
Zoltan Varga ff24fa07b2 Add this to the branch as well
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56623
2006-02-07 16:54:21 +00:00
Zoltan Varga 12b962ecc5 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56618
2006-02-07 15:52:48 +00:00
Zoltan Varga 0350a9428a More small x86 optimizations
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56617
2006-02-07 14:56:08 +00:00
Zoltan Varga 855e02e38a Add x86 optimizations
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56615
2006-02-07 13:47:00 +00:00
Zoltan Varga 37dbbd9774 Add small amd64 optimizations
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56602
2006-02-06 23:02:43 +00:00
Zoltan Varga 092531e45a Optimize local cprop a bit
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56574
2006-02-05 18:41:47 +00:00
Zoltan Varga a9be514615 Merge handle_local_vregs () into handle_global_vregs () so it is done earlier.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56566
2006-02-04 18:43:02 +00:00
Zoltan Varga e8cbf83e7b Add a small optimization
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56565
2006-02-04 17:45:04 +00:00
Zoltan Varga 7d9c6eb659 Remove some debugging output
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56547
2006-02-03 22:13:46 +00:00
Zoltan Varga f637e5cacb Rewrite the local deadce pass and add other optimizations
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56546
2006-02-03 22:11:38 +00:00
Zoltan Varga 904b878c73 Implement constant folding
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56543
2006-02-03 20:38:04 +00:00
Zoltan Varga cdc2720f40 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56253
2006-01-30 14:47:50 +00:00
Zoltan Varga 1b58cc0d09 Completely replace the dominator algorithms with faster ones from a paper
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56212
2006-01-29 01:01:35 +00:00
Zoltan Varga 6303fc4e92 Optimize local regalloc a bit more
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56205
2006-01-28 15:45:51 +00:00
Zoltan Varga 439c1f4dc8 Optimize amd64 generated code
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56197
2006-01-27 23:06:44 +00:00
Zoltan Varga 6c4d4ac83c Optimize compute_natural_loops
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56173
2006-01-27 17:58:19 +00:00
Zoltan Varga 62509cf04e Perform the local optimizations before ssa and its friends
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56123
2006-01-26 21:59:45 +00:00
Zoltan Varga 68340b5735 Avoid large log files when using -v -v
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56115
2006-01-26 18:33:10 +00:00
Zoltan Varga 0b11fbd50d Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56051
2006-01-25 17:42:48 +00:00
Zoltan Varga 5ce4233c8e Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56050
2006-01-25 17:29:30 +00:00
Zoltan Varga dd853d17a1 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56044
2006-01-25 14:59:28 +00:00
Zoltan Varga 2df32d8d41 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56016
2006-01-24 23:43:50 +00:00
Zoltan Varga bb1911d488 Cleanup inlining code
svn path=/branches/vargaz/mini-linear-il/mono/; revision=56012
2006-01-24 22:16:43 +00:00
Zoltan Varga d1624d62f9 Add a global->local vreg optimization and turn on inlining
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55994
2006-01-24 17:29:54 +00:00
Zoltan Varga ae02604918 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55963
2006-01-23 22:23:22 +00:00
Zoltan Varga 695a6bd995 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55961
2006-01-23 21:24:00 +00:00
Zoltan Varga 19fe2573df Optimize optimize_branches a bit
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55955
2006-01-23 18:22:52 +00:00
Zoltan Varga 5b4bfc60a2 Get rid of NOPs during the local copyprop deadce passes
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55954
2006-01-23 17:53:22 +00:00
Zoltan Varga 5644fa9955 Optimize local regalloc a bit
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55953
2006-01-23 17:52:31 +00:00
Zoltan Varga 899fa2669c Optimize local regalloc a bit
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55952
2006-01-23 17:52:07 +00:00
Zoltan Varga 9737c80b42 Optimize liveness analysis
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55919
2006-01-23 00:38:15 +00:00
Zoltan Varga 85fe62e973 Optimize liveness analysis and dominator computation
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55893
2006-01-21 20:55:29 +00:00
Zoltan Varga 44f0ed5a50 Optimize monobitset a bit
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55892
2006-01-21 20:54:42 +00:00
Zoltan Varga 1bef46492e Update the amd64 port
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55868
2006-01-21 00:33:33 +00:00
Zoltan Varga 56101869f0 Optimize this a bit more
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55867
2006-01-21 00:32:48 +00:00
Zoltan Varga e226c1a8c3 Optimize things a bit more
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55864
2006-01-20 22:45:46 +00:00
Zoltan Varga 5fdeca75f7 Get rid of usage of CEE_NOP too
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55853
2006-01-20 18:15:25 +00:00
Zoltan Varga 3743980735 Get rid of CEE_BR too
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55852
2006-01-20 17:32:19 +00:00
Zoltan Varga c1f7232151 Get rid of usage of most of the CEE_ opcodes in the IR
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55849
2006-01-20 17:18:25 +00:00
Zoltan Varga 988f9ad089 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55848
2006-01-20 17:17:25 +00:00
Zoltan Varga 7e23372a06 Optimize local deadce a bit more
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55839
2006-01-20 16:35:59 +00:00
Zoltan Varga 3d6b93833c Optimize local copyprop+deadce
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55800
2006-01-19 22:25:21 +00:00
Zoltan Varga 7e5809aba1 Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55798
2006-01-19 19:49:51 +00:00
Zoltan Varga f7cbb88ddc Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55797
2006-01-19 18:46:34 +00:00
Zoltan Varga f3f0dc371e Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55784
2006-01-19 14:55:02 +00:00
Zoltan Varga 115baa2b1d Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55763
2006-01-18 22:48:37 +00:00
Zoltan Varga d42553c15b Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55759
2006-01-18 22:22:59 +00:00
Zoltan Varga 94b9a85de1 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55757
2006-01-18 21:18:15 +00:00
Zoltan Varga 631e7539e0 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55744
2006-01-18 17:45:35 +00:00
Zoltan Varga f67c64bb11 Improve copyprop && add constant propagation
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55743
2006-01-18 17:44:59 +00:00
Zoltan Varga 3f7c39c54a Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55692
2006-01-17 20:48:25 +00:00
Zoltan Varga 26fac782bf Fix some FIXMEs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55682
2006-01-17 17:14:01 +00:00
Zoltan Varga c712855c41 Implement copy propagation
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55657
2006-01-16 21:43:55 +00:00
Zoltan Varga 3bb25fca02 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55637
2006-01-16 16:42:12 +00:00
Zoltan Varga 41bd9eb16c Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55611
2006-01-15 23:28:02 +00:00
Zoltan Varga 96c31ae231 Optimize things a bit
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55589
2006-01-15 01:21:30 +00:00
Zoltan Varga ad6fea93e0 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55587
2006-01-14 21:07:59 +00:00
Zoltan Varga 5481fe1ee1 Comment out unused fields to reduce the table size
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55586
2006-01-14 21:07:45 +00:00
Zoltan Varga 024b8c2cbb Use memset instead of a loop
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55585
2006-01-14 21:07:04 +00:00
Zoltan Varga d8c0b4b97d Implement liveness analysis
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55576
2006-01-14 17:47:06 +00:00
Zoltan Varga 60f418fff3 Get rid of compute_vreg_to_inst
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55561
2006-01-13 23:19:20 +00:00
Zoltan Varga c90b0902ad Infrastructure work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55552
2006-01-13 21:53:42 +00:00
Zoltan Varga 7f2d795efc svn path=/branches/vargaz/mini-linear-il/mono/; revision=55457 2006-01-12 20:47:04 +00:00
Zoltan Varga 23b3b56992 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55358
2006-01-11 00:38:24 +00:00
Zoltan Varga 00f762f331 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55347
2006-01-10 22:14:25 +00:00
Zoltan Varga 62f095256c Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55343
2006-01-10 21:20:32 +00:00
Zoltan Varga a362db55a5 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55339
2006-01-10 20:13:23 +00:00
Zoltan Varga b212ee1f99 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55265
2006-01-09 22:01:29 +00:00
Zoltan Varga 358bdb0888 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55263
2006-01-09 21:38:48 +00:00
Zoltan Varga 5fc4cabfe2 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55241
2006-01-09 16:22:54 +00:00
Zoltan Varga efb9d4fc30 Finish getting rid of labels and branches inside bbs
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55237
2006-01-09 16:08:10 +00:00
Zoltan Varga 303cffc993 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55229
2006-01-09 15:25:35 +00:00
Zoltan Varga 5a4d2928af Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55180
2006-01-06 22:23:46 +00:00
Zoltan Varga a7fd6b118c Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55179
2006-01-06 22:13:42 +00:00
Zoltan Varga 237d2effae Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55174
2006-01-06 20:32:56 +00:00
Zoltan Varga 79fbd4c77b Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55123
2006-01-05 22:51:35 +00:00
Zoltan Varga 75f26d45ff Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=55087
2006-01-04 23:05:17 +00:00
Zoltan Varga d9adc60235 More infrastructure work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54665
2005-12-20 20:40:19 +00:00
Zoltan Varga 035586f107 Infrastructure work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54661
2005-12-20 17:30:20 +00:00
Zoltan Varga 8307f7acf8 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54603
2005-12-19 14:52:37 +00:00
Zoltan Varga 4b95721a6b Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54602
2005-12-19 14:39:44 +00:00
Zoltan Varga c33a123ad3 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54582
2005-12-18 18:44:06 +00:00
Zoltan Varga 0d86be7c88 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54581
2005-12-18 17:21:28 +00:00
Zoltan Varga 064b186e7c Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54565
2005-12-17 15:07:47 +00:00
Zoltan Varga 1ddd37b999 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54556
2005-12-16 23:11:17 +00:00
Zoltan Varga 11e45e33c1 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54553
2005-12-16 22:41:00 +00:00
Zoltan Varga 6a3727bb9d Implemented missing opcodes. Fixed lots of bugs. Cleaned up lots of stuff.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54504
2005-12-15 23:59:18 +00:00
Zoltan Varga d49a37b18e Implement more opcodes, do some cleanups
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54492
2005-12-15 19:51:36 +00:00
Zoltan Varga a2ceb306e8 Remove unused stuff
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54412
2005-12-14 21:23:40 +00:00
Zoltan Varga af0aba2d25 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54267
2005-12-12 23:55:20 +00:00
Zoltan Varga 308745461f Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54258
2005-12-12 20:37:07 +00:00
Zoltan Varga cb40d42334 Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54248
2005-12-12 17:15:02 +00:00
Zoltan Varga 6d778c41d7 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54241
2005-12-12 14:59:38 +00:00
Zoltan Varga a680c04509 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54215
2005-12-11 20:50:24 +00:00
Zoltan Varga 0626309f27 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54211
2005-12-11 15:40:28 +00:00
Zoltan Varga caa8eb7d0a Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54208
2005-12-11 01:16:32 +00:00
Zoltan Varga a824b417ec Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54191
2005-12-10 13:16:05 +00:00
Zoltan Varga 4db90a3595 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54182
2005-12-10 00:09:28 +00:00
Zoltan Varga 550da36b9b Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54173
2005-12-09 22:41:10 +00:00
Zoltan Varga 25a0ba4d73 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54162
2005-12-09 13:16:11 +00:00
Zoltan Varga 6338bebce6 Continue adding support for object model opcodes
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54119
2005-12-08 20:40:11 +00:00
Zoltan Varga 33040218af Merge from HEAD
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54110
2005-12-08 12:32:18 +00:00
Zoltan Varga 0a80220cb1 svn path=/branches/vargaz/mini-linear-il/mono/; revision=54060 2005-12-07 20:23:57 +00:00
Zoltan Varga 8705f0bd29 Finish array support
svn path=/branches/vargaz/mini-linear-il/mono/; revision=54051
2005-12-07 17:11:33 +00:00
Zoltan Varga 0bcca4d1b0 svn path=/branches/vargaz/mini-linear-il/mono/; revision=53960 2005-12-06 00:20:40 +00:00
Zoltan Varga a314febfc7 Add array support.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53958
2005-12-05 23:17:30 +00:00
Zoltan Varga d331a12820 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53907
2005-12-04 20:04:20 +00:00
Zoltan Varga 705d7806d7 Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53895
2005-12-04 01:46:37 +00:00
Zoltan Varga ed602a754b svn path=/branches/vargaz/mini-linear-il/mono/; revision=53894 2005-12-03 20:55:21 +00:00
Zoltan Varga 1499b1a04c Cleanups
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53877
2005-12-03 03:02:50 +00:00
Zoltan Varga 3f315b1480 Beginnings of object model support
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53856
2005-12-02 22:56:45 +00:00
Zoltan Varga 206efef4bd Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53793
2005-12-01 20:18:38 +00:00
Zoltan Varga ba6633eb73 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53732
2005-12-01 00:47:21 +00:00
Zoltan Varga ad33d3f04b Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53726
2005-11-30 23:44:43 +00:00
Zoltan Varga 1130600b0e Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53692
2005-11-30 15:45:45 +00:00
Zoltan Varga f84b903428 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53648
2005-11-29 23:46:28 +00:00
Zoltan Varga 62d2ba6b0b Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53646
2005-11-29 22:29:40 +00:00
Zoltan Varga 2b6e7aa111 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53636
2005-11-29 15:33:16 +00:00
Zoltan Varga 14b825cc91 Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53531
2005-11-27 21:59:45 +00:00
Zoltan Varga f87fee9d53 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53528
2005-11-27 19:17:17 +00:00
Zoltan Varga 4e411aaf74 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53521
2005-11-27 01:43:47 +00:00
Zoltan Varga 7902069c2b svn path=/branches/vargaz/mini-linear-il/mono/; revision=53499 2005-11-26 03:00:27 +00:00
Zoltan Varga 1547bf0247 svn path=/branches/vargaz/mini-linear-il/mono/; revision=53488 2005-11-25 23:30:19 +00:00
Zoltan Varga 727a9f12e2 Ongoing work
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53486
2005-11-25 23:00:25 +00:00
Zoltan Varga 7ba47cce99 Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53485
2005-11-25 21:27:38 +00:00
Zoltan Varga bfb14aa07b Ongoing work.
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53482
2005-11-25 15:54:08 +00:00
Zoltan Varga c0fee57975 svn path=/branches/vargaz/mini-linear-il/mono/; revision=53464 2005-11-24 22:26:48 +00:00
Zoltan Varga c54945dd66 svn path=/branches/vargaz/mini-linear-il/mono/; revision=53462 2005-11-24 20:28:16 +00:00
Zoltan Varga 39d0bf75dd Refactor method_to_ir into a separate file
svn path=/branches/vargaz/mini-linear-il/mono/; revision=53330
2005-11-21 22:54:07 +00:00
48146 changed files with 1714899 additions and 6976081 deletions

No files matched your search

-68
View File
@@ -1,68 +0,0 @@
# ensure LF endings on all checkouts
configure.ac crlf=input
# ensure native line endings on checkout
*.c crlf
*.h crlf
*.cs crlf
*.sh crlf
*.il crlf
.gitattributes crlf
ChangeLog crlf
*akefile* crlf
*.sources crlf
# don't do anything to line-endings. Let CRLFs go into the repo, and CRLF on checkout
*.bat -crlf
*.sln -crlf
*.*proj* -crlf
*.xml -crlf
# CRLF Handling
# -------------
#
# The ideal situation would be to do no EOL normalization. Each file
# would have a default EOL, and tools on Windows and Linux would handle
# both EOL formats.
#
# We're not in the ideal world. A popular editor on Windows (possibly
# Visual Studio) silently introduces EOL corruption -- it displays an
# LF-file normally, but any newly added lines have CRLF. On Linux,
# Emacs and versions of VI handle LF-files and CRLF-files properly.
# However, emacs doesn't like files with both LF and CRLF EOLs. Editing
# the file without additional action will increase the EOL corruption
# in the file.
#
# Another vector for mixed EOLs is scripts. We mostly don't have scripts
# that add new lines -- so we rarely see this. However, one major event
# in the tree was the addition of copyright headers using a script. That
# script introduced EOL corruption.
#
# Any automated EOL normalization of files already in the repository will
# cause difficulties in traversing histories, assigning blame, etc. So, we
# don't want to change what's in the repository significantly, even if it
# causes trouble.
#
# What we do now:
#
# a) we ensure that there's no further corruption of LF-files. So, we use
# git's 'crlf' attribute on those files to ensure that things are fine
# when we work on Windows. We could use 'crlf=input', but it doesn't buy
# us much -- we might as well be working with consistent EOLs for files in
# working directories as well as in the repository
#
# b) if the file already of CRLFs, we don't do any normalization. We use '-crlf'
# so that git doesn't do any EOL-conversion of the file. As I said, this
# is mostly harmless on Linux. We can't mark these files as 'crlf' or use
# the new (git 1.7.2) 'eol=crlf' attribute, since it changes the contents
# _inside_ the repository [1], and hence makes history traversal annoying.
# So, we live with occasional EOL corruption.
#
# c) We can handle mixed-EOL files on a case-by-case basis, converting them to
# LF- or CRLF-files based on which causes fewer lines to change
#
# d) We try to ensure no further headaches, by declaring EOL normalization on
# code files, and Unix-flavoured files, like shell-scripts, makefiles, etc.
#
# [1] GIT use LFs as the normalized internal representation.
-128
View File
@@ -1,128 +0,0 @@
##############################################################################
# General
##############################################################################
# OS junk files
[Tt]humbs.db
*.DS_Store
# Visual Studio / MonoDevelop
*.[Oo]bj
*.exe
*.dll
*.pdb
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
*.opensdf
*.resources
*.res
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
*.gpState
# Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
# NuGet packages
!.nuget/*
[Pp]ackages/*
![Pp]ackages/repositories.config
# Temporary Files
~.*
~$*
# Autotools-generated files
/Makefile
Makefile.in
aclocal.m4
autom4te.cache
/build/
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.scan
cygconfig.h
depcomp
install-sh
libtool
ltmain.sh
missing
mkinstalldirs
releases
stamp-h
stamp-h1
stamp-h.in
/test-driver
*~
*.swp
*.o
.deps
# Libtool
libtool.m4
lt~obsolete.m4
ltoptions.m4
ltsugar.m4
ltversion.m4
# Dolt (libtool replacement)
doltlibtool
doltcompile
# pkg-config
*.pc
# Emacs
semantic.cache
# gtags
GPATH
GRTAGS
GSYMS
GTAGS
# Doxygen
docs/doxygen*
docs/perlmod*
##############################################################################
# Mono-specific patterns
##############################################################################
.dirstamp
compile
mono.h
mono-*.tar.*
mono.spec
mono-core.spec
tmpinst-dir.stamp
-32
View File
@@ -1,32 +0,0 @@
[submodule "external/aspnetwebstack"]
path = external/aspnetwebstack
url = git://github.com/mono/aspnetwebstack.git
[submodule "external/Newtonsoft.Json"]
path = external/Newtonsoft.Json
url = git://github.com/mono/Newtonsoft.Json.git
[submodule "external/cecil"]
path = external/cecil
url = git://github.com/mono/cecil.git
[submodule "external/debian-snapshot"]
path = external/debian-snapshot
url = git://github.com/directhex/mono-snapshot.git
[submodule "external/rx"]
path = external/rx
url = git://github.com/mono/rx.git
branch = rx-oss-v2.2
[submodule "external/ikvm"]
path = external/ikvm
url = git://github.com/mono/ikvm-fork.git
[submodule "external/Lucene.Net"]
path = external/Lucene.Net
url = git://github.com/mono/lucene.net.git
[submodule "external/ikdasm"]
path = external/ikdasm
url = git://github.com/mono/ikdasm.git
[submodule "external/referencesource"]
path = external/referencesource
url = git://github.com/mono/referencesource
branch = mono-4.0.0-branch
[submodule "external/reference-assemblies"]
path = external/binary-reference-assemblies
url = git://github.com/mono/reference-assemblies.git
-84
View File
@@ -1,84 +0,0 @@
Guidelines
==========
When contributing to the Mono project, please follow the [Mono Coding
Guidelines][1]. We have been using a coding style for many years,
please make your patches conform to these guidelines.
[1]: http://www.mono-project.com/community/contributing/coding-guidelines/
Etiquette
=========
In general, we do not accept patches that merely shuffle code around,
split classes in multiple files, reindent the code or are the result
of running a refactoring tool on the source code. This is done for
three reasons: (a) we have our own coding guidelines; (b) Some modules
are imported from upstream sources and we want to respect their coding
guidelines and (c) it destroys valuable history that is often used to
investigate bugs, regressions and problems.
License
=======
The Mono project uses the MIT X11, GNU LGPL version 2 and the Apache
License 2.0. We also imported some Microsoft code licensed under the
open source Microsoft Public License.
Different parts of Mono use different licenses. The actual details of
which licenses are used for which parts are detailed on the LICENSE
file in this directory.
When contributing code, make sure that your contribution falls under
the appropriate license. For example, contributions to code licensed
under MIT/X11 code, should be MIT/X11 code.
The runtime (`mono/...`) is a special case. The code is dual-licensed
by Xamarin under both the GNU LGPL v2 license and is also available
under commercial terms. For the runtime, you should either sign an
agreement that grants Xamarin the rights to relicense your code under
other licenses other than the LGPL v2 or your contribution must be
made as an MIT/X11 license which grants us the same rights, but
involves no paperwork. For the latter case, please specify on your
commit(s) that you are licensing the changes under MIT/X11.
For other parts of the project that are dual-licensed, please state
on your commit(s) what license you are contributing the changes under.
Testing
=======
Pull requests go through testing on our [Jenkins server][2]. We will
usually only merge a pull request if it causes no regressions in a
test run there.
When you submit a pull request, one of two things happens:
* If you are a new contributor, Jenkins will ask for permissions (on
the pull request) to test it. A maintainer will reply to approve
the test run if they find the patch appropriate. After you have
submitted a few patches, a maintainer will whitelist you so that
all of your future pull requests are tested automatically.
* If you are a well-known, whitelisted contributor, Jenkins will go
ahead and test your pull request as soon as a test machine is
available.
When your pull request has been built, Jenkins will update the build
status of your pull request. If it succeeded and we like the changes,
a maintainer will likely merge it. Otherwise, you can amend your pull
request to fix build breakage and Jenkins will test it again.
[2]: http://jenkins.mono-project.com/
# Inactivity
Occasionally, a pull request sits for several months without any
response from the author. This isn't necessarily an issue, but we may
sometimes decide to close pull requests that have not seen any
progress for a long time. This is in interest of keeping the pull
request list clean so that other pull requests don't get lost in the
clutter.
If we do close your pull request due to inactivity, you're more than
welcome to submit it anew after you address any comments or issues that
were brought up on the original pull request.
+1 -17
View File
@@ -1,23 +1,7 @@
The Mono runtime is licensed under the terms of the GNU
Library General Public License, version 2.
The eglib directory is licensed under the terms of the MIT
X11 license and is a drop-in replacement for Mono's use of
glib 2.0 (which was LGPL).
The Boehm licensing information is in the libgc directory
The SGen Garbage Collector is under the terms of the MIT X11
license
The class libraries under mono/mcs are unless otherwise stated
under the MIT X11 license.
Open source Microsoft code is licensed under the original terms
which is either MS-PL for older components, or dual licensed
MS-PL/Apache2 licensed.
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
+2 -1331
View File
File diff suppressed because it is too large. Load diff
+9 -31
View File
@@ -2,14 +2,14 @@
Mono is made up of many pieces of code, all of them open source, but
different pieces of Mono use different licensing terms.
For comments, corrections and updates, please contact mono@xamarin.com
For comments, corrections and updates, please contact mono@novell.com
* Dual Licensing
Parts of Mono are dual licensed, they are available to the
public in GPL or LGPL forms, but we also offer those pieces
under commercial terms from Xamarin for the cases wher the GPL
and the LGPL are not suitable.
under commercial terms from Novell for when the GPL and the
LGPL are not suitable.
We have tried to pick the licenses that will maximize adoption
of Mono, so we tend to use the MIT X11 or LGPL liceses.
@@ -22,10 +22,7 @@ For comments, corrections and updates, please contact [email protected]
Contributions for other modules should be under the same license
terms as the rest of the module, or under MIT X11 terms.
For the actual license links in the Mono distribution see the
bottom of this file.
If you need further information, please contact [email protected]
If you ned further information, please contact [email protected]
* The Modules
@@ -34,41 +31,29 @@ For comments, corrections and updates, please contact [email protected]
This code is dual licensed under the LGPL or commercial licenses.
The LGPL ensures that Mono can be used in most scenarios, but
gives Xamarin the flexibility to relicense the code for
gives Novell the flexibility to relicense the code for
embedded systems, static linking or commercial settings where
the LGPL can not be used.
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
commercial license from Xamarin (consider software burned into
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
on the distribution and access to the code, a phone platform
that prevents end users from upgrading Moonlight).
Contact mono@xamarin.com for details on obtaining the Mono
Contact mono@novell.com for details on obtaining the Mono
runtime under other terms.
** mono/support: MonoPosixHelper and support code
This code is dual licensed under the LGPL or commercial licenses, with
the same guidelines as mono/mono code.
The ZLib files are included under a "new BSD"-style license.
** mono/eglib: Mono's X11 glib implementation
This is a minimal subset of glib that is to be licensed under
the terms of the MIT X11, this means that this code can be
used for any purposes by anyone.
** mono/arch/*/XXX-codegen.h
This are C macros that are useful when generating native
code on various platforms. This code is MIT X11 licensed.
** mcs/mcs, mcs/gmcs
The C# Compilers (1.0 and 2.0)
@@ -101,13 +86,6 @@ For comments, corrections and updates, please contact [email protected]
ICSharpCode.SharpZipLib, GPL with exceptions.
See: mcs/class/ICSharpCode.SharpZipLib/README
** mcs/class/System.Core/System/TimeZoneInfo.Android.cs
This is a port of Apache 2.0-licensed Android code, and thus is
licensed under the Apache 2.0 license:
http://www.apache.org/licenses/LICENSE-2.0
** mcs/tools
+35 -121
View File
@@ -1,73 +1,32 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I .
AM_CFLAGS = $(WERROR_CFLAGS)
SUBDIRS = $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
if CROSS_COMPILING
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
else
if ONLY_MONOTOUCH
SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
else
if ONLY_XAMMAC
SUBDIRS = $(libgc_dir) eglib/src mono runtime
else
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
endif
endif
endif
DIST_SUBDIRS = libgc $(eglib_dir) mono ikvm-native support docs data runtime scripts man samples web tools msvc
all: update_submodules
SUBMODULE_ERROR='Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date'
update_submodules:
@$(srcdir)/scripts/update_submodules
.PHONY: update_submodules
EXTRA_DIST= \
README.md \
LICENSE \
autogen.sh \
build-mingw32.sh \
mkinstalldirs \
mono-uninstalled.pc.in \
winconfig.h \
mono-core.spec \
external
EXTRA_DIST= mono-uninstalled.pc.in LICENSE
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
# Distribute the 'mcs' tree too
GIT_DIR ?= $(srcdir)/.git
dist-hook:
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
rm -rf `find $(top_distdir)/external -path '*\.git'`
rm -f `find $(top_distdir)/external -path '*\.exe'`
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*'`
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
# Disable this for now because it is very slow and causes wrench to timeout:
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=default distdir=$$d dist-recursive
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 distdir=$$d dist-recursive
pkgconfigdir = $(libdir)/pkgconfig
noinst_DATA = mono-uninstalled.pc
DISTCLEANFILES= mono-uninstalled.pc
.PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
# building with monolite
mcslib = $(mcs_topdir)/class/lib
monolite = $(mcslib)/monolite
mono_corlib_version = $(shell sed -n "s/\#define MONO_CORLIB_VERSION //p" $(srcdir)/mono/metadata/appdomain.c)
monolite_url = http://storage.bos.xamarin.com/mono-dist-master/latest/monolite-$(mono_corlib_version)-latest.tar.gz
.PHONY: get-monolite-latest
monolite_url = http://mono.ximian.com/daily/monolite-latest.tar.gz
get-monolite-latest:
-rm -fr $(mcslib)/monolite-*
-mkdir -p $(mcslib)
@@ -76,52 +35,32 @@ get-monolite-latest:
cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
cd $(mcslib) && mv -f monolite-* monolite
.PHONY: validate do-build-mono-mcs mcs-do-clean mcs-do-tests
validate: do-build-mono-mcs
$(MAKE) mcs-do-tests
do-build-mono-mcs: mcs-do-clean
compiler-tests: mcs-do-clean
$(MAKE) all
mcs-do-clean:
cd runtime && $(MAKE) clean-local
cd mono/tests && $(MAKE) clean
mcs-do-tests:
cd runtime && $(MAKE) check-local
cd mono/tests && $(MAKE) check
$(MAKE) mcs-do-compiler-tests
.PHONY: compiler-tests mcs-do-compiler-tests
compiler-tests:
$(MAKE) test_select='TEST_SUBDIRS="tests errors"' validate
mcs-do-compiler-tests:
$(MAKE) test_select='TEST_SUBDIRS="tests errors"' mcs-do-tests
compiler-tests-net_2_0:
-rm -f $(mcs_topdir)/build/common/Consts.cs.save
-mv -f $(mcs_topdir)/build/common/Consts.cs $(mcs_topdir)/build/common/Consts.cs.save
cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0_bootstrap clean
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) build_profiles=net_2_0 mcs-do-compiler-tests
.PHONY: bootstrap-world
bootstrap-world: compiler-tests
$(MAKE) install
if INSTALL_MONOTOUCH
monotouch-do-build: config.h
@list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
case "x$$subdir" in \
xmono ) target="monotouch-do-build";; \
* ) target="all";; \
esac; \
echo "Making $$target in $$subdir"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
done;
(cd runtime && $(MAKE) $(AM_MAKEFLAGS) monotouch-do-build)
bootstrap-world-net_2_0: compiler-tests-net_2_0
$(MAKE) install
monotouch-do-clean:
@list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
case "x$$subdir" in \
xmono ) target="monotouch-do-clean";; \
* ) target="clean";; \
esac; \
echo "Making $$target in $$subdir"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
done;
(cd runtime && $(MAKE) $(AM_MAKEFLAGS) monotouch-do-clean)
endif
# internal targets
mcs-do-clean:
cd runtime && $(MAKE) clean-local
cd mono/tests && $(MAKE) clean
mcs-do-compiler-tests:
cd runtime && $(MAKE) test_select='TEST_SUBDIRS="tests errors"' check-local
cd mono/tests && $(MAKE) check
win32getdeps:
wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
@@ -140,35 +79,10 @@ win32getdeps:
win32setup:
makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
update-csproj:
-rm msvc/scripts/order
-rm msvc/scripts/order.xml
-rm -rf msvc/scripts/inputs
-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 | sed -e 's/\\\\/\\/g' -e 's/\\/\\\\/g' | \
(echo " <project dir=\"$$1\" library=\"$$2\">"; \
read boot; echo " <boot>$$boot</boot>"; \
read flags; echo " <flags>$$flags</flags>"; \
read output; echo " <output>$$output</output>"; \
read built; echo " <built_sources>`echo $$built | sed 's/\\\/\\\\/g'`</built_sources>"; \
read libou; echo " <library_output>$$libou</library_output>"; \
read fx_ver; echo " <fx_version>$$fx_ver</fx_version>"; \
read profile; echo " <profile>$$profile</profile>"; \
read resp; echo " <response>$$resp</response>"; \
echo " </project>") >> msvc/scripts/order.xml; \
done
echo "</root>" >> msvc/scripts/order.xml
# Update llvm version in configure.ac to the output of $LLVM_DIR/bin/llvm-config --version
update-llvm-version:
if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi
REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV."
bootstrap: all
@echo "*** 'make bootstrap' is obsolete. Just run 'make' to perform a combined mono+mcs build"
exit 1
patch-quiet:
find mono -name Makefile -exec scripts/patch-quiet.sh {} \;
find libgc -name Makefile -exec scripts/patch-quiet.sh {} \;
+480
View File
@@ -0,0 +1,480 @@
This is Mono.
1. Installation
2. Using Mono
3. Directory Roadmap
1. Compilation and Installation
===============================
a. Build Requirements
---------------------
To build Mono, you will need the following components:
* pkg-config
Available from: http://www.freedesktop.org/Software/pkgconfig
* glib 2.4
Available from: http://www.gtk.org/
On Itanium, you must obtain libunwind:
http://www.hpl.hp.com/research/linux/libunwind/download.php4
On Solaris, make sure that you used GNU tar to unpack this package, as
Solaris tar will not unpack this correctly, and you will get strange errors.
On Solaris, make sure that you use the GNU toolchain to build the software.
Optional dependencies:
* libgdiplus
If you want to get support for System.Drawing, you will need to get
Libgdiplus.
* libzlib
This library and the development headers are required for compression
file support in the 2.0 profile.
b. Building the Software
------------------------
If you obtained this package as an officially released tarball,
this is very simple, use configure and make:
./configure --prefix=/usr/local
make
make install
Mono supports a JIT engine on x86, SPARC, SPARCv9, S/390,
S/390x, AMD64, ARM and PowerPC systems.
If you obtained this as a snapshot, you will need an existing
Mono installation. To upgrade your installation, unpack both
mono and mcs:
tar xzf mcs-XXXX.tar.gz
tar xzf mono-XXXX.tar.gz
mv mono-XXX mono
mv mcs-XXX mcs
cd mono
./autogen.sh --prefix=/usr/local
make
c. Building the software from SVN
---------------------------------
If you are building the software from SVN, make sure that you
have up-to-date mcs and mono sources:
svn co svn+ssh://[email protected]/source/trunk/mono
svn co svn+ssh://[email protected]/source/trunk/mcs
Then, go into the mono directory, and configure:
cd mono
./autogen.sh --prefix=/usr/local
make
For people with non-standard installations of the auto* utils and of
pkg-config (common on misconfigured OSX and windows boxes), you could get
an error like this:
./configure: line 19176: syntax error near unexpected token `PKG_CHECK_MODULES(BASE_DEPENDENCIES,' ...
This means that you need to set the ACLOCAL_FLAGS environment var
when invoking autogen.sh, like this:
ACLOCAL_FLAGS="-I $acprefix/share/aclocal" ./autogen.sh --prefix=/usr/loca
where $acprefix is the prefix where aclocal has been installed.
This will automatically go into the mcs/ tree and build the
binaries there.
This assumes that you have a working mono installation, and that
there's a C# compiler named 'mcs', and a corresponding IL
runtime called 'mono'. You can use two make variables
EXTERNAL_MCS and EXTERNAL_RUNTIME to override these. e.g., you
can say
make EXTERNAL_MCS=/foo/bar/mcs EXTERNAL_RUNTIME=/somewhere/else/mono
If you don't have a working Mono installation
---------------------------------------------
If you don't have a working Mono installation, an obvious choice
is to install the latest released packages of 'mono' for your
distribution and running autogen.sh; make; make install in the
mono module directory.
You can also try a slightly more risky approach: this may not work,
so start from the released tarball as detailed above.
This works by first getting the latest version of the 'monolite'
distribution, which contains just enough to run the 'mcs'
compiler. You do this with:
make get-monolite-latest
This will download and automatically gunzip and untar the
tarball, and place the files appropriately so that you can then
just run:
make
To ensure that you're using the 'monolite' distribution, you can
also try passing EXTERNAL_MCS=false on the make command-line.
Testing and Installation
------------------------
You can run (part of) the mono and mcs testsuites with the command:
make check
All tests should pass.
If you want more extensive tests, including those that test the
class libraries, you need to re-run 'configure' with the
'--enable-nunit-tests' flag, and try
make -k check
Expect to find a few testsuite failures. As a sanity check, you
can compare the failures you got with
http://go-mono.com/tests/displayTestResults.php
You can now install mono with:
make install
Failure to follow these steps may result in a broken installation.
d. Common Configuration Options
-------------------------------
The following are the configuration options that someone
building Mono might want to use:
--with-gc=[boehm, included, sgen, none]
Selects the garbage collector engine to use, the
default is the "included" value.
included:
This is the default value, and its
the most feature complete, it will allow Mono
to use typed allocations and support the
debugger.
It is essentially a slightly modified Boehm GC
boehm:
This is used to use a system-install Boehm GC,
it is useful to test new features available in
Boehm GC, but we do not recommend that people
use this, as it disables a few features.
sgen:
The under-development Generational GC for
Mono, do not use this in production.
none:
Disables the inclusion of a garbage
collector.
--with-tls=__thread,pthread
Controls how Mono should access thread local storage,
pthread forces Mono to use the pthread APIs, while
__thread uses compiler-optimized access to it.
Although __thread is faster, it requires support from
the compiler, kernel and libc. Old Linux systems do
not support with __thread.
This value is typically pre-configured and there is no
need to set it, unless you are trying to debug a
problem.
--with-sigaltstack=yes,no
Experimental: Use at your own risk, it is known to
cause problems with garbage collection and is hard to
reproduce those bugs.
This controls whether Mono will install a special
signal handler to handle stack overflows. If set to
"yes", it will turn stack overflows into the
StackOverflowException. Otherwise when a stack
overflow happens, your program will receive a
segmentation fault.
The configure script will try to detect if your
operating system supports this. Some older Linux
systems do not support this feature, or you might want
to override the auto-detection.
--with-static_mono=yes,no
This controls whether `mono' should link against a
static library (libmono.a) or a shared library
(libmono.so).
This defaults to yes, and will improve the performance
of the `mono' program.
This only affects the `mono' binary, the shared
library libmono.so will always be produced for
developers that want to embed the runtime in their
application.
--with-xen-opt=yes,no
The default value for this is `yes', and it makes Mono
generate code which might be slightly slower on
average systems, but the resulting executable will run
faster under the Xen virtualization system.
--with-large-heap=yes,no
Enable support for GC heaps larger than 3GB.
This value is set to `no' by default.
--with-ikvm-native=yes,no
Controls whether the IKVM JNI interface library is
built or not. This is used if you are planning on
using the IKVM Java Virtual machine with Mono.
This defaults to `yes'.
--with-preview=yes,no
Whether you want to build libraries that are still not
completed (The 2.0 APIs). It defaults to `yes'.
--with-moonlight=yes,no
Whether you want to generate the Silverlight/Moonlight
libraries and toolchain in addition to the default
(1.1 and 2.0 APIs).
This will produce the `smcs' compiler which will reference
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
libgdiplus when running the System.Drawing tests.
It defaults to `installed', which means that the
library is available to Mono through the regular
system setup.
`sibling' can be used to specify that a libgdiplus
that resides as a sibling of this directory (mono)
should be used.
Or you can specify a path to a libgdiplus.
--disable-shared-memory
Use this option to disable the use of shared memory in
Mono (this is equivalent to setting the MONO_DISABLE_SHM
environment variable, although this removes the feature
completely).
Disabling the shared memory support will disable certain
features like cross-process named mutexes.
--enable-minimal=LIST
Use this feature to specify optional runtime
components that you might not want to include. This
is only useful for developers embedding Mono that
require a subset of Mono functionality.
The list is a comma-separated list of components that
should be removed, these are:
aot:
Disables support for the Ahead of Time
compilation.
profiler:
Disables support for the default profiler.
decimal:
Disables support for System.Decimal.
pinvoke:
Support for Platform Invocation services,
disabling this will drop support for any
libraries using DllImport.
debug:
Drop debugging support.
reflection_emit:
Drop System.Reflection.Emit support
large_code:
Disables support for large assemblies.
logging:
Disables support for debug logging.
com:
Disables COM support.
ssa:
Disables compilation for the SSA optimization
framework, and the various SSA-based
optimizations.
generics:
Generics support. Disabling this will not
allow Mono to run any 2.0 libraries or
code that contains generics.
--enable-big-arrays
This enables the use arrays whose indexes are larger
than Int32.MaxValue.
By default Mono has the same limitation as .NET on
Win32 and Win64 and limits array indexes to 32-bit
values (even on 64-bit systems).
In certain scenarios where large arrays are required,
you can pass this flag and Mono will be built to
support 64-bit arrays.
This is not the default as it breaks the C embedding
ABI that we have exposed through the Mono development
cycle.
--enable-parallel-mark
Use this option to enable the garbage collector to use
multiple CPUs to do its work. This helps performance
on multi-CPU machines as the work is divided across CPUS.
This option is not currently the default as we have
not done much testing with Mono.
--enable-dtrace
On Solaris and MacOS X builds a version of the Mono
runtime that contains DTrace probes and can
participate in the system profiling using DTrace.
--disable-dev-random
Mono uses /dev/random to obtain good random data for
any source that requires random numbers. If your
system does not support this, you might want to
disable it.
There are a number of runtime options to control this
also, see the man page.
2. Using Mono
=============
Once you have installed the software, you can run a few programs:
* runtime engine
mono program.exe
* C# compiler
mcs program.cs
* CIL Disassembler
monodis program.exe
See the man pages for mono(1), mint(1), monodis(1) and mcs(2)
for further details.
3. Directory Roadmap
====================
docs/
Technical documents about the Mono runtime.
data/
Configuration files installed as part of the Mono runtime.
mono/
The core of the Mono Runtime.
metadata/
The object system and metadata reader.
mini/
The Just in Time Compiler.
dis/
CIL executable Disassembler
cli/
Common code for the JIT and the interpreter.
io-layer/
The I/O layer and system abstraction for
emulating the .NET IO model.
cil/
Common Intermediate Representation, XML
definition of the CIL bytecodes.
interp/
Interpreter for CLI executables (obsolete).
arch/
Architecture specific portions.
man/
Manual pages for the various Mono commands and programs.
samples/
Some simple sample programs on uses of the Mono
runtime as an embedded library.
scripts/
Scripts used to invoke Mono and the corresponding program.
runtime/
A directory that contains the Makefiles that link the
mono/ and mcs/ build systems.
../olive/
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.
-438
View File
@@ -1,438 +0,0 @@
Mono is a software platform designed to allow developers to easily create cross platform applications.
It is an open source implementation of Microsoft's .NET Framework based on the ECMA standards for C# and the Common Language Runtime.
1. [Compilation and Installation](#compilation-and-installation)
2. [Using Mono](#using-mono)
3. [Directory Roadmap](#directory-roadmap)
4. [Contributing to Mono](#contributing-to-mono)
5. [Reporting bugs](#reporting-bugs)
6. [Configuration Options](#configuration-options)
**Build Status**
| debian-amd64 | debian-i386 | debian-ppc64el | centos-s390x | windows-amd64 |
|:-----------------------:|:----------------------:|:-------------------------:|:-----------------------:|:-------------------------:|
| [![debian-amd64][1]][2] | [![debian-i386][3]][4] | [![debian-ppc64el][5]][6] | [![centos-s390x][7]][8] | [![windows-amd64][9]][10] |
[1]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/badge/icon
[2]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/
[3]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/badge/icon
[4]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/
[5]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/badge/icon
[6]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/
[7]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/badge/icon
[8]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/
[9]: https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true
[10]: https://ci.appveyor.com/project/ajlennon/mono-817/branch/master
Compilation and Installation
============================
Building the Software
---------------------
Please see our guides for building Mono on
[Mac OS X](http://www.mono-project.com/docs/compiling-mono/mac/),
[Linux](http://www.mono-project.com/docs/compiling-mono/linux/) and
[Windows](http://www.mono-project.com/docs/compiling-mono/windows/).
Note that building from Git assumes that you already have Mono installed,
so please download and [install the latest Mono release](http://www.mono-project.com/download/)
before trying to build from Git. This is required because the Mono build
relies on a working Mono C# compiler to compile itself
(also known as [bootstrapping](http://en.wikipedia.org/wiki/Bootstrapping_(compilers))).
If you don't have a working Mono installation
---------------------------------------------
If you don't have a working Mono installation, you can try a slightly
more risky approach: getting the latest version of the 'monolite' distribution,
which contains just enough to run the 'mcs' compiler. You do this with:
# Run the following line after ./autogen.sh
make get-monolite-latest
This will download and place the files appropriately so that you can then
just run:
make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/basic.exe
The build will then use the files downloaded by `make get-monolite-latest`.
Testing and Installation
------------------------
You can run the mono and mcs test suites with the command: `make check`.
Expect to find a few test suite failures. As a sanity check, you
can compare the failures you got with [https://wrench.mono-project.com/Wrench/](https://wrench.mono-project.com/Wrench/)
and [http://jenkins.mono-project.com/](http://jenkins.mono-project.com/).
You can now install mono with: `make install`
You can verify your installation by using the mono-test-install
script, it can diagnose some common problems with Mono's install.
Failure to follow these steps may result in a broken installation.
Using Mono
==========
Once you have installed the software, you can run a few programs:
* `mono program.exe` runtime engine
* `mcs program.cs` C# compiler
* `monodis program.exe` CIL Disassembler
See the man pages for mono(1), mcs(1) and monodis(1) for further details.
Directory Roadmap
=================
* `data/` - Configuration files installed as part of the Mono runtime.
* `docs/` - Technical documents about the Mono runtime.
* `external/` - Git submodules for external libraries (Newtonsoft.Json, ikvm, etc).
* `man/` - Manual pages for the various Mono commands and programs.
* `mcs/` - The class libraries, compiler and tools
* `class/` - The class libraries (like System.*, Microsoft.Build, etc.)
* `mcs/` - The Mono C# compiler written in C#
* `tools/` - Tools like gacutil, ikdasm, mdoc, etc.
* `mono/` - The core of the Mono Runtime.
* `arch/` - Architecture specific portions.
* `cil/` - Common Intermediate Representation, XML
definition of the CIL bytecodes.
* `dis/` - CIL executable Disassembler
* `io-layer/` - The I/O layer and system abstraction for
emulating the .NET IO model.
* `metadata/` - The object system and metadata reader.
* `mini/` - The Just in Time Compiler.
* `runtime/` - A directory that contains the Makefiles that link the
mono/ and mcs/ build systems.
* `samples/` -Some simple sample programs on uses of the Mono
runtime as an embedded library.
* `scripts/` - Scripts used to invoke Mono and the corresponding program.
* `../olive/` - Incubation code from [Olive](https://github.com/mono/olive).
* 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.
Contributing to Mono
====================
Before submitting changes to Mono, please review the [contribution guidelines](http://www.mono-project.com/community/contributing/).
Please pay particular attention to the [Important Rules](http://www.mono-project.com/community/contributing/#important-rules) section.
Reporting bugs
==============
To submit bug reports, please use [Xamarin's Bugzilla](https://bugzilla.xamarin.com/)
Please use the search facility to ensure the same bug hasn't already
been submitted and follow our [guidelines](http://www.mono-project.com/community/bugs/make-a-good-bug-report/)
on how to make a good bug report.
Configuration Options
=====================
The following are the configuration options that someone
building Mono might want to use:
* `--with-sgen=yes,no` - Generational GC support: Used to enable or disable the
compilation of a Mono runtime with the SGen garbage collector.
* On platforms that support it, after building Mono, you will have
both a `mono` binary and a `mono-sgen` binary. `mono` uses Boehm, while
`mono-sgen` uses the Simple Generational GC.
* `--with-gc=[included, boehm, none]` - Selects the default Boehm garbage
collector engine to use.
* *included*: (*slighty modified Boehm GC*)
This is the default value for the Boehm GC, and it's
the most feature complete, it will allow Mono
to use typed allocations and support the debugger.
* *boehm*:
This is used to use a system-install Boehm GC,
it is useful to test new features available in
Boehm GC, but we do not recommend that people
use this, as it disables a few features.
* *none*:
Disables the inclusion of a garbage collector.
* This defaults to `included`.
* `--with-tls=__thread,pthread`
* Controls how Mono should access thread local storage,
pthread forces Mono to use the pthread APIs, while
__thread uses compiler-optimized access to it.
* Although __thread is faster, it requires support from
the compiler, kernel and libc. Old Linux systems do
not support with __thread.
* This value is typically pre-configured and there is no
need to set it, unless you are trying to debug a problem.
* `--with-sigaltstack=yes,no`
* **Experimental**: Use at your own risk, it is known to
cause problems with garbage collection and is hard to
reproduce those bugs.
* This controls whether Mono will install a special
signal handler to handle stack overflows. If set to
`yes`, it will turn stack overflows into the
StackOverflowException. Otherwise when a stack
overflow happens, your program will receive a
segmentation fault.
* The configure script will try to detect if your
operating system supports this. Some older Linux
systems do not support this feature, or you might want
to override the auto-detection.
* `--with-static_mono=yes,no`
* This controls whether `mono` should link against a
static library (libmono.a) or a shared library
(libmono.so).
* This defaults to `yes`, and will improve the performance
of the `mono` program.
* This only affects the `mono' binary, the shared
library libmono.so will always be produced for
developers that want to embed the runtime in their
application.
* `--with-xen-opt=yes,no` - Optimize code for Xen virtualization.
* It makes Mono generate code which might be slightly
slower on average systems, but the resulting executable will run
faster under the Xen virtualization system.
* This defaults to `yes`.
* `--with-large-heap=yes,no` - Enable support for GC heaps larger than 3GB.
* This defaults to `no`.
* `--enable-small-config=yes,no` - Enable some tweaks to reduce memory usage
and disk footprint at the expense of some capabilities.
* Typically this means that the number of threads that can be created
is limited (256), that the maximum heap size is also reduced (256 MB)
and other such limitations that still make mono useful, but more suitable
to embedded devices (like mobile phones).
* This defaults to `no`.
* `--with-ikvm-native=yes,no` - Controls whether the IKVM JNI interface library is
built or not.
* This is used if you are planning on
using the IKVM Java Virtual machine with Mono.
* This defaults to `yes`.
* `--with-profile4=yes,no` - Whether you want to build the 4.x profile libraries
and runtime.
* This defaults to `yes`.
* `--with-libgdiplus=installed,sibling,<path>` - Configure where Mono
searches for libgdiplus when running System.Drawing tests.
* It defaults to `installed`, which means that the
library is available to Mono through the regular
system setup.
* `sibling` can be used to specify that a libgdiplus
that resides as a sibling of this directory (mono)
should be used.
* Or you can specify a path to a libgdiplus.
* `--disable-shared-memory`
* Use this option to disable the use of shared memory in
Mono (this is equivalent to setting the MONO_DISABLE_SHM
environment variable, although this removes the feature
completely).
* Disabling the shared memory support will disable certain
features like cross-process named mutexes.
* `--enable-minimal=LIST`
* Use this feature to specify optional runtime
components that you might not want to include. This
is only useful for developers embedding Mono that
require a subset of Mono functionality.
* The list is a comma-separated list of components that
should be removed, these are:
* `aot`:
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.
* `debug`:
Drop debugging support.
* `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
code that contains generics.
* `jit`:
Removes the JIT engine from the build, this reduces
the executable size, and requires that all code
executed by the virtual machine be compiled with
Full AOT before execution.
* `large_code`:
Disables support for large assemblies.
* `logging`:
Disables support for debug logging.
* `pinvoke`:
Support for Platform Invocation services,
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.
* `reflection_emit`:
Drop System.Reflection.Emit support
* `reflection_emit_save`:
Drop support for saving dynamically created
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.
* `ssa`:
Disables compilation for the SSA optimization
framework, and the various SSA-based optimizations.
* `--enable-llvm`
* `--enable-loadedllvm`
* This enables the use of LLVM as a code generation engine
for Mono. The LLVM code generator and optimizer will be
used instead of Mono's built-in code generator for both
Just in Time and Ahead of Time compilations.
* See http://www.mono-project.com/docs/advanced/mono-llvm/ for the
full details and up-to-date information on this feature.
* You will need to have an LLVM built that Mono can link
against.
* The `--enable-loadedllvm` variant will make the LLVM backend
into a runtime-loadable module instead of linking it directly
into the main mono binary.
* `--enable-big-arrays` - Enable use of arrays with indexes larger
than Int32.MaxValue.
* By default Mono has the same limitation as .NET on
Win32 and Win64 and limits array indexes to 32-bit
values (even on 64-bit systems).
* In certain scenarios where large arrays are required,
you can pass this flag and Mono will be built to
support 64-bit arrays.
* This is not the default as it breaks the C embedding
ABI that we have exposed through the Mono development
cycle.
* `--enable-parallel-mark`
* Use this option to enable the garbage collector to use
multiple CPUs to do its work. This helps performance
on multi-CPU machines as the work is divided across CPUS.
* This option is not currently the default as we have
not done much testing with Mono.
* `--enable-dtrace`
* On Solaris and MacOS X builds a version of the Mono
runtime that contains DTrace probes and can
participate in the system profiling using DTrace.
* `--disable-dev-random`
* Mono uses /dev/random to obtain good random data for
any source that requires random numbers. If your
system does not support this, you might want to
disable it.
* There are a number of runtime options to control this
also, see the man page.
* `--enable-nacl`
* This configures the Mono compiler to generate code
suitable to be used by Google's Native Client:
http://code.google.com/p/nativeclient/
* Currently this is used with Mono's AOT engine as
Native Client does not support JIT engines yet.
+3 -7
View File
@@ -22,14 +22,11 @@ if test x$GCC != xyes; then
dolt_supported=no
fi
case $host in
i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*)
pic_options='-fPIC'
;;
?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
pic_options='-DDLL_EXPORT'
;;
i?86-apple-darwin*|arm-apple-darwin*)
i?86-apple-darwin*)
pic_options='-fno-common'
;;
*)
@@ -158,7 +155,6 @@ modeok=false
tagok=false
for arg in "$[]@"; do
case "$arg" in
--silent) ;;
--mode=compile) modeok=true ;;
--tag=CC|--tag=CXX) tagok=true ;;
--quiet) ;;
-105
View File
@@ -1,105 +0,0 @@
#
# Appveyor configuration file for CI build of Mono on Windows (under Cygwin)
#
# For further details see http://www.appveyor.com
#
# Use 'unstable' Appveyor build worker image as Appveyor have added Cygwin to this for us
os: Unstable
#
# Custom environment variables
#
environment:
global:
CYG_ROOT: C:/cygwin
CYG_MIRROR: http://cygwin.mirror.constant.com
CYG_CACHE: C:/cygwin/var/cache/setup
NSIS_ROOT: C:\nsis
#
# Initialisation prior to pulling the Mono repository
#
init:
- 'echo Building Mono for Windows'
- 'echo System architecture: %PLATFORM%'
- 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
- 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
- 'git config --global core.autocrlf input'
#
# Install needed build dependencies
#
install:
# NOTE: Already installed on current Appveyor unstable image
# - 'echo Retrieving Cygwin'
# - 'appveyor DownloadFile http://cygwin.com/setup-x86.exe -FileName %CYGROOT%/setup-x86.exe'
- 'echo Setting up Cygwin dependencies'
- '%CYG_ROOT%\setup-x86.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P autoconf -P automake -P bison -P gcc-core -P gcc-g++ -P mingw-runtime -P mingw-binutils -P mingw-gcc-core -P mingw-gcc-g++ -P mingw-pthreads -P mingw-w32api -P libtool -P make -P python -P gettext-devel -P gettext -P intltool -P libiconv -P pkg-config -P git -P wget -P curl > NUL'
- 'echo Check Cygwin setup'
- '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
- 'echo Done setting up Cygwin'
- 'echo Retrieving NSIS'
- 'appveyor DownloadFile "http://sunet.dl.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe'
- 'echo Setting up NSIS'
- 'nsissetup.exe /S /D=%NSIS_ROOT%'
- 'echo Done setting up NSIS'
#
# NOTE: msbuild doesn't work at present so use Cygwin to build
#
#build:
# project: C:\projects\mono\msvc\mono.sln
# verbosity: detailed
# Cygwin build script
#
# NOTES:
#
# The stdin/stdout file descriptor appears not to be valid for the Appveyor
# build which causes failures as certain functions attempt to redirect
# default file handles. Ensure a dummy file descriptor is opened with exec.
#
build_script:
- cmd: 'echo Cygwin root is: %CYG_ROOT%'
- cmd: 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
- cmd: 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
- cmd: 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
- cmd: 'echo Autogen running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; NOCONFIGURE=1 ./autogen.sh --prefix=/usr/local --with-preview=yes"'
- cmd: 'echo Configure running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./configure --host=i686-pc-mingw32"'
- cmd: 'echo Pulling monolite latest...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
- cmd: 'echo Make running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make"'
- cmd: 'echo Installing...'
- cmd: 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
- cmd: '%CYG_ROOT%/bin/bash --login -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
# - cmd: 'echo Building package...'
# - cmd: 'cd %APPVEYOR_BUILD_FOLDER%'
# - cmd: '%NSIS_ROOT%\makensis /DMILESTONE=%APPVEYOR_REPO_BRANCH% /DSOURCE_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER\install\*.* /DBUILDNUM=%APPVEYOR_BUILD_VERSION% monowiz.win32.nsi'
# - cmd: 'Building distribution...'
# - cmd: '%CYG_ROOT%/bin/bash -lc "export CYGWIN=winsymlinks:native; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make dist"'
#
# Disable tests for now
#
test: off
#
# Only build the master branch
#
branches:
only:
- master
#
# NOTE: Currently this is the Mono installation tree. In future we will create an installation package artifact.
# It has to be relative to the project path. Thus we have installed to within the build tree.
#
artifacts:
- path: install
name: mono-binaries
type: zip
+10 -40
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
# Ripped off from GNOME macros version
@@ -37,7 +37,7 @@ if [ -z "$LIBTOOL" ]; then
fi
fi
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed to compile Mono."
@@ -47,8 +47,8 @@ fi
}
}
grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
(gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`gettext' installed to compile Mono."
@@ -82,7 +82,7 @@ if test "$DIE" -eq 1; then
exit 1
fi
if test x$NOCONFIGURE = x && test -z "$*"; then
if test -z "$*"; then
echo "**Warning**: I am going to run \`configure' with no arguments."
echo "If you wish to pass any to it, please specify them on the"
echo \`$0\'" command line."
@@ -95,39 +95,15 @@ xlc )
esac
if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
${LIBTOOL}ize --force --copy
fi
fi
#
# Plug in the extension module
#
has_ext_mod=false
ext_mod_args=''
for PARAM; do
if [[ $PARAM =~ "--enable-extension-module" ]] ; then
has_ext_mod=true
if [[ $PARAM =~ "=" ]] ; then
ext_mod_args=`echo $PARAM | cut -d= -f2`
fi
fi
done
if test x$has_ext_mod = xtrue; then
pushd ../mono-extensions/scripts
sh ./prepare-repo.sh $ext_mod_args || exit 1
popd
else
cat mono/mini/Makefile.am.in > mono/mini/Makefile.am
fi
echo "Running aclocal -I m4 -I . $ACLOCAL_FLAGS ..."
aclocal -Wnone -I m4 -I . $ACLOCAL_FLAGS || {
echo "Running aclocal $ACLOCAL_FLAGS ..."
aclocal $ACLOCAL_FLAGS || {
echo
echo "**Error**: aclocal failed. This may mean that you have not"
echo "installed all of the packages you need, or you may need to"
@@ -137,13 +113,13 @@ aclocal -Wnone -I m4 -I . $ACLOCAL_FLAGS || {
exit 1
}
if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
echo "Running automake --gnu $am_opt ..."
automake --add-missing --gnu -Wno-portability -Wno-obsolete $am_opt ||
automake --add-missing --gnu $am_opt ||
{ echo "**Error**: automake failed."; exit 1; }
echo "Running autoconf ..."
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
@@ -154,12 +130,6 @@ if test -d $srcdir/libgc; then
echo Done running libgc/autogen.sh ...
fi
if test -d $srcdir/eglib; then
echo Running eglib/autogen.sh ...
(cd $srcdir/eglib ; NOCONFIGURE=1 ./autogen.sh "$@")
echo Done running eglib/autogen.sh ...
fi
conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+38
View File
@@ -0,0 +1,38 @@
#!/bin/sh
ASPEN_ROOT=/Developer/Platforms/iPhoneOS.platform/Developer
ASPEN_SDK=$ASPEN_ROOT/SDKs/iPhoneOS2.0.sdk/
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=-Wl,-syslibroot,$ASPEN_SDK
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
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 --with-gc=none $@
curl -o mono/mini/inssel.c http://primates.ximian.com/~gnorton/iphone/inssel.c
curl -o mono/mini/inssel.h http://primates.ximian.com/~gnorton/iphone/inssel.h
make
# We dont use monoburg since I nicely provided the inssel's pregenerated above.
pushd mono/monoburg
touch monoburg
touch sample.c
popd
make
-227
View File
@@ -1,227 +0,0 @@
#!/bin/bash -e
CURDIR="`pwd`"
MINGW=i386-mingw32msvc
CROSS_DIR=/opt/cross/$MINGW
EXTRA_CROSS_DIR=
INSTALL_DESTDIR="$CURDIR/mono-win32"
PROFILES="default net_2_0 net_3_5 net_4_0 net_4_5 moonlight"
TEMPORARY_PKG_CONFIG_DIR=/tmp/$RANDOM-pkg-config-$RANDOM
ORIGINAL_PATH="$PATH"
export CPPFLAGS_FOR_EGLIB CFLAGS_FOR_EGLIB CPPFLAGS_FOR_LIBGC CFLAGS_FOR_LIBGC
function cleanup ()
{
if [ -d "$TEMPORARY_PKG_CONFIG_DIR" ]; then
rm -rf "$TEMPORARY_PKG_CONFIG_DIR"
fi
}
function check_pkg_config_dir ()
{
local DIR="$1"
local DIR_PREFIX="$2"
if [ ! -d "$DIR" ]; then
return
fi
install -d -m 755 "$TEMPORARY_PKG_CONFIG_DIR"
for pc in "$DIR"/*.pc; do
if [ -f $pc ]; then
pcname="`basename $pc`"
sed -e "s;^prefix=.*;prefix=$DIR_PREFIX;g" < $pc > "$TEMPORARY_PKG_CONFIG_DIR"/$pcname
fi;
done
if [ -z "$CROSS_PKG_CONFIG_DIR" ]; then
CROSS_PKG_CONFIG_DIR="$TEMPORARY_PKG_CONFIG_DIR"
fi
}
function show_build_info ()
{
cat <<EOF
Installation prefix: $MONO_PREFIX
CPPFLAGS: ${CPPFLAGS:=not set}
LDFLAGS: ${LDFLAGS:=not set}
MONO_PATH: ${MONO_PATH:=not set}
EOF
}
function setup ()
{
local pcname
CROSS_BIN_DIR="$CROSS_DIR/bin"
CROSS_DLL_DIR="$CROSS_DIR/bin"
PATH=$CROSS_BIN_DIR:$PATH
MONO_VERSION=`grep AC_INIT configure.ac | cut -d ',' -f 2|tr -d '\[ \]'`
if [ -d ./.git ]; then
MONO_GIT_COMMIT="`git log -1 --format=format:%t`"
MONO_GIT_BRANCH="`git branch|grep '\*'|cut -d ' ' -f 2|tr -d '\)'|tr -d '\('`"
MONO_RELEASE="$MONO_VERSION-$MONO_GIT_BRANCH-$MONO_GIT_COMMIT"
else
MONO_RELEASE="$MONO_VERSION"
fi
MONO_PREFIX="$MONO_PREFIX/mono-$MONO_RELEASE"
NOCONFIGURE=yes
export NOCONFIGURE
check_pkg_config_dir "$CROSS_DIR/lib/pkgconfig" "$CROSS_DIR"
if [ -n "$EXTRA_CROSS_DIR" -a -d "$EXTRA_CROSS_DIR" ]; then
if [ -d "$EXTRA_CROSS_DIR/bin" ]; then
PATH="$EXTRA_CROSS_DIR/bin":$PATH
fi
check_pkg_config_dir "$EXTRA_CROSS_DIR/lib/pkgconfig" "$EXTRA_CROSS_DIR"
if [ -d "$EXTRA_CROSS_DIR/include" ]; then
if [ -z "$CPPFLAGS" ]; then
CPPFLAGS="-I \"$EXTRA_CROSS_DIR/include\""
else
CPPFLAGS="-I \"$EXTRA_CROSS_DIR/include\" $CFLAGS"
fi
fi
if [ -d "$EXTRA_CROSS_DIR/lib" ]; then
if [ -z "$LDFLAGS" ]; then
LDFLAGS="-I \"$EXTRA_CROSS_DIR/lib\""
else
LDFLAGS="-I \"$EXTRA_CROSS_DIR/lib\" $LDFLAGS"
fi
fi
if [ -d "$EXTRA_CROSS_DIR/share/aclocal" ]; then
if [ -z "$MONO_PATH" ]; then
MONO_PATH="\"$EXTRA_CROSS_DIR\""
else
MONO_PATH="\"$EXTRA_CROSS_DIR\":$MONO_PATH"
fi
fi
fi
export PATH MONO_PATH CPPFLAGS
show_build_info
}
function build ()
{
if [ -f ./Makefile ]; then
make distclean
fi
if [ -d ./autom4te.cache ]; then
rm -rf ./autom4te.cache
fi
if [ -f ./config.status ]; then
for f in `find -name config.status -type f`; do
rm $f
done
fi
./autogen.sh
BUILD="`./config.guess`"
if [ ! -d "$CURDIR/build-cross-windows" ]; then
mkdir "$CURDIR/build-cross-windows"
fi
cd "$CURDIR/build-cross-windows"
rm -rf *
../configure --prefix=$MONO_PREFIX --with-crosspkgdir=$CROSS_PKG_CONFIG_DIR --build=$BUILD --target=$MINGW --host=$MINGW --enable-parallel-mark --program-transform-name="" --with-tls=none --disable-mcs-build --disable-embed-check --enable-win32-dllmain=yes --with-libgc-threads=win32 --with-profile4=yes
make
cd "$CURDIR"
if [ ! -d "$CURDIR/build-cross-windows-mcs" ]; then
mkdir "$CURDIR/build-cross-windows-mcs"
fi
rm -rf autom4te.cache
unset PATH
PATH="$ORIGINAL_PATH"
export PATH
cd "$CURDIR/build-cross-windows-mcs"
rm -rf *
../configure --prefix=$MONO_PREFIX --enable-parallel-mark
make
}
function doinstall ()
{
if [ -d "$INSTALL_DIR" ]; then
rm -rf "$INSTALL_DIR"
fi
cd "$CURDIR/build-cross-windows"
make DESTDIR="$INSTALL_DESTDIR" USE_BATCH_FILES=yes install
if test -d $CURDIR/mcs; then
mcsdir=$CURDIR/mcs
else
mcsdir=$CURDIR/../mcs
fi
cd "$mcsdir/mcs"
for p in $PROFILES; do
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "mcs profile $p installation failed"
done
cd "$mcsdir/class"
for p in $PROFILES; do
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "class library profile $p installation failed"
done
cd "$mcsdir/tools"
for p in $PROFILES; do
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "tools profile $p installation failed"
done
cd "$CURDIR/mono-win32"
rm -f "$CURDIR/mono-win32-$MONO_RELEASE".zip
zip -9r "$CURDIR/mono-win32-$MONO_RELEASE".zip .
}
function usage ()
{
cat <<EOF
Usage: build-mingw32.sh [OPTIONS]
where OPTIONS are:
-d DIR Sets the location of directory where MINGW is installed [$CROSS_DIR]
-e DIR Sets the location of directory where additional cross develoment packages are installed [${EXTRA_CROSS_DIR:=none}]
-m MINGW Sets the MINGW target name to be passed to configure [$MINGW]
-p PREFIX Prefix at which Mono is to be installed. Build will append the 'mono-X.Y' string to that path
EOF
exit 1
}
trap cleanup 0
pushd . > /dev/null
while getopts "d:m:e:p:" opt; do
case "$opt" in
d) CROSS_DIR="$OPTARG" ;;
m) MINGW="$OPTARG" ;;
e) EXTRA_CROSS_DIR="$OPTARG" ;;
p) MONO_PREFIX="$OPTARG" ;;
*) usage ;;
esac
done
setup
build
doinstall
show_build_info
popd > /dev/null
-672
View File
@@ -1,672 +0,0 @@
#! /bin/sh
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
# Copyright 1996-2010 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <[email protected]>, 1996
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
#
# The first argument passed to this file is the canonical host specification,
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
# should be set by the caller.
#
# The set of defined variables is at the end of this script.
# Known limitations:
# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
# than 256 bytes, otherwise the compiler driver will dump core. The only
# known workaround is to choose shorter directory names for the build
# directory and/or the installation directory.
# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
shrext=.so
host="$1"
host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
# Code taken from libtool.m4's _LT_CC_BASENAME.
for cc_temp in $CC""; do
case $cc_temp in
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
\-*) ;;
*) break;;
esac
done
cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
# Code taken from libtool.m4's _LT_COMPILER_PIC.
wl=
if test "$GCC" = yes; then
wl='-Wl,'
else
case "$host_os" in
aix*)
wl='-Wl,'
;;
darwin*)
case $cc_basename in
xlc*)
wl='-Wl,'
;;
esac
;;
mingw* | cygwin* | pw32* | os2* | cegcc*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
;;
irix5* | irix6* | nonstopux*)
wl='-Wl,'
;;
newsos6)
;;
linux* | k*bsd*-gnu)
case $cc_basename in
ecc*)
wl='-Wl,'
;;
icc* | ifort*)
wl='-Wl,'
;;
lf95*)
wl='-Wl,'
;;
pgcc | pgf77 | pgf90)
wl='-Wl,'
;;
ccc*)
wl='-Wl,'
;;
como)
wl='-lopt='
;;
*)
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*)
wl='-Wl,'
;;
esac
;;
esac
;;
osf3* | osf4* | osf5*)
wl='-Wl,'
;;
rdos*)
;;
solaris*)
wl='-Wl,'
;;
sunos4*)
wl='-Qoption ld '
;;
sysv4 | sysv4.2uw2* | sysv4.3*)
wl='-Wl,'
;;
sysv4*MP*)
;;
sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
wl='-Wl,'
;;
unicos*)
wl='-Wl,'
;;
uts4*)
;;
esac
fi
# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
hardcode_libdir_flag_spec=
hardcode_libdir_separator=
hardcode_direct=no
hardcode_minus_L=no
case "$host_os" in
cygwin* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
if test "$GCC" != yes; then
with_gnu_ld=no
fi
;;
interix*)
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
openbsd*)
with_gnu_ld=no
;;
esac
ld_shlibs=yes
if test "$with_gnu_ld" = yes; then
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
# Unlike libtool, we use -rpath here, not --rpath, since the documented
# option of GNU ld is called -rpath, not --rpath.
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
case "$host_os" in
aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
fi
;;
amigaos*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
# Samuel A. Falvo II <[email protected]> reports
# that the semantics of dynamic libraries on AmigaOS, at least up
# to version 4, is to share data among multiple programs linked
# with the same dynamic library. Since this doesn't match the
# behavior of shared libraries on other platforms, we cannot use
# them.
ld_shlibs=no
;;
beos*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
cygwin* | mingw* | pw32* | cegcc*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
interix[3-9]*)
hardcode_direct=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
netbsd*)
;;
solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
ld_shlibs=no
;;
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
else
ld_shlibs=no
fi
;;
esac
;;
sunos4*)
hardcode_direct=yes
;;
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
esac
if test "$ld_shlibs" = no; then
hardcode_libdir_flag_spec=
fi
else
case "$host_os" in
aix3*)
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
if test "$GCC" = yes; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
fi
;;
aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
break
fi
done
;;
esac
fi
hardcode_direct=yes
hardcode_libdir_separator=':'
if test "$GCC" = yes; then
case $host_os in aix4.[012]|aix4.[012].*)
collect2name=`${CC} -print-prog-name=collect2`
if test -f "$collect2name" && \
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
:
else
# We have old collect2
hardcode_direct=unsupported
hardcode_minus_L=yes
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
;;
esac
fi
# Begin _LT_AC_SYS_LIBPATH_AIX.
echo 'int main () { return 0; }' > conftest.c
${CC} ${LDFLAGS} conftest.c -o conftest
aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
fi
if test -z "$aix_libpath"; then
aix_libpath="/usr/lib:/lib"
fi
rm -f conftest.c conftest
# End _LT_AC_SYS_LIBPATH_AIX.
if test "$aix_use_runtimelinking" = yes; then
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
else
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
fi
fi
;;
amigaos*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
# see comment about different semantics on the GNU ld section
ld_shlibs=no
;;
bsdi[45]*)
;;
cygwin* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
libext=lib
;;
darwin* | rhapsody*)
hardcode_direct=no
if test "$GCC" = yes ; then
:
else
case $cc_basename in
xlc*)
;;
*)
ld_shlibs=no
;;
esac
fi
;;
dgux*)
hardcode_libdir_flag_spec='-L$libdir'
;;
freebsd1*)
ld_shlibs=no
;;
freebsd2.2*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
freebsd2*)
hardcode_direct=yes
hardcode_minus_L=yes
;;
freebsd* | dragonfly*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
hpux9*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
;;
hpux10*)
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
fi
;;
hpux11*)
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
case $host_cpu in
hppa*64*|ia64*)
hardcode_direct=no
;;
*)
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
;;
esac
fi
;;
irix5* | irix6* | nonstopux*)
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
netbsd*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
newsos6)
hardcode_direct=yes
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
openbsd*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
else
case "$host_os" in
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
fi
else
ld_shlibs=no
fi
;;
os2*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
;;
osf3*)
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
osf4* | osf5*)
if test "$GCC" = yes; then
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
# Both cc and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
fi
hardcode_libdir_separator=:
;;
solaris*)
hardcode_libdir_flag_spec='-R$libdir'
;;
sunos4*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_direct=yes
hardcode_minus_L=yes
;;
sysv4)
case $host_vendor in
sni)
hardcode_direct=yes # is this really true???
;;
siemens)
hardcode_direct=no
;;
motorola)
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
;;
esac
;;
sysv4.3*)
;;
sysv4*MP*)
if test -d /usr/nec; then
ld_shlibs=yes
fi
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
;;
sysv5* | sco3.2v5* | sco5v6*)
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
hardcode_libdir_separator=':'
;;
uts4*)
hardcode_libdir_flag_spec='-L$libdir'
;;
*)
ld_shlibs=no
;;
esac
fi
# Check dynamic linker characteristics
# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
# Unlike libtool.m4, here we don't care about _all_ names of the library, but
# only about the one the linker finds when passed -lNAME. This is the last
# element of library_names_spec in libtool.m4, or possibly two of them if the
# linker has special search rules.
library_names_spec= # the last element of library_names_spec in libtool.m4
libname_spec='lib$name'
case "$host_os" in
aix3*)
library_names_spec='$libname.a'
;;
aix[4-9]*)
library_names_spec='$libname$shrext'
;;
amigaos*)
library_names_spec='$libname.a'
;;
beos*)
library_names_spec='$libname$shrext'
;;
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
cygwin* | mingw* | pw32* | cegcc*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
darwin* | rhapsody*)
shrext=.dylib
library_names_spec='$libname$shrext'
;;
dgux*)
library_names_spec='$libname$shrext'
;;
freebsd1*)
;;
freebsd* | dragonfly*)
case "$host_os" in
freebsd[123]*)
library_names_spec='$libname$shrext$versuffix' ;;
*)
library_names_spec='$libname$shrext' ;;
esac
;;
gnu*)
library_names_spec='$libname$shrext'
;;
hpux9* | hpux10* | hpux11*)
case $host_cpu in
ia64*)
shrext=.so
;;
hppa*64*)
shrext=.sl
;;
*)
shrext=.sl
;;
esac
library_names_spec='$libname$shrext'
;;
interix[3-9]*)
library_names_spec='$libname$shrext'
;;
irix5* | irix6* | nonstopux*)
library_names_spec='$libname$shrext'
case "$host_os" in
irix5* | nonstopux*)
libsuff= shlibsuff=
;;
*)
case $LD in
*-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
*-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
*-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
*) libsuff= shlibsuff= ;;
esac
;;
esac
;;
linux*oldld* | linux*aout* | linux*coff*)
;;
linux* | k*bsd*-gnu)
library_names_spec='$libname$shrext'
;;
knetbsd*-gnu)
library_names_spec='$libname$shrext'
;;
netbsd*)
library_names_spec='$libname$shrext'
;;
newsos6)
library_names_spec='$libname$shrext'
;;
nto-qnx*)
library_names_spec='$libname$shrext'
;;
openbsd*)
library_names_spec='$libname$shrext$versuffix'
;;
os2*)
libname_spec='$name'
shrext=.dll
library_names_spec='$libname.a'
;;
osf3* | osf4* | osf5*)
library_names_spec='$libname$shrext'
;;
rdos*)
;;
solaris*)
library_names_spec='$libname$shrext'
;;
sunos4*)
library_names_spec='$libname$shrext$versuffix'
;;
sysv4 | sysv4.3*)
library_names_spec='$libname$shrext'
;;
sysv4*MP*)
library_names_spec='$libname$shrext'
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
library_names_spec='$libname$shrext'
;;
uts4*)
library_names_spec='$libname$shrext'
;;
esac
sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
# How to pass a linker flag through the compiler.
wl="$escaped_wl"
# Static library suffix (normally "a").
libext="$libext"
# Shared library suffix (normally "so").
shlibext="$shlibext"
# Format of library name prefix.
libname_spec="$escaped_libname_spec"
# Library names that the linker finds when passed -lNAME.
library_names_spec="$escaped_library_names_spec"
# Flag to hardcode \$libdir into a binary during linking.
# This must work even if \$libdir does not exist.
hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
# Whether we need a single -rpath flag with a separated argument.
hardcode_libdir_separator="$hardcode_libdir_separator"
# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
# resulting binary.
hardcode_direct="$hardcode_direct"
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L="$hardcode_minus_L"
EOF
-4065
View File
File diff suppressed because it is too large. Load diff
+2416
View File
File diff suppressed because it is too large. Load diff
-7
View File
@@ -1,7 +0,0 @@
/Makefile.in
/Makefile
/config
/.cvsignore
/*.pc
/gdb/mono-sgen-gdb.py
/mono-sgen-gdb.py
-1
View File
@@ -1 +0,0 @@
/Compat.browser -crlf
-15
View File
@@ -1,15 +0,0 @@
2010-05-17 Zoltan Varga <[email protected]>
* mono-2.pc.in (Libs): Remove glib dependencies.
2010-05-07 Zoltan Varga <[email protected]>
* mono-2.pc (Requires): Remove glib dependencies.
2010-04-02 Jb Evain <[email protected]>
* dotnet35.pc.in: add System.Data.Services.dll.
2010-03-08 Rodrigo Kumpera <[email protected]>
* mono.supp: Add hazard pointers supressions.
+12 -28
View File
@@ -1,43 +1,27 @@
SUBDIRS = net_2_0 net_4_0 net_4_5
SUBDIRS = net_1_1 net_2_0
monodir = $(sysconfdir)/mono
monolldbdir = $(libdir)/mono/lldb
EXTRA_DIST = \
config.in \
browscap.ini mono.supp mono.d README ChangeLog \
mono.pc.in mono-2.pc.in monosgen-2.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 system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in \
reactive.pc.in xbuild12.pc \
net_1_1/machine.config \
gdb/mono-gdb.py \
gdb/gdb-python.diff \
lldb/mono.py
browscap.ini mono.supp mono.d README \
mono.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in \
mono-cairo.pc.in cecil.pc.in smcs.pc.in
pkgconfigdir = $(libdir)/pkgconfig
if SUPPORT_SGEN
SGENPCFILE=monosgen-2.pc
if JIT_SUPPORTED
if INTERP_SUPPORTED
pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc mono-cairo.pc cecil.pc smcs.pc
else
SGENPCFILE=
pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc mono-cairo.pc cecil.pc smcs.pc
endif
else
pkgconfig_DATA= mint.pc mono-cairo.pc cecil.pc smcs.pc
endif
pkgconfig_DATA= mono.pc mono-2.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 system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
DISTCLEANFILES= mono-2.pc 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 system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py
DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc mono-cairo.pc cecil.pc smcs.pc
mono_DATA = config \
browscap.ini
monolldb_DATA = lldb/mono.py
gdbdir = $(bindir)
mono-sgen-gdb.py: gdb/mono-gdb.py
cp $< $@
gdb_DATA = gdb/mono-gdb.py mono-sgen-gdb.py
-4
View File
@@ -1,4 +0,0 @@
Name: AspNetWebStack
Description: References Microsoft ASP.NET Web Stack
Version: @VERSION@
Libs: -r:@prefix@/lib/mono/gac/System.Web.Razor/2.0.0.0__31bf3856ad364e35/System.Web.Razor.dll -r:@prefix@/lib/mono/gac/System.Web.Http/4.0.0.0__31bf3856ad364e35/System.Web.Http.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages.Razor/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Razor.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages.Deployment/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Deployment.dll
+6723 -5094
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -1,5 +1,5 @@
assemblies_dir=@prefix@/lib/mono
Libraries=${assemblies_dir}/gac/Mono.Cecil/0.9.5.0__0738eb9f132ed756/Mono.Cecil.dll
Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756/Mono.Cecil.dll
Name: Mono Internal -- Do not use.
Description: Mono Internal Libraries -- Do not use
+1 -11
View File
@@ -10,27 +10,17 @@
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
<dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
<dllmap dll="libX11" target="@X11@" os="!windows" />
<dllmap dll="libgdk-x11-2.0" target="@GDKX11@" os="!windows"/>
<dllmap dll="libgtk-x11-2.0" target="@GTKX11@" os="!windows"/>
<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
<dllmap dll="libcups" target="libcups.dylib" os="osx"/>
<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"/>
<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
</dllmap>
<dllmap dll="gdiplus" target="@libgdiplus_install_loc@" os="!windows"/>
<dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@" os="!windows"/>
<dllmap dll="gdi32" target="@libgdiplus_install_loc@" os="!windows"/>
<dllmap dll="gdi32.dll" target="@libgdiplus_install_loc@" os="!windows"/>
</configuration>
+1 -1
View File
@@ -2,4 +2,4 @@
Name: Standard libraries in a .NET setup
Description: References all the standard .NET libraries for compilation
Version: @VERSION@
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.VisualC.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll -r:System.Xml.Linq.dll
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.JScript.dll -r:Microsoft.VisualC.dll -r:Microsoft.Vsa.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll
+1 -1
View File
@@ -2,4 +2,4 @@
Name: Standard libraries in a .NET setup
Description: References all the standard .NET libraries for compilation (.NET Framework 3.5 compatibility)
Version: @VERSION@
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.VisualC.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll -r:System.Configuration.dll -r:System.Core.dll -r:System.Xml.Linq.dll -r:System.Data.DataSetExtensions.dll -r:System.Data.Linq.dll -r:System.Data.Services.dll -r:System.Web.Abstractions.dll -r:System.Web.Routing.dll -r:System.Web.DynamicData.dll -r:System.ComponentModel.DataAnnotations.dll
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.JScript.dll -r:Microsoft.VisualC.dll -r:Microsoft.Vsa.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll -r:System.Configuration.dll -r:System.Core.dll -r:System.Xml.Linq.dll -r:System.Data.DataSetExtensions.dll
-66
View File
@@ -1,66 +0,0 @@
2009-10-09 Zoltan Varga <[email protected]>
* mono-gdb.py (MonoSupport.run_hook): Set MONO_XDEBUG to 'gdb' to activate
the GDB support mode in the runtime.
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
-248
View File
@@ -1,248 +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.
#
from __future__ import print_function
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".format (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".format (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]".format (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".format (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".format (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".format (class_ns, class_name))
except:
# Maybe there is no debug info for that type
return "%s.%s".format (class_ns, class_name)
#return obj.cast (gdb_type)
return "%s.%s".format (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 ()\"".format (class_name, val ["name"].string ())
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_method_full_name (%s, 1)".format (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\"".format (class_name)
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)".format (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 gdb")
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".format (sofile))
# FIXME: This prints messages which couldn't be turned off
gdb.execute ("add-symbol-file %s 0".format (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".format (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".format (sys.argv [0]))
gdb.execute ("r --break *:* %s".format (" ".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")
-80
View File
@@ -1,80 +0,0 @@
2010-06-28 Zoltan Varga <[email protected]>
* mono-gdb.py: Add pretty printers for more runtime data structures.
2009-10-13 Zoltan Varga <[email protected]>
* mono-gdb.py: Add an 'xdb' command to flush the debugging info.
2009-10-12 Zoltan Varga <[email protected]>
* mono-gdb.py: Update this to gdb 7.0.
* mono-gdbinit: Removed, no longer needed.
2009-10-09 Zoltan Varga <[email protected]>
* mono-gdb.py (MonoSupport.run_hook): Set MONO_XDEBUG to 'gdb' to activate
the GDB support mode in the runtime.
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
-354
View File
@@ -1,354 +0,0 @@
#
# Author: Zoltan Varga ([email protected])
# License: MIT/X11
#
#
# This is a mono support mode for gdb 7.0 and later
# Usage:
# - copy/symlink this file to the directory where the mono executable lives.
# - run mono under gdb, or attach to a mono process started with --debug=gdb using gdb.
#
from __future__ import print_function
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".format (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".format (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]".format (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".format (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__ ()
try:
gdb_type = gdb.lookup_type ("struct %s_%s".format (class_ns.replace (".", "_"), class_name))
return self._iterator(obj.cast (gdb_type))
except:
return {}.__iter__ ()
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".format (class_ns, class_name))
except:
# Maybe there is no debug info for that type
return "%s.%s".format (class_ns, class_name)
#return obj.cast (gdb_type)
return "%s.%s".format (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 ()\"".format (class_name, val ["name"].string ())
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_method_full_name (%s, 1)".format (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_inner(self, add_quotes):
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 ())
if klass ["generic_class"].cast (gdb.lookup_type ("guint64")) != 0:
class_name = "%s<%s>".format (class_name, str (klass ["generic_class"]["context"]["class_inst"]))
if add_quotes:
return "\"%s\"".format (class_name)
else:
return class_name
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
def to_string(self):
try:
return self.to_string_inner (True)
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
return str(self.val.cast (gdb.lookup_type ("gpointer")))
class MonoGenericInstPrinter:
"Print a MonoGenericInst structure"
def __init__(self, val):
self.val = val
def to_string(self):
if int(self.val.cast (gdb.lookup_type ("guint64"))) == 0:
return "0x0"
inst = self.val.dereference ()
inst_len = inst ["type_argc"]
inst_args = inst ["type_argv"]
inst_str = ""
for i in range(0, inst_len):
print (inst_args)
type_printer = MonoTypePrinter (inst_args [i])
if i > 0:
inst_str = inst_str + ", "
inst_str = inst_str + type_printer.to_string ()
return inst_str
class MonoGenericClassPrinter:
"Print a MonoGenericClass structure"
def __init__(self, val):
self.val = val
def to_string_inner(self):
gclass = self.val.dereference ()
container_str = str(gclass ["container_class"])
class_inst = gclass ["context"]["class_inst"]
class_inst_str = ""
if int(class_inst.cast (gdb.lookup_type ("guint64"))) != 0:
class_inst_str = str(class_inst)
method_inst = gclass ["context"]["method_inst"]
method_inst_str = ""
if int(method_inst.cast (gdb.lookup_type ("guint64"))) != 0:
method_inst_str = str(method_inst)
return "%s, [%s], [%s]>".format (container_str, class_inst_str, method_inst_str)
def to_string(self):
try:
return self.to_string_inner ()
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
return str(self.val.cast (gdb.lookup_type ("gpointer")))
class MonoTypePrinter:
"Print a MonoType structure"
def __init__(self, val):
self.val = val
def to_string_inner(self, csharp):
try:
t = self.val.dereference ()
kind = str (t ["type"]).replace ("MONO_TYPE_", "").lower ()
info = ""
if kind == "class":
p = MonoClassPrinter(t ["data"]["klass"])
info = p.to_string ()
elif kind == "genericinst":
info = str(t ["data"]["generic_class"])
if info != "":
return "{%s, %s}".format (kind, info)
else:
return "{%s}".format (kind)
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
return str(self.val.cast (gdb.lookup_type ("gpointer")))
def to_string(self):
return self.to_string_inner (False)
class MonoMethodRgctxPrinter:
"Print a MonoMethodRgctx structure"
def __init__(self, val):
self.val = val
def to_string(self):
rgctx = self.val.dereference ()
klass = rgctx ["class_vtable"].dereference () ["klass"]
klass_printer = MonoClassPrinter (klass)
inst = rgctx ["method_inst"].dereference ()
inst_len = inst ["type_argc"]
inst_args = inst ["type_argv"]
inst_str = ""
for i in range(0, inst_len):
print (inst_args)
type_printer = MonoTypePrinter (inst_args [i])
if i > 0:
inst_str = inst_str + ", "
inst_str = inst_str + type_printer.to_string ()
return "MRGCTX[%s, [%s]]".format (klass_printer.to_string(), inst_str)
class MonoVTablePrinter:
"Print a MonoVTable structure"
def __init__(self, val):
self.val = val
def to_string(self):
if int(self.val.cast (gdb.lookup_type ("guint64"))) == 0:
return "0x0"
vtable = self.val.dereference ()
klass = vtable ["klass"]
klass_printer = MonoClassPrinter (klass)
return "vtable(%s)".format (klass_printer.to_string ())
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 == "MonoString *":
return StringPrinter (val)
if t == "MonoMethod *":
return MonoMethodPrinter (val)
if t == "MonoClass *":
return MonoClassPrinter (val)
if t == "MonoType *":
return MonoTypePrinter (val)
if t == "MonoGenericInst *":
return MonoGenericInstPrinter (val)
if t == "MonoGenericClass *":
return MonoGenericClassPrinter (val)
if t == "MonoMethodRuntimeGenericContext *":
return MonoMethodRgctxPrinter (val)
if t == "MonoVTable *":
return MonoVTablePrinter (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)
# This command will flush the debugging info collected by the runtime
class XdbCommand (gdb.Command):
def __init__ (self):
super (XdbCommand, self).__init__ ("xdb", gdb.COMMAND_NONE,
gdb.COMPLETE_COMMAND)
def invoke(self, arg, from_tty):
gdb.execute ("call mono_xdebug_flush ()")
register_csharp_printers (gdb.current_objfile())
XdbCommand ()
gdb.execute ("set environment MONO_XDEBUG gdb")
print ("Mono support loaded.")
-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".format (sys.argv [0]))
gdb.execute ("r --break *:* %s".format (" ".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")
-174
View File
@@ -1,174 +0,0 @@
#
# Author: Zoltan Varga ([email protected])
# License: MIT/X11
#
#
# This is a mono support mode for lldb
#
# Comments about the lldb python api:
# - there are no accessors, i.e. valobj["name"]
# - http://lldb.llvm.org/python_reference/index.html seems to be outdated
# - there is no autoload support, i.e. can't load this file automatically
# when 'mono' is the debugger target.
import lldb
# FIXME: Generate enums from runtime enums
MONO_TYPE_END = 0x00
MONO_TYPE_VOID = 0x01
MONO_TYPE_BOOLEAN = 0x02
MONO_TYPE_CHAR = 0x03
MONO_TYPE_I1 = 0x04
MONO_TYPE_U1 = 0x05
MONO_TYPE_I2 = 0x06
MONO_TYPE_U2 = 0x07
MONO_TYPE_I4 = 0x08
MONO_TYPE_U4 = 0x09
MONO_TYPE_I8 = 0x0a
MONO_TYPE_U8 = 0x0b
MONO_TYPE_R4 = 0x0c
MONO_TYPE_R8 = 0x0d
MONO_TYPE_STRING = 0x0e
MONO_TYPE_PTR = 0x0f
MONO_TYPE_BYREF = 0x10
MONO_TYPE_VALUETYPE = 0x11
MONO_TYPE_CLASS = 0x12
MONO_TYPE_VAR = 0x13
MONO_TYPE_ARRAY = 0x14
MONO_TYPE_GENERICINST= 0x15
MONO_TYPE_TYPEDBYREF = 0x16
MONO_TYPE_I = 0x18
MONO_TYPE_U = 0x19
MONO_TYPE_FNPTR = 0x1b
MONO_TYPE_OBJECT = 0x1c
MONO_TYPE_SZARRAY = 0x1d
MONO_TYPE_MVAR = 0x1e
primitive_type_names = {
MONO_TYPE_BOOLEAN : "bool",
MONO_TYPE_CHAR : "char",
MONO_TYPE_I1 : "sbyte",
MONO_TYPE_U1 : "byte",
MONO_TYPE_I2 : "short",
MONO_TYPE_U2 : "ushort",
MONO_TYPE_I4 : "int",
MONO_TYPE_U4 : "uint",
MONO_TYPE_I8 : "long",
MONO_TYPE_U8 : "ulong",
MONO_TYPE_R4 : "float",
MONO_TYPE_R8 : "double",
MONO_TYPE_STRING : "string"
}
#
# Helper functions for working with the lldb python api
#
def member(val, member_name):
return val.GetChildMemberWithName (member_name)
def string_member(val, member_name):
return val.GetChildMemberWithName (member_name).GetSummary ()[1:-1]
def isnull(val):
return val.deref.addr.GetOffset () == 0
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 "{0}.{1}".format (ns, name)
#
# Pretty printers for mono runtime types
#
def stringify_type (type):
"Print a MonoType structure"
ttype = member(type, "type").GetValueAsUnsigned()
if primitive_type_names.has_key (ttype):
return primitive_type_names [ttype]
else:
return "<MonoTypeEnum 0x{0:x}>".format (ttype)
def stringify_ginst (ginst):
"Print a MonoGenericInst structure"
len = int(member(ginst, "type_argc").GetValue())
argv = member(ginst, "type_argv")
res=""
for i in range(len):
t = argv.GetChildAtIndex(i, False, True)
if i > 0:
res += ", "
res += stringify_type(t)
return res
def print_type(valobj, internal_dict):
type = valobj
if isnull (type):
return ""
return stringify_type (type)
def print_class (valobj, internal_dict):
klass = valobj
if isnull (klass):
return ""
aname = member (member (member (klass, "image"), "assembly"), "aname")
basename = "[{0}]{1}".format (string_member (aname, "name"), (stringify_class_name (string_member (klass, "name_space"), string_member (klass, "name"))))
gclass = member (klass, "generic_class")
if not isnull (gclass):
ginst = member (member (gclass, "context"), "class_inst")
return "{0}<{1}>".format (basename, stringify_ginst (ginst))
return basename
def print_method (valobj, internal_dict):
method = valobj
if isnull (method):
return ""
klass = member (method, "klass")
return "{0}:{1}()".format (print_class (klass, None), string_member (valobj, "name"))
def print_domain(valobj, internal_dict):
domain = valobj
if isnull (domain):
return ""
target = domain.target
root = target.FindFirstGlobalVariable("mono_root_domain")
name = string_member (domain, "friendly_name")
if root.IsValid () and root.deref.addr.GetOffset () == root.deref.addr.GetOffset ():
return "[root]"
else:
return "[{0}]".format (name)
def print_object(valobj, internal_dict):
obj = valobj
if isnull (obj):
return ""
domain = member (member (obj, "vtable"), "domain")
klass = member (member (obj, "vtable"), "klass")
return print_domain (domain, None) + print_class (klass, None)
# Register pretty printers
# FIXME: This cannot pick up the methods define in this module, leading to warnings
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_method MonoMethod")
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_class MonoClass")
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_type MonoType")
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_domain MonoDomain")
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_object MonoObject")
lldb.debugger.HandleCommand ("type category enable mono")
# Helper commands for runtime debugging
# These resume the target
# Print the method at the current ip
lldb.debugger.HandleCommand ("command alias pip p mono_print_method_from_ip((void*)$pc)")
# Print the method at the provided ip
lldb.debugger.HandleCommand ("command regex pmip 's/^$/p mono_print_method_from_ip((void*)$pc)/' 's/(.+)/p mono_print_method_from_ip((void*)(%1))/'")
print "Mono support mode loaded."
-6
View File
@@ -1,6 +0,0 @@
2009-02-19 Rodrigo Kumpera <[email protected]>
* LockTracerDecoder.cs: Initial version of the lock tracers decoder.
-563
View File
@@ -1,563 +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 (global)
domain lock (complex)
domain jit lock (complex)
marshal lock
simple locks
Examples:
You can take the loader lock without holding a domain lock.
You can take the domain load while holding the loader lock
You cannot take the loader lock if only the domain lock is held.
You cannot take a domain lock while holding the lock to another domain.
TODO:
We have a few known ok violation. We need a way to whitelist them.
Known ok issues:
ERROR: tried to acquire lock DomainLock at mono_domain_code_reserve_align while holding DomainLock at mono_class_create_runtime_vtable: Hierarchy violation.
This is triggered when building the vtable of a non-root domain and fetching a vtable trampoline for an offset that has not been built. We'll take the root
domain lock while holding the other one.
This is ok since we never allow locking to have in the other direction, IOW, the root-domain lock is one level down from the other domain-locks.
WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_class_from_name
WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_image_add_to_name_cache
Both of those happen when filling up the name_cache, as it needs to alloc image memory.
This one is fixable by spliting mono_image_init_name_cache into a locked and an unlocked variants and calling them appropriatedly.
*/
public enum Lock {
Invalid,
LoaderLock,
ImageDataLock,
DomainLock,
DomainAssembliesLock,
DomainJitCodeHashLock,
IcallLock,
AssemblyBindingLock,
MarshalLock,
ClassesLock,
LoaderGlobalDataLock
}
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:
case Lock.MarshalLock:
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; }
}
public bool IsResursiveLock {
get { return kind == Lock.LoaderLock || kind == Lock.DomainLock; }
}
/*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",
"mono_icall_lock",
"mono_icall_unlock",
"add_record",
"mono_locks_lock_acquired",
"mono_locks_lock_released",
};
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 void AdjustSize (Symbol next) {
size = next.offset - this.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 < 7)
continue;
if (!fields [3].Equals ("FUN"))
continue;
int offset = fields [0].ParseHex ();
string name = fields [6];
if (name.StartsWith ("_"))
name = name.Substring (1);
if (offset != 0)
list.Add (new Symbol (offset, 0, name));
}
table = new Symbol [list.Count];
list.CopyTo (table, 0);
Array.Sort (table);
for (int i = 1; i < table.Length; ++i) {
table [i - 1].AdjustSize (table [i]);
}
}
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);
}
}
-11
View File
@@ -1,11 +0,0 @@
prefix=${pcfiledir}/../..
exec_prefix=${pcfiledir}/../..
libdir=${prefix}/@reloc_libdir@
includedir=${prefix}/include/mono-@API_VER@
sysconfdir=@sysconfdir@
Name: Mono
Description: Mono Runtime
Version: @VERSION@
Libs: -L${libdir} @export_ldflags@ -lmono-@API_VER@ @libmono_ldflags@
Cflags: -I${includedir} @libmono_cflags@
+1 -1
View File
@@ -6,4 +6,4 @@ includedir=${prefix}/include
Name: Mono.Cairo
Description: Cairo bindings for Mono
Version: @VERSION@
Libs: -r:Mono.Cairo
Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll
-7
View File
@@ -1,7 +0,0 @@
prefix=${pcfiledir}/../..
assemblies_dir=${prefix}/lib/mono-source-libs
Sources=${assemblies_dir}/getline.cs
Name: Mono.Terminal.LineEditor
Description: Terminal text entry editor using System.Console.
Version: 0.2.1
-9
View File
@@ -1,9 +0,0 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
Name: Mono NUnit
Description: Mono's version of NUnit
Version: @VERSION@
Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll
-7
View File
@@ -1,7 +0,0 @@
prefix=${pcfiledir}/../..
assemblies_dir=${prefix}/lib/mono-source-libs
Sources=${assemblies_dir}/Options.cs
Name: Mono.Options
Description: Command Line Parsing Library
Version: 0.2.3
-59
View File
@@ -18,65 +18,6 @@ provider mono {
/* Garbage Collector (GC) */
probe gc__begin (int generation);
probe gc__end (int generation);
probe gc__requested (int generation, uintptr_t requested_size, int wait_to_finish);
probe gc__checkpoint__1 (int generation);
probe gc__checkpoint__2 (int generation);
probe gc__checkpoint__3 (int generation);
probe gc__checkpoint__4 (int generation);
probe gc__checkpoint__5 (int generation);
probe gc__checkpoint__6 (int generation);
probe gc__checkpoint__7 (int generation);
probe gc__checkpoint__8 (int generation);
probe gc__checkpoint__9 (int generation);
probe gc__concurrent__start__begin (int generation);
probe gc__concurrent__start__end (int generation, long long num_major_objects_marked);
probe gc__concurrent__update__finish__begin (int generation, long long num_major_objects_marked);
probe gc__concurrent__update__end (int generation, long long num_major_objects_marked);
probe gc__concurrent__finish__end (int generation, long long num_major_objects_marked);
probe gc__sweep__begin (int generation, int full_sweep);
probe gc__sweep__end (int generation, int full_sweep);
probe gc__world__stop__begin ();
probe gc__world__stop__end ();
probe gc__world__restart__begin (int generation);
probe gc__world__restart__end (int generation);
probe gc__heap__alloc (uintptr_t addr, uintptr_t len);
probe gc__heap__free (uintptr_t addr, uintptr_t len);
probe gc__locked ();
probe gc__unlocked ();
probe gc__nursery__tlab__alloc (uintptr_t addr, uintptr_t len);
probe gc__nursery__obj__alloc (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__major__obj__alloc__large (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__major__obj__alloc__pinned (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__major__obj__alloc__degraded (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__major__obj__alloc__mature (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
/* Can be nursery->nursery, nursery->major or major->major */
probe gc__obj__moved (uintptr_t dest, uintptr_t src, int dest_gen, int src_gen, uintptr_t size, char *ns_name, char *class_name);
probe gc__nursery__swept (uintptr_t addr, uintptr_t len);
probe gc__major__swept (uintptr_t addr, uintptr_t len);
probe gc__obj__pinned (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name, int generation);
probe gc__finalize__enqueue (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name, int generation, int is_critical);
probe gc__finalize__invoke (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__weak__update (uintptr_t ref_addr, uintptr_t old_addr, uintptr_t new_addr, uintptr_t size, char *ns_name, char *class_name, int track);
probe gc__global__remset__add (uintptr_t ref_addr, uintptr_t obj_addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__obj__cemented (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__internal__alloc (uintptr_t addr, uintptr_t size, int type);
probe gc__internal__dealloc (uintptr_t add, uintptr_t size, int type);
};
#pragma D attributes Evolving/Evolving/Common provider mono provider
+3
View File
@@ -7,3 +7,6 @@ sysconfdir=@sysconfdir@
Name: Mono
Description: Mono Runtime
Version: @VERSION@
Requires: glib-2.0 gthread-2.0
Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@
Cflags: -I${includedir} @libmono_cflags@
+1 -14
View File
@@ -37,17 +37,4 @@
fun:*
obj:*mono
}
{
mono - Invalid write of size 4 hazardous_pointer
Memcheck:Addr4
fun:get_hazardous_pointer
fun:*
obj:*mono
}
{
mono - Invalid write of size 4 jit_info_table_find
Memcheck:Addr4
fun:mono_jit_info_table_find
fun:*
obj:*mono
}
-9
View File
@@ -1,9 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@prefix@/lib
sourcesdir=${libdir}/monodoc/sources
Name: Monodoc
Description: Monodoc - Mono Documentation Tools
Version: @VERSION@
Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll
-11
View File
@@ -1,11 +0,0 @@
prefix=${pcfiledir}/../..
exec_prefix=${pcfiledir}/../..
libdir=${prefix}/@reloc_libdir@
includedir=${prefix}/include/mono-@API_VER@
sysconfdir=@sysconfdir@
Name: Mono
Description: Mono Runtime
Version: @VERSION@
Libs: -L${libdir} @export_ldflags@ -lmonosgen-@API_VER@ @libmono_ldflags@
Cflags: -I${includedir} @libmono_cflags@
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-6
View File
@@ -214,16 +214,12 @@
<cryptoNameMapping>
<cryptoClasses>
<cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
<nameEntry name="MD4" class="monoMD4" />
</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" />
<oidEntry OID="1.2.840.113549.2.4" name="MD4" />
<oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
</oidMap>
</cryptographySettings>
</mscorlib>
@@ -240,8 +236,6 @@
<map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- Silverlight 2.0 key -->
<map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- XNA Framework key -->
<map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
</pubTokenMapping>
</strongNames>
</configuration>
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
File renamed without changes.
File renamed without changes.
+2 -2
View File
@@ -1,6 +1,6 @@
monodir = $(sysconfdir)/mono/2.0/Browsers
EXTRA_DIST = ../../Browsers/Compat.browser
EXTRA_DIST = Compat.browser
mono_DATA = ../../Browsers/Compat.browser
mono_DATA = Compat.browser
-90
View File
@@ -1,93 +1,3 @@
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.
2008-10-09 Gonzalo Paniagua Javier <[email protected]>
* web.config: default values for httpRuntime are different in 2.0
2008-10-09 Marek Habersack <[email protected]>
* web.config: added the default monoSettings section which works around
an incompatibility between mcs and csc, mentioned in bug #433806
* machine.config: added definition of the monoSettings section to
the system.web group
2008-10-06 Marek Habersack <[email protected]>
* machine.config: added entries to ignore the mobileControls and
deviceFilters sections.
2008-09-02 Marek Habersack <[email protected]>
* web.config: removed System.Web.Extensions.dll from the assemblies
(reverting r112073) - it would break all the ASP.NET applications
which use System.Web.Extensions other than 3.5.0.0
2008-09-06 Daniel Morgan <[email protected]>
* machine.config: added Mono.Data.SybaseClient
to DbProviderFactories section.
2008-09-02 Atsushi Enomoto <[email protected]>
* web.config: added System.Web.Extensions.dll to assemblies.
2008-08-28 Zoltan Varga <[email protected]>
* machine.config: Fix syntax error.
2008-03-23 Dean Brettle <[email protected]>
* Makefile.am: added Browsers/Compat.browser
+74 -125
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" %>
@@ -123,20 +122,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
@@ -335,31 +329,21 @@ class NoCheckCertificatePolicy : ICertificatePolicy {
}
}
string GetOrPost ()
{
return (CurrentOperationProtocols.IndexOf ("HttpGet") >= 0) ? "GET" : "POST";
}
string GetQS ()
{
string GetTestResult ()
{
if (!HasFormResult) return null;
bool fill = false;
string qs = "";
NameValueCollection query_string = Request.QueryString;
for (int n = 0; n < query_string.Count; n++) {
for (int n=0; n<Request.QueryString.Count; n++)
{
if (fill) {
if (qs != "") qs += "&";
qs += query_string.GetKey(n) + "=" + Server.UrlEncode (query_string [n]);
qs += Request.QueryString.GetKey(n) + "=" + Server.UrlEncode (Request.QueryString [n]);
}
if (query_string.GetKey(n) == "ext") fill = true;
if (Request.QueryString.GetKey(n) == "ext") fill = true;
}
return qs;
}
string GetTestResultUrl ()
{
if (!HasFormResult) return "";
string location = null;
ServiceDescription desc = descriptions [0];
Service service = desc.Services[0];
@@ -374,7 +358,59 @@ string GetTestResultUrl ()
if (location == null)
return "Could not locate web service";
return location + "/" + CurrentOperationName;
try
{
string url = location + "/" + CurrentOperationName;
Uri uri = new Uri (url);
WebRequest req;
if (CurrentOperationProtocols.IndexOf ("HttpGet") < 0) {
req = WebRequest.Create (url);
req.Method="POST";
if (!String.IsNullOrEmpty (qs)) {
req.ContentType = "application/x-www-form-urlencoded";
byte [] postBuffer = Encoding.UTF8.GetBytes (qs);
req.ContentLength = postBuffer.Length;
using (Stream requestStream = req.GetRequestStream())
requestStream.Write (postBuffer, 0, postBuffer.Length);
}
}
else
req = WebRequest.Create (url + "?" + qs);
if (url.StartsWith ("https:"))
ServicePointManager.CertificatePolicy = new NoCheckCertificatePolicy ();
HttpCookieCollection cookies = Request.Cookies;
int last = cookies.Count;
if (last > 0) {
CookieContainer container = new CookieContainer ();
for (int i = 0; i < last; i++) {
HttpCookie hcookie = cookies [i];
Cookie cookie = new Cookie (hcookie.Name, hcookie.Value, hcookie.Path, hcookie.Domain);
container.Add (uri, cookie);
}
((HttpWebRequest) req).CookieContainer = container;
}
WebResponse resp = req.GetResponse();
StreamReader sr = new StreamReader (resp.GetResponseStream());
string s = sr.ReadToEnd ();
sr.Close ();
return "<div class='code-xml'>" + ColorizeXml(WrapText(s,CodeTextColumns)) + "</div>";
}
catch (Exception ex)
{
string res = "<b style='color:red'>" + ex.Message + "</b>";
WebException wex = ex as WebException;
if (wex != null)
{
WebResponse resp = wex.Response;
if (resp != null) {
StreamReader sr = new StreamReader (resp.GetResponseStream());
string s = sr.ReadToEnd ();
sr.Close ();
res += "<div class='code-xml'>" + ColorizeXml(WrapText(s,CodeTextColumns)) + "</div>";
}
}
return res;
}
}
string GenerateOperationMessages (string protocol, bool generateInput)
@@ -474,15 +510,10 @@ private CodeDomProvider GetProvider(string langId)
//
// Document generation
//
class UTF8StringWriter : StringWriter {
public override Encoding Encoding {
get { return Encoding.UTF8; }
}
}
string GenerateDocument ()
{
UTF8StringWriter sw = new UTF8StringWriter ();
StringWriter sw = new StringWriter ();
if (CurrentDocType == "wsdl")
descriptions [CurrentDocInd].Write (sw);
@@ -1041,7 +1072,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;
@@ -1135,18 +1166,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
@@ -1156,8 +1178,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)
@@ -1538,9 +1558,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}
@@ -1571,73 +1590,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";
@@ -1794,11 +1747,7 @@ This service does not contain any public web method.
</form>
<div id="testFormResult" style="display:<%= (HasFormResult?"block":"none") %>">
The web service returned the following result:<br/><br/>
<div class="codePanel" id="testresult_div">
</div>
<script language="javascript">
getXML ("<%= GetOrPost () %>", "<%= GetTestResultUrl () %>", "<%= GetQS () %>");
</script>
<div class="codePanel"><%=GetTestResult()%></div>
</div>
<% } else {%>
The test form is not available for this operation because it has parameters with a complex structure.
+6 -35
View File
@@ -22,7 +22,7 @@
<section name="anonymousIdentification" type="System.Web.Configuration.AnonymousIdentificationSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="authentication" type="System.Web.Configuration.AuthenticationSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="authorization" type="System.Web.Configuration.AuthorizationSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="browserCaps" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="browserCaps" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />/>
<section name="clientTarget" type="System.Web.Configuration.ClientTargetSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="compilation" type="System.Web.Configuration.CompilationSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="customErrors" type="System.Web.Configuration.CustomErrorsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -37,8 +37,6 @@
<section name="identity" type="System.Web.Configuration.IdentitySection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="machineKey" type="System.Web.Configuration.MachineKeySection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="membership" type="System.Web.Configuration.MembershipSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="mobileControls" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="deviceFilters" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="pages" type="System.Web.Configuration.PagesSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="processModel" type="System.Web.Configuration.ProcessModelSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineOnly" allowLocation="false" />
<section name="profile" type="System.Web.Configuration.ProfileSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
@@ -60,7 +58,6 @@
<section name="outputCacheSettings" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="sqlCacheDependency" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
</sectionGroup>
<section name="monoSettings" type="System.Web.Configuration.MonoSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</sectionGroup>
<sectionGroup name="system.net" type="System.Net.Configuration.NetSectionGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="authenticationModules" type="System.Net.Configuration.AuthenticationModulesSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -79,17 +76,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="serviceModelHostingEnvironment" 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>
<sectionGroup name="system.transactions" type="System.Transactions.Configuration.TransactionsSectionGroup, System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null">
<section name="defaultSettings" type="System.Transactions.Configuration.DefaultSettingsSection, System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null"/>
<section name="machineSettings" type="System.Transactions.Configuration.MachineSettingsSection, System.Transactions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null" allowDefinition="MachineOnly" allowExeDefinition="MachineOnly"/>
</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>
@@ -107,6 +99,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" />
@@ -186,9 +181,6 @@
<add name="SqlClient Data Provider" invariant="System.Data.SqlClient"
description=".Net Framework Data Provider for SqlServer"
type="System.Data.SqlClient.SqlClientFactory, System.Data, Version=2.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=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"/>
</DbProviderFactories>
</system.data>
@@ -197,16 +189,12 @@
<cryptoNameMapping>
<cryptoClasses>
<cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
<nameEntry name="MD4" class="monoMD4" />
</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" />
<oidEntry OID="1.2.840.113549.2.4" name="MD4" />
<oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
</oidMap>
</cryptographySettings>
</mscorlib>
@@ -223,8 +211,6 @@
<map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- Silverlight 2.0 key -->
<map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- XNA Framework key -->
<map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
</pubTokenMapping>
</strongNames>
@@ -263,21 +249,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 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<settingsMap>
<map sectionType="System.Web.Configuration.MembershipSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, Mono.Web, Version=2.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
@@ -24,7 +24,7 @@
</map>
<map sectionType="System.Web.Configuration.RoleManagerSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, Mono.Web, Version=2.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
+4 -17
View File
@@ -3,19 +3,11 @@
<configuration>
<system.web>
<monoSettings>
<compilersCompatibility>
<compiler language="c#;cs;csharp" extension=".cs" compilerOptions="/nowarn:0169"
type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.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=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.aspx" type="System.Web.UI.PageHandlerFactory, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.asmx" validate="false" type="System.Web.Services.Protocols.WebServiceHandlerFactory, System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.ashx" type="System.Web.UI.SimpleHandlerFactory, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -37,9 +29,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 +86,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>
@@ -128,12 +115,12 @@
<add extension=".refresh" type="System.Web.Compilation.IgnoreFileBuildProvider" />
</buildProviders>
</compilation>
<httpRuntime executionTimeout="110"
<httpRuntime executionTimeout="90"
maxRequestLength="4096"
useFullyQualifiedRedirectUrl="false"
minFreeThreads="8"
minLocalRequestFreeThreads="4"
appRequestQueueLimit="5000" />
appRequestQueueLimit="100" />
<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)" />
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-6
View File
@@ -1,6 +0,0 @@
monodir = $(sysconfdir)/mono/4.0/Browsers
EXTRA_DIST = ../../Browsers/Compat.browser
mono_DATA = ../../Browsers/Compat.browser
-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.
File diff suppressed because it is too large. Load diff
-14
View File
@@ -1,14 +0,0 @@
SUBDIRS = Browsers
monodir = $(sysconfdir)/mono/4.0
EXTRA_DIST = machine.config \
web.config \
DefaultWsdlHelpGenerator.aspx \
settings.map
mono_DATA = machine.config \
web.config \
DefaultWsdlHelpGenerator.aspx \
settings.map
-310
View File
@@ -1,310 +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.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="Everywhere"/>
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
</sectionGroup>
</sectionGroup>
</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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="behaviors" type="System.ServiceModel.Configuration.BehaviorsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="bindings" type="System.ServiceModel.Configuration.BindingsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="client" type="System.ServiceModel.Configuration.ClientSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="commonBehaviors" type="System.ServiceModel.Configuration.CommonBehaviorsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="diagnostics" type="System.ServiceModel.Configuration.DiagnosticSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="extensions" type="System.ServiceModel.Configuration.ExtensionsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="serviceHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="services" type="System.ServiceModel.Configuration.ServicesSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="standardEndpoints" type="System.ServiceModel.Configuration.StandardEndpointsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<section name="routing" type="System.ServiceModel.Routing.Configuration.RoutingSection, System.ServiceModel.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<section name="protocolMapping" type="System.ServiceModel.Configuration.ProtocolMappingSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
</sectionGroup>
<sectionGroup name="system.transactions" type="System.Transactions.Configuration.TransactionsSectionGroup, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null">
<section name="defaultSettings" type="System.Transactions.Configuration.DefaultSettingsSection, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null"/>
<section name="machineSettings" type="System.Transactions.Configuration.MachineSettingsSection, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null" allowDefinition="MachineOnly" allowExeDefinition="MachineOnly"/>
</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" />
<sectionGroup name="system.runtime.caching" type="System.Runtime.Caching.Configuration.CachingSectionGroup, System.Runtime.Caching, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<section name="memoryCache" type="System.Runtime.Caching.Configuration.MemoryCacheSection, System.Runtime.Caching, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
</sectionGroup>
</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" />
<cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
<nameEntry name="MD4" class="monoMD4" />
</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" />
<oidEntry OID="1.2.840.113549.2.4" name="MD4" />
<oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
</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" />
<!-- XNA Framework key -->
<map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
</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>
<endpointExtensions>
<add name="dynamicEndpoint" type="System.ServiceModel.Discovery.Configuration.DynamicEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="discoveryEndpoint" type="System.ServiceModel.Discovery.Configuration.DiscoveryEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="udpDiscoveryEndpoint" type="System.ServiceModel.Discovery.Configuration.UdpDiscoveryEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="announcementEndpoint" type="System.ServiceModel.Discovery.Configuration.AnnouncementEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="udpAnnouncementEndpoint" type="System.ServiceModel.Discovery.Configuration.UdpAnnouncementEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="webHttpEndpoint" type="System.ServiceModel.Configuration.WebHttpEndpointCollectionElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="webScriptEndpoint" type="System.ServiceModel.Configuration.WebScriptEndpointCollectionElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</endpointExtensions>
</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, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
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, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
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>
-253
View File
@@ -1,253 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="OptionInfer" value="true"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
</compilers>
</system.codedom>
<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 path="trace.axd" verb="*" type="System.Web.Handlers.TraceHandler" validate="True" />
<add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="True" />
<add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False" />
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
<add path="*.axd" verb="*" type="System.Web.HttpNotFoundHandler" validate="True" />
<add path="*.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" validate="True" />
<add path="*.ashx" verb="*" type="System.Web.UI.SimpleHandlerFactory" validate="True" />
<add path="*.asmx" verb="*" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False" />
<add path="*.rem" verb="*" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="False" />
<add path="*.soap" verb="*" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="False" />
<add path="*.asax" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ascx" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.master" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.skin" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.browser" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sitemap" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.dll.config" verb="GET,HEAD" type="System.Web.StaticFileHandler" validate="True" />
<add path="*.exe.config" verb="GET,HEAD" type="System.Web.StaticFileHandler" validate="True" />
<add path="*.config" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.cs" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.csproj" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.vb" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.vbproj" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.webinfo" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.licx" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.resx" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.resources" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.mdb" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.vjsproj" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.java" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.jsl" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ldb" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ad" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.dd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ldd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.cd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.adprototype" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.lddprototype" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sdm" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sdmDocument" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.mdf" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ldf" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.exclude" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.refresh" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<!--
<add path="*.svc" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
-->
<add verb="*" path="*.svc" type="System.ServiceModel.Channels.SvcHttpHandlerFactory, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add path="*.rules" verb="*" type="System.Web.HttpForbiddenHandler" validate="True"/>
<!--
<add path="*.xoml" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
<add path="*.xamlx" verb="*" type="System.Xaml.Hosting.XamlHttpHandlerFactory, System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
-->
<add path="*" verb="GET,HEAD,POST" type="System.Web.DefaultHttpHandler" validate="True" />
<add path="*" verb="*" type="System.Web.HttpMethodNotAllowedHandler" validate="True" />
</httpHandlers>
<httpModules>
<add name="OutputCache" type="System.Web.Caching.OutputCacheModule" />
<add name="Session" type="System.Web.SessionState.SessionStateModule" />
<!--
<add name="WindowsAuthentication" type="System.Web.Security.WindowsAuthenticationModule" />
-->
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
<!--
<add name="PassportAuthentication" type="System.Web.Security.PassportAuthenticationModule" />
-->
<add name="RoleManager" type="System.Web.Security.RoleManagerModule" />
<add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule" />
<!--
<add name="FileAuthorization" type="System.Web.Security.FileAuthorizationModule" />
-->
<add name="AnonymousIdentification" type="System.Web.Security.AnonymousIdentificationModule" />
<add name="Profile" type="System.Web.Profile.ProfileModule" />
<!--
<add name="ErrorHandlerModule" type="System.Web.Mobile.ErrorHandlerModule, System.Web.Mobile, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="ServiceModel" type="System.ServiceModel.Activation.HttpModule, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-->
<add name="UrlRoutingModule-4.0" type="System.Web.Routing.UrlRoutingModule" />
<add name="ScriptModule-4.0" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</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>
<controls>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls.WebParts" assembly="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls.Expressions" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.DynamicData" assembly="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</controls>
</pages>
<webControls clientScriptsLocation="/web_scripts" />
<compilation debug="false" defaultLanguage="c#" explicit="true" strict="false" >
<assemblies>
<add assembly="mscorlib" />
<add assembly="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<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.Web, 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.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Xml, 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.EnterpriseServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<!-- <add assembly="System.Web.Mobile, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -->
<add assembly="System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Xaml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<!-- <add assembly="System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.ServiceModel.Channels, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<add assembly="System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<!-- <add assembly="System.Activities, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.ServiceModel.Activities, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.WorkflowServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<!-- <add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> -->
<!-- <add assembly="System.Web.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/> -->
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<!-- <add assembly="System.Data.Entity.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> -->
<add assembly="System.Web.ApplicationServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<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" />
<add expressionPrefix="RouteUrl" type="System.Web.Compilation.RouteUrlExpressionBuilder"/>
<!--
<add expressionPrefix="RouteValue" type="System.Web.Compilation.RouteValueExpressionBuilder"/>
-->
</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" />
<!--
<add extension=".edmx" type="System.Data.Entity.Design.AspNet.EntityDesignerBuildProvider" />
<add extension=".xoml" type="System.ServiceModel.Activation.WorkflowServiceBuildProvider, System.WorkflowServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add extension=".svc" type="System.ServiceModel.Activation.ServiceBuildProvider, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add extension=".xamlx" type="System.Xaml.Hosting.XamlBuildProvider, System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-->
</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>
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-6
View File
@@ -1,6 +0,0 @@
monodir = $(sysconfdir)/mono/4.5/Browsers
EXTRA_DIST = ../../Browsers/Compat.browser
mono_DATA = ../../Browsers/Compat.browser
File diff suppressed because it is too large. Load diff
-13
View File
@@ -1,13 +0,0 @@
SUBDIRS = Browsers
monodir = $(sysconfdir)/mono/4.5
EXTRA_DIST = machine.config \
web.config \
DefaultWsdlHelpGenerator.aspx \
settings.map
mono_DATA = machine.config \
web.config \
DefaultWsdlHelpGenerator.aspx \
settings.map
-310
View File
@@ -1,310 +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.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="Everywhere"/>
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
</sectionGroup>
</sectionGroup>
</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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="behaviors" type="System.ServiceModel.Configuration.BehaviorsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="bindings" type="System.ServiceModel.Configuration.BindingsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="client" type="System.ServiceModel.Configuration.ClientSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="commonBehaviors" type="System.ServiceModel.Configuration.CommonBehaviorsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="diagnostics" type="System.ServiceModel.Configuration.DiagnosticSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="extensions" type="System.ServiceModel.Configuration.ExtensionsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="serviceHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="services" type="System.ServiceModel.Configuration.ServicesSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="standardEndpoints" type="System.ServiceModel.Configuration.StandardEndpointsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<section name="routing" type="System.ServiceModel.Routing.Configuration.RoutingSection, System.ServiceModel.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<section name="protocolMapping" type="System.ServiceModel.Configuration.ProtocolMappingSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
</sectionGroup>
<sectionGroup name="system.transactions" type="System.Transactions.Configuration.TransactionsSectionGroup, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null">
<section name="defaultSettings" type="System.Transactions.Configuration.DefaultSettingsSection, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null"/>
<section name="machineSettings" type="System.Transactions.Configuration.MachineSettingsSection, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null" allowDefinition="MachineOnly" allowExeDefinition="MachineOnly"/>
</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" />
<sectionGroup name="system.runtime.caching" type="System.Runtime.Caching.Configuration.CachingSectionGroup, System.Runtime.Caching, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<section name="memoryCache" type="System.Runtime.Caching.Configuration.MemoryCacheSection, System.Runtime.Caching, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
</sectionGroup>
</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" />
<cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
<nameEntry name="MD4" class="monoMD4" />
</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" />
<oidEntry OID="1.2.840.113549.2.4" name="MD4" />
<oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
</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" />
<!-- XNA Framework key -->
<map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
</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>
<endpointExtensions>
<add name="dynamicEndpoint" type="System.ServiceModel.Discovery.Configuration.DynamicEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="discoveryEndpoint" type="System.ServiceModel.Discovery.Configuration.DiscoveryEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="udpDiscoveryEndpoint" type="System.ServiceModel.Discovery.Configuration.UdpDiscoveryEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="announcementEndpoint" type="System.ServiceModel.Discovery.Configuration.AnnouncementEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="udpAnnouncementEndpoint" type="System.ServiceModel.Discovery.Configuration.UdpAnnouncementEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="webHttpEndpoint" type="System.ServiceModel.Configuration.WebHttpEndpointCollectionElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="webScriptEndpoint" type="System.ServiceModel.Configuration.WebScriptEndpointCollectionElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</endpointExtensions>
</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, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
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, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
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>
-253
View File
@@ -1,253 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="OptionInfer" value="true"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
</compilers>
</system.codedom>
<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 path="trace.axd" verb="*" type="System.Web.Handlers.TraceHandler" validate="True" />
<add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="True" />
<add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False" />
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
<add path="*.axd" verb="*" type="System.Web.HttpNotFoundHandler" validate="True" />
<add path="*.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" validate="True" />
<add path="*.ashx" verb="*" type="System.Web.UI.SimpleHandlerFactory" validate="True" />
<add path="*.asmx" verb="*" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False" />
<add path="*.rem" verb="*" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="False" />
<add path="*.soap" verb="*" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="False" />
<add path="*.asax" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ascx" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.master" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.skin" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.browser" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sitemap" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.dll.config" verb="GET,HEAD" type="System.Web.StaticFileHandler" validate="True" />
<add path="*.exe.config" verb="GET,HEAD" type="System.Web.StaticFileHandler" validate="True" />
<add path="*.config" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.cs" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.csproj" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.vb" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.vbproj" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.webinfo" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.licx" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.resx" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.resources" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.mdb" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.vjsproj" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.java" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.jsl" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ldb" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ad" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.dd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ldd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.cd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.adprototype" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.lddprototype" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sdm" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sdmDocument" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.mdf" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ldf" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.exclude" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.refresh" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<!--
<add path="*.svc" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
-->
<add verb="*" path="*.svc" type="System.ServiceModel.Channels.SvcHttpHandlerFactory, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add path="*.rules" verb="*" type="System.Web.HttpForbiddenHandler" validate="True"/>
<!--
<add path="*.xoml" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
<add path="*.xamlx" verb="*" type="System.Xaml.Hosting.XamlHttpHandlerFactory, System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
-->
<add path="*" verb="GET,HEAD,POST" type="System.Web.DefaultHttpHandler" validate="True" />
<add path="*" verb="*" type="System.Web.HttpMethodNotAllowedHandler" validate="True" />
</httpHandlers>
<httpModules>
<add name="OutputCache" type="System.Web.Caching.OutputCacheModule" />
<add name="Session" type="System.Web.SessionState.SessionStateModule" />
<!--
<add name="WindowsAuthentication" type="System.Web.Security.WindowsAuthenticationModule" />
-->
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
<!--
<add name="PassportAuthentication" type="System.Web.Security.PassportAuthenticationModule" />
-->
<add name="RoleManager" type="System.Web.Security.RoleManagerModule" />
<add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule" />
<!--
<add name="FileAuthorization" type="System.Web.Security.FileAuthorizationModule" />
-->
<add name="AnonymousIdentification" type="System.Web.Security.AnonymousIdentificationModule" />
<add name="Profile" type="System.Web.Profile.ProfileModule" />
<!--
<add name="ErrorHandlerModule" type="System.Web.Mobile.ErrorHandlerModule, System.Web.Mobile, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="ServiceModel" type="System.ServiceModel.Activation.HttpModule, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-->
<add name="UrlRoutingModule-4.0" type="System.Web.Routing.UrlRoutingModule" />
<add name="ScriptModule-4.0" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</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>
<controls>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls.WebParts" assembly="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls.Expressions" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.DynamicData" assembly="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</controls>
</pages>
<webControls clientScriptsLocation="/web_scripts" />
<compilation debug="false" defaultLanguage="c#" explicit="true" strict="false" >
<assemblies>
<!-- <add assembly="mscorlib" /> -->
<add assembly="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<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.Web, 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.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Xml, 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.EnterpriseServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<!-- <add assembly="System.Web.Mobile, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -->
<add assembly="System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Xaml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<!-- <add assembly="System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.ServiceModel.Channels, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<add assembly="System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<!-- <add assembly="System.Activities, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.ServiceModel.Activities, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.WorkflowServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<!-- <add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> -->
<!-- <add assembly="System.Web.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/> -->
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<!-- <add assembly="System.Data.Entity.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> -->
<add assembly="System.Web.ApplicationServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<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" />
<add expressionPrefix="RouteUrl" type="System.Web.Compilation.RouteUrlExpressionBuilder"/>
<!--
<add expressionPrefix="RouteValue" type="System.Web.Compilation.RouteValueExpressionBuilder"/>
-->
</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" />
<!--
<add extension=".edmx" type="System.Data.Entity.Design.AspNet.EntityDesignerBuildProvider" />
<add extension=".xoml" type="System.ServiceModel.Activation.WorkflowServiceBuildProvider, System.WorkflowServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add extension=".svc" type="System.ServiceModel.Activation.ServiceBuildProvider, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add extension=".xamlx" type="System.Xaml.Hosting.XamlBuildProvider, System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-->
</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>
-4
View File
@@ -1,4 +0,0 @@
Name: Reactive Extensions
Description: Reactive Extensions
Version: @VERSION@
Libs: -r:@prefix@/lib/mono/4.5/System.Reactive.Interfaces.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Core.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Linq.dll -r:@prefix@/lib/mono/4.5/System.Reactive.PlatformServices.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Providers.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Debugger.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Experimental.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Runtime.Remoting.dll
+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
@@ -1,4 +0,0 @@
Name: System.Web.Extensions.Design
Description: System.Web.Extensions.Design ASP.NET 2.0 add-on
Version: 1.0.61025.0
Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
-4
View File
@@ -1,4 +0,0 @@
Name: System.Web.Extensions
Description: System.Web.Extensions ASP.NET 2.0 add-on
Version: 1.0.61025.0
Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll
-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
-4
View File
@@ -1,4 +0,0 @@
Name: System.Web.Mvc2
Description: System.Web.Mvc - ASP.NET MVC v2
Version: 2.0.0.0
Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
-4
View File
@@ -1,4 +0,0 @@
Name: System.Web.Mvc3
Description: System.Web.Mvc - ASP.NET MVC v3
Version: 3.0.0.0
Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/3.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
-5
View File
@@ -1,5 +0,0 @@
Name: WCF
Description: References WCF for compilation
Version: @VERSION@
Libs: -r:System.Runtime.Serialization.dll -r:System.IdentityModel.dll -r:System.IdentityModel.Selectors.dll -r:System.ServiceModel.dll -r:System.ServiceModel.Web.dll
-7
View File
@@ -1,7 +0,0 @@
bindir=${pcfiledir}/../mono/xbuild/12.0/bin
Name: XBuild 12.0
Description: XBuild/MSBuild 12.0
Version: 12.0
Libs: -r:${bindir}/Microsoft.Build.Engine.dll -r:${bindir}/Microsoft.Build.Framework.dll -r:${bindir}/Microsoft.Build.Tasks.v12.0.dll -r:${bindir}/Microsoft.Build.Utilities.v12.0.dll -r:${bindir}/Microsoft.Build.dll
-11
View File
@@ -1,11 +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
/AgilityPack.dll*
-133
View File
@@ -1,133 +0,0 @@
2010-04-06 Andreia Gaita <[email protected]>
* Makefile.am: fix distcheck - several targets get built on the
srcdir, which has no write permissions on make distcheck, so make
sure permissions are set
2009-12-22 Jo Shields <[email protected]>
* HtmlAgilityPack/LICENSE: Include upstream license (Ms-PL) since the
file headers don't specify it
2009-12-22 Jo Shields <[email protected]>
* HtmlAgilityPack/*: Bundle HtmlAgilityPack 1.4~beta2 from
http://www.codeplex.com/htmlagilitypack in source form.
* AgilityPack.dll: Remove binary assembly, use source instead.
* docs.make Makefile.am README: Reflect above changes
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
mono-tools{.config,.source} (fixes the build).
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.
(deploy/.stamp): Compute location of 'mono-wrapper' and pass to exdoc.
* exdoc (mono-wrapper): Use $runtimedir to look for 'mono-wrapper'.
2008-10-31 Jonathan Pryor <[email protected]>
* check, Makefile.am (EXTRA_DIST): Rename to check-exports. This was
needed to fix `make distdir...`, because (1) with a file named
`check` which (2) was listed in $(EXTRA_DIST), while (3) `check` is
ALSO a .PHONY target, this caused make to look for the `check` file,
not find it due to (3), and then proceed to try to build convert.exe
from convert.cs...for reasons I don't care about. This obviously
can't work during `make distdir`, as mcs hasn't been built yet, thus
leading to pain, suffering, and a broken build.
2008-10-30 Jonathan Pryor <[email protected]>
* . (svn:ignore), deploy (svn:ignore): Ignore generated files.
* AgilityPack.dll, api-style.css, ChangeLog, check, check-coverage,
convert.cs, current-api, deploy, documented, exdoc, ignore,
mono-api-metadata.html, monoapi.source, produce-lists, public,
public-api, README, sources, toc.xml, TODO, wapi: Copy from
../mono/docscripts.
* exdoc: Use the in-tree mono program to run convert.exe.
* Makefile.am: Mention files to clean/distribute; extract
documentation (with exdoc) and then assemble documentation (with
monoapi.make's assemble target) for use by monodoc.
* monoapi.make: Added; Makefile to use mcs' buid/rules.make to compile
convert.cs and assemble documentation. (This is a separate file so
that we can include mcs' build/rules.make, which needs topdir set to
behave properly BUT must be $(mcs_topdir) from Makefile.am's
perspective.)
* monoapi.source: Add a /monodoc/node element for use with monodoc 2.2.
2006-11-19 Miguel de Icaza <[email protected]>
* exdoc: Move to use CSS instead of tables, this will break
GtkHTML rendering.
* ignore: Updated with more hidden APIs.
* Bunch of documentation work.
-30
View File
@@ -1,30 +0,0 @@
/EncodingFoundException.cs -crlf
/HtmlAttribute.cs -crlf
/HtmlAttributeCollection.cs -crlf
/HtmlCmdLine.cs -crlf
/HtmlCommentNode.cs -crlf
/HtmlConsoleListener.cs -crlf
/HtmlDocument.cs -crlf
/HtmlElementFlag.cs -crlf
/HtmlEntity.cs -crlf
/HtmlNameTable.cs -crlf
/HtmlNode.cs -crlf
/HtmlNodeCollection.cs -crlf
/HtmlNodeNavigator.cs -crlf
/HtmlNodeType.cs -crlf
/HtmlParseError.cs -crlf
/HtmlParseErrorCode.cs -crlf
/HtmlTextNode.cs -crlf
/HtmlWeb.cs -crlf
/HtmlWebException.cs -crlf
/IOLibrary.cs -crlf
/LICENSE -crlf
/MixedCodeDocument.cs -crlf
/MixedCodeDocumentCodeFragment.cs -crlf
/MixedCodeDocumentFragment.cs -crlf
/MixedCodeDocumentFragmentList.cs -crlf
/MixedCodeDocumentFragmentType.cs -crlf
/MixedCodeDocumentTextFragment.cs -crlf
/NameValuePair.cs -crlf
/NameValuePairList.cs -crlf
/crc32.cs -crlf
@@ -1,33 +0,0 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Text;
namespace HtmlAgilityPack
{
internal class EncodingFoundException : Exception
{
#region Fields
private Encoding _encoding;
#endregion
#region Constructors
internal EncodingFoundException(Encoding encoding)
{
_encoding = encoding;
}
#endregion
#region Properties
internal Encoding Encoding
{
get { return _encoding; }
}
#endregion
}
}
-260
View File
@@ -1,260 +0,0 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
#region
using System;
using System.Diagnostics;
#endregion
namespace HtmlAgilityPack
{
/// <summary>
/// Represents an HTML attribute.
/// </summary>
[DebuggerDisplay("Name: {OriginalName}, Value: {Value}")]
public class HtmlAttribute : IComparable
{
#region Fields
private int _line;
internal int _lineposition;
internal string _name;
internal int _namelength;
internal int _namestartindex;
internal HtmlDocument _ownerdocument; // attribute can exists without a node
internal HtmlNode _ownernode;
private AttributeValueQuote _quoteType = AttributeValueQuote.DoubleQuote;
internal int _streamposition;
internal string _value;
internal int _valuelength;
internal int _valuestartindex;
#endregion
#region Constructors
internal HtmlAttribute(HtmlDocument ownerdocument)
{
_ownerdocument = ownerdocument;
}
#endregion
#region Properties
/// <summary>
/// Gets the line number of this attribute in the document.
/// </summary>
public int Line
{
get { return _line; }
internal set { _line = value; }
}
/// <summary>
/// Gets the column number of this attribute in the document.
/// </summary>
public int LinePosition
{
get { return _lineposition; }
}
/// <summary>
/// Gets the qualified name of the attribute.
/// </summary>
public string Name
{
get
{
if (_name == null)
{
_name = _ownerdocument._text.Substring(_namestartindex, _namelength);
}
return _name.ToLower();
}
set
{
if (value == null)
{
throw new ArgumentNullException("value");
}
_name = value;
if (_ownernode != null)
{
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
}
}
/// <summary>
/// Name of attribute with original case
/// </summary>
public string OriginalName
{
get { return _name; }
}
/// <summary>
/// Gets the HTML document to which this attribute belongs.
/// </summary>
public HtmlDocument OwnerDocument
{
get { return _ownerdocument; }
}
/// <summary>
/// Gets the HTML node to which this attribute belongs.
/// </summary>
public HtmlNode OwnerNode
{
get { return _ownernode; }
}
/// <summary>
/// Specifies what type of quote the data should be wrapped in
/// </summary>
public AttributeValueQuote QuoteType
{
get { return _quoteType; }
set { _quoteType = value; }
}
/// <summary>
/// Gets the stream position of this attribute in the document, relative to the start of the document.
/// </summary>
public int StreamPosition
{
get { return _streamposition; }
}
/// <summary>
/// Gets or sets the value of the attribute.
/// </summary>
public string Value
{
get
{
if (_value == null)
{
_value = _ownerdocument._text.Substring(_valuestartindex, _valuelength);
}
return _value;
}
set
{
_value = value;
if (_ownernode != null)
{
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
}
}
internal string XmlName
{
get { return HtmlDocument.GetXmlName(Name); }
}
internal string XmlValue
{
get { return Value; }
}
/// <summary>
/// Gets a valid XPath string that points to this Attribute
/// </summary>
public string XPath
{
get
{
string basePath = (OwnerNode == null) ? "/" : OwnerNode.XPath + "/";
return basePath + GetRelativeXpath();
}
}
#endregion
#region IComparable Members
/// <summary>
/// Compares the current instance with another attribute. Comparison is based on attributes' name.
/// </summary>
/// <param name="obj">An attribute to compare with this instance.</param>
/// <returns>A 32-bit signed integer that indicates the relative order of the names comparison.</returns>
public int CompareTo(object obj)
{
HtmlAttribute att = obj as HtmlAttribute;
if (att == null)
{
throw new ArgumentException("obj");
}
return Name.CompareTo(att.Name);
}
#endregion
#region Public Methods
/// <summary>
/// Creates a duplicate of this attribute.
/// </summary>
/// <returns>The cloned attribute.</returns>
public HtmlAttribute Clone()
{
HtmlAttribute att = new HtmlAttribute(_ownerdocument);
att.Name = Name;
att.Value = Value;
return att;
}
/// <summary>
/// Removes this attribute from it's parents collection
/// </summary>
public void Remove()
{
_ownernode.Attributes.Remove(this);
}
#endregion
#region Private Methods
private string GetRelativeXpath()
{
if (OwnerNode == null)
return Name;
int i = 1;
foreach (HtmlAttribute node in OwnerNode.Attributes)
{
if (node.Name != Name) continue;
if (node == this)
break;
i++;
}
return "@" + Name + "[" + i + "]";
}
#endregion
}
/// <summary>
/// An Enum representing different types of Quotes used for surrounding attribute values
/// </summary>
public enum AttributeValueQuote
{
/// <summary>
/// A single quote mark '
/// </summary>
SingleQuote,
/// <summary>
/// A double quote mark "
/// </summary>
DoubleQuote
}
}
@@ -1,394 +0,0 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Collections;
using System.Collections.Generic;
namespace HtmlAgilityPack
{
/// <summary>
/// Represents a combined list and collection of HTML nodes.
/// </summary>
public class HtmlAttributeCollection : IList<HtmlAttribute>
{
#region Fields
internal Dictionary<string, HtmlAttribute> Hashitems = new Dictionary<string, HtmlAttribute>();
private HtmlNode _ownernode;
private List<HtmlAttribute> items = new List<HtmlAttribute>();
#endregion
#region Constructors
internal HtmlAttributeCollection(HtmlNode ownernode)
{
_ownernode = ownernode;
}
#endregion
#region Properties
/// <summary>
/// Gets a given attribute from the list using its name.
/// </summary>
public HtmlAttribute this[string name]
{
get
{
if (name == null)
{
throw new ArgumentNullException("name");
}
return Hashitems.ContainsKey(name.ToLower()) ? Hashitems[name.ToLower()] : null;
}
set { Append(value); }
}
#endregion
#region IList<HtmlAttribute> Members
/// <summary>
/// Gets the number of elements actually contained in the list.
/// </summary>
public int Count
{
get { return items.Count; }
}
/// <summary>
/// Gets readonly status of colelction
/// </summary>
public bool IsReadOnly
{
get { return false; }
}
/// <summary>
/// Gets the attribute at the specified index.
/// </summary>
public HtmlAttribute this[int index]
{
get { return items[index]; }
set { items[index] = value; }
}
/// <summary>
/// Adds supplied item to collection
/// </summary>
/// <param name="item"></param>
public void Add(HtmlAttribute item)
{
Append(item);
}
/// <summary>
/// Explicit clear
/// </summary>
void ICollection<HtmlAttribute>.Clear()
{
items.Clear();
}
/// <summary>
/// Retreives existence of supplied item
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public bool Contains(HtmlAttribute item)
{
return items.Contains(item);
}
/// <summary>
/// Copies collection to array
/// </summary>
/// <param name="array"></param>
/// <param name="arrayIndex"></param>
public void CopyTo(HtmlAttribute[] array, int arrayIndex)
{
items.CopyTo(array, arrayIndex);
}
/// <summary>
/// Get Explicit enumerator
/// </summary>
/// <returns></returns>
IEnumerator<HtmlAttribute> IEnumerable<HtmlAttribute>.GetEnumerator()
{
return items.GetEnumerator();
}
/// <summary>
/// Explicit non-generic enumerator
/// </summary>
/// <returns></returns>
IEnumerator IEnumerable.GetEnumerator()
{
return items.GetEnumerator();
}
/// <summary>
/// Retrieves the index for the supplied item, -1 if not found
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public int IndexOf(HtmlAttribute item)
{
return items.IndexOf(item);
}
/// <summary>
/// Inserts given item into collection at supplied index
/// </summary>
/// <param name="index"></param>
/// <param name="item"></param>
public void Insert(int index, HtmlAttribute item)
{
if (item == null)
{
throw new ArgumentNullException("item");
}
Hashitems[item.Name] = item;
item._ownernode = _ownernode;
items.Insert(index, item);
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
/// <summary>
/// Explicit collection remove
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
bool ICollection<HtmlAttribute>.Remove(HtmlAttribute item)
{
return items.Remove(item);
}
/// <summary>
/// Removes the attribute at the specified index.
/// </summary>
/// <param name="index">The index of the attribute to remove.</param>
public void RemoveAt(int index)
{
HtmlAttribute att = items[index];
Hashitems.Remove(att.Name);
items.RemoveAt(index);
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
#endregion
#region Public Methods
/// <summary>
/// Adds a new attribute to the collection with the given values
/// </summary>
/// <param name="name"></param>
/// <param name="value"></param>
public void Add(string name, string value)
{
Append(name, value);
}
/// <summary>
/// Inserts the specified attribute as the last attribute in the collection.
/// </summary>
/// <param name="newAttribute">The attribute to insert. May not be null.</param>
/// <returns>The appended attribute.</returns>
public HtmlAttribute Append(HtmlAttribute newAttribute)
{
if (newAttribute == null)
{
throw new ArgumentNullException("newAttribute");
}
Hashitems[newAttribute.Name] = newAttribute;
newAttribute._ownernode = _ownernode;
items.Add(newAttribute);
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
return newAttribute;
}
/// <summary>
/// Creates and inserts a new attribute as the last attribute in the collection.
/// </summary>
/// <param name="name">The name of the attribute to insert.</param>
/// <returns>The appended attribute.</returns>
public HtmlAttribute Append(string name)
{
HtmlAttribute att = _ownernode._ownerdocument.CreateAttribute(name);
return Append(att);
}
/// <summary>
/// Creates and inserts a new attribute as the last attribute in the collection.
/// </summary>
/// <param name="name">The name of the attribute to insert.</param>
/// <param name="value">The value of the attribute to insert.</param>
/// <returns>The appended attribute.</returns>
public HtmlAttribute Append(string name, string value)
{
HtmlAttribute att = _ownernode._ownerdocument.CreateAttribute(name, value);
return Append(att);
}
/// <summary>
/// Checks for existance of attribute with given name
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public bool Contains(string name)
{
for (int i = 0; i < items.Count; i++)
{
if (items[i].Name.Equals(name.ToLower()))
return true;
}
return false;
}
/// <summary>
/// Inserts the specified attribute as the first node in the collection.
/// </summary>
/// <param name="newAttribute">The attribute to insert. May not be null.</param>
/// <returns>The prepended attribute.</returns>
public HtmlAttribute Prepend(HtmlAttribute newAttribute)
{
Insert(0, newAttribute);
return newAttribute;
}
/// <summary>
/// Removes a given attribute from the list.
/// </summary>
/// <param name="attribute">The attribute to remove. May not be null.</param>
public void Remove(HtmlAttribute attribute)
{
if (attribute == null)
{
throw new ArgumentNullException("attribute");
}
int index = GetAttributeIndex(attribute);
if (index == -1)
{
throw new IndexOutOfRangeException();
}
RemoveAt(index);
}
/// <summary>
/// Removes an attribute from the list, using its name. If there are more than one attributes with this name, they will all be removed.
/// </summary>
/// <param name="name">The attribute's name. May not be null.</param>
public void Remove(string name)
{
if (name == null)
{
throw new ArgumentNullException("name");
}
string lname = name.ToLower();
for (int i = 0; i < items.Count; i++)
{
HtmlAttribute att = items[i];
if (att.Name == lname)
{
RemoveAt(i);
}
}
}
/// <summary>
/// Remove all attributes in the list.
/// </summary>
public void RemoveAll()
{
Hashitems.Clear();
items.Clear();
_ownernode._innerchanged = true;
_ownernode._outerchanged = true;
}
#endregion
#region LINQ Methods
/// <summary>
/// Returns all attributes with specified name. Handles case insentivity
/// </summary>
/// <param name="attributeName">Name of the attribute</param>
/// <returns></returns>
public IEnumerable<HtmlAttribute> AttributesWithName(string attributeName)
{
attributeName = attributeName.ToLower();
for (int i = 0; i < items.Count; i++)
{
if (items[i].Name.Equals(attributeName))
yield return items[i];
}
}
/// <summary>
/// Removes all attributes from the collection
/// </summary>
public void Remove()
{
foreach (HtmlAttribute item in items)
item.Remove();
}
#endregion
#region Internal Methods
/// <summary>
/// Clears the attribute collection
/// </summary>
internal void Clear()
{
Hashitems.Clear();
items.Clear();
}
internal int GetAttributeIndex(HtmlAttribute attribute)
{
if (attribute == null)
{
throw new ArgumentNullException("attribute");
}
for (int i = 0; i < items.Count; i++)
{
if ((items[i]) == attribute)
return i;
}
return -1;
}
internal int GetAttributeIndex(string name)
{
if (name == null)
{
throw new ArgumentNullException("name");
}
string lname = name.ToLower();
for (int i = 0; i < items.Count; i++)
{
if ((items[i]).Name == lname)
return i;
}
return -1;
}
#endregion
}
}
-142
View File
@@ -1,142 +0,0 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
namespace HtmlAgilityPack
{
internal class HtmlCmdLine
{
#region Static Members
internal static bool Help;
#endregion
#region Constructors
static HtmlCmdLine()
{
Help = false;
ParseArgs();
}
#endregion
#region Internal Methods
internal static string GetOption(string name, string def)
{
string p = def;
string[] args = Environment.GetCommandLineArgs();
for (int i = 1; i < args.Length; i++)
{
GetStringArg(args[i], name, ref p);
}
return p;
}
internal static string GetOption(int index, string def)
{
string p = def;
string[] args = Environment.GetCommandLineArgs();
int j = 0;
for (int i = 1; i < args.Length; i++)
{
if (GetStringArg(args[i], ref p))
{
if (index == j)
return p;
else
p = def;
j++;
}
}
return p;
}
internal static bool GetOption(string name, bool def)
{
bool p = def;
string[] args = Environment.GetCommandLineArgs();
for (int i = 1; i < args.Length; i++)
{
GetBoolArg(args[i], name, ref p);
}
return p;
}
internal static int GetOption(string name, int def)
{
int p = def;
string[] args = Environment.GetCommandLineArgs();
for (int i = 1; i < args.Length; i++)
{
GetIntArg(args[i], name, ref p);
}
return p;
}
#endregion
#region Private Methods
private static void GetBoolArg(string Arg, string Name, ref bool ArgValue)
{
if (Arg.Length < (Name.Length + 1)) // -name is 1 more than name
return;
if (('/' != Arg[0]) && ('-' != Arg[0])) // not a param
return;
if (Arg.Substring(1, Name.Length).ToLower() == Name.ToLower())
ArgValue = true;
}
private static void GetIntArg(string Arg, string Name, ref int ArgValue)
{
if (Arg.Length < (Name.Length + 3)) // -name:12 is 3 more than name
return;
if (('/' != Arg[0]) && ('-' != Arg[0])) // not a param
return;
if (Arg.Substring(1, Name.Length).ToLower() == Name.ToLower())
{
try
{
ArgValue = Convert.ToInt32(Arg.Substring(Name.Length + 2, Arg.Length - Name.Length - 2));
}
catch
{
}
}
}
private static bool GetStringArg(string Arg, ref string ArgValue)
{
if (('/' == Arg[0]) || ('-' == Arg[0]))
return false;
ArgValue = Arg;
return true;
}
private static void GetStringArg(string Arg, string Name, ref string ArgValue)
{
if (Arg.Length < (Name.Length + 3)) // -name:x is 3 more than name
return;
if (('/' != Arg[0]) && ('-' != Arg[0])) // not a param
return;
if (Arg.Substring(1, Name.Length).ToLower() == Name.ToLower())
ArgValue = Arg.Substring(Name.Length + 2, Arg.Length - Name.Length - 2);
}
private static void ParseArgs()
{
string[] args = Environment.GetCommandLineArgs();
for (int i = 1; i < args.Length; i++)
{
// help
GetBoolArg(args[i], "?", ref Help);
GetBoolArg(args[i], "h", ref Help);
GetBoolArg(args[i], "help", ref Help);
}
}
#endregion
}
}
-76
View File
@@ -1,76 +0,0 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
namespace HtmlAgilityPack
{
/// <summary>
/// Represents an HTML comment.
/// </summary>
public class HtmlCommentNode : HtmlNode
{
#region Fields
private string _comment;
#endregion
#region Constructors
internal HtmlCommentNode(HtmlDocument ownerdocument, int index)
:
base(HtmlNodeType.Comment, ownerdocument, index)
{
}
#endregion
#region Properties
/// <summary>
/// Gets or Sets the comment text of the node.
/// </summary>
public string Comment
{
get
{
if (_comment == null)
{
return base.InnerHtml;
}
return _comment;
}
set { _comment = value; }
}
/// <summary>
/// Gets or Sets the HTML between the start and end tags of the object. In the case of a text node, it is equals to OuterHtml.
/// </summary>
public override string InnerHtml
{
get
{
if (_comment == null)
{
return base.InnerHtml;
}
return _comment;
}
set { _comment = value; }
}
/// <summary>
/// Gets or Sets the object and its content in HTML.
/// </summary>
public override string OuterHtml
{
get
{
if (_comment == null)
{
return base.OuterHtml;
}
return "<!--" + _comment + "-->";
}
}
#endregion
}
}
@@ -1,33 +0,0 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Diagnostics;
namespace HtmlAgilityPack
{
internal class HtmlConsoleListener : TraceListener
{
#region Public Methods
public override void Write(string Message)
{
Write(Message, "");
}
public override void Write(string Message, string Category)
{
Console.Write("T:" + Category + ": " + Message);
}
public override void WriteLine(string Message)
{
Write(Message + "\n");
}
public override void WriteLine(string Message, string Category)
{
Write(Message + "\n", Category);
}
#endregion
}
}
File diff suppressed because it is too large. Load diff
-32
View File
@@ -1,32 +0,0 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
namespace HtmlAgilityPack
{
/// <summary>
/// Flags that describe the behavior of an Element node.
/// </summary>
[Flags]
public enum HtmlElementFlag
{
/// <summary>
/// The node is a CDATA node.
/// </summary>
CData = 1,
/// <summary>
/// The node is empty. META or IMG are example of such nodes.
/// </summary>
Empty = 2,
/// <summary>
/// The node will automatically be closed during parsing.
/// </summary>
Closed = 4,
/// <summary>
/// The node can overlap.
/// </summary>
CanOverlap = 8
}
}
-826
View File
@@ -1,826 +0,0 @@
// HtmlAgilityPack V1.0 - Simon Mourier <simon underscore mourier at hotmail dot com>
using System;
using System.Collections;
using System.Text;
namespace HtmlAgilityPack
{
/// <summary>
/// A utility class to replace special characters by entities and vice-versa.
/// Follows HTML 4.0 specification found at http://www.w3.org/TR/html4/sgml/entities.html
/// </summary>
public class HtmlEntity
{
#region Static Members
private static readonly int _maxEntitySize;
private static Hashtable _entityName;
private static Hashtable _entityValue;
/// <summary>
/// A collection of entities indexed by name.
/// </summary>
public static Hashtable EntityName
{
get { return _entityName; }
}
/// <summary>
/// A collection of entities indexed by value.
/// </summary>
public static Hashtable EntityValue
{
get { return _entityValue; }
}
#endregion
#region Constructors
static HtmlEntity()
{
_entityName = new Hashtable();
_entityValue = new Hashtable();
#region Entities Definition
_entityValue.Add("nbsp", 160); // no-break space = non-breaking space, U+00A0 ISOnum
_entityName.Add(160, "nbsp");
_entityValue.Add("iexcl", 161); // inverted exclamation mark, U+00A1 ISOnum
_entityName.Add(161, "iexcl");
_entityValue.Add("cent", 162); // cent sign, U+00A2 ISOnum
_entityName.Add(162, "cent");
_entityValue.Add("pound", 163); // pound sign, U+00A3 ISOnum
_entityName.Add(163, "pound");
_entityValue.Add("curren", 164); // currency sign, U+00A4 ISOnum
_entityName.Add(164, "curren");
_entityValue.Add("yen", 165); // yen sign = yuan sign, U+00A5 ISOnum
_entityName.Add(165, "yen");
_entityValue.Add("brvbar", 166); // broken bar = broken vertical bar, U+00A6 ISOnum
_entityName.Add(166, "brvbar");
_entityValue.Add("sect", 167); // section sign, U+00A7 ISOnum
_entityName.Add(167, "sect");
_entityValue.Add("uml", 168); // diaeresis = spacing diaeresis, U+00A8 ISOdia
_entityName.Add(168, "uml");
_entityValue.Add("copy", 169); // copyright sign, U+00A9 ISOnum
_entityName.Add(169, "copy");
_entityValue.Add("ordf", 170); // feminine ordinal indicator, U+00AA ISOnum
_entityName.Add(170, "ordf");
_entityValue.Add("laquo", 171);
// left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum
_entityName.Add(171, "laquo");
_entityValue.Add("not", 172); // not sign, U+00AC ISOnum
_entityName.Add(172, "not");
_entityValue.Add("shy", 173); // soft hyphen = discretionary hyphen, U+00AD ISOnum
_entityName.Add(173, "shy");
_entityValue.Add("reg", 174); // registered sign = registered trade mark sign, U+00AE ISOnum
_entityName.Add(174, "reg");
_entityValue.Add("macr", 175); // macron = spacing macron = overline = APL overbar, U+00AF ISOdia
_entityName.Add(175, "macr");
_entityValue.Add("deg", 176); // degree sign, U+00B0 ISOnum
_entityName.Add(176, "deg");
_entityValue.Add("plusmn", 177); // plus-minus sign = plus-or-minus sign, U+00B1 ISOnum
_entityName.Add(177, "plusmn");
_entityValue.Add("sup2", 178); // superscript two = superscript digit two = squared, U+00B2 ISOnum
_entityName.Add(178, "sup2");
_entityValue.Add("sup3", 179); // superscript three = superscript digit three = cubed, U+00B3 ISOnum
_entityName.Add(179, "sup3");
_entityValue.Add("acute", 180); // acute accent = spacing acute, U+00B4 ISOdia
_entityName.Add(180, "acute");
_entityValue.Add("micro", 181); // micro sign, U+00B5 ISOnum
_entityName.Add(181, "micro");
_entityValue.Add("para", 182); // pilcrow sign = paragraph sign, U+00B6 ISOnum
_entityName.Add(182, "para");
_entityValue.Add("middot", 183); // middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum
_entityName.Add(183, "middot");
_entityValue.Add("cedil", 184); // cedilla = spacing cedilla, U+00B8 ISOdia
_entityName.Add(184, "cedil");
_entityValue.Add("sup1", 185); // superscript one = superscript digit one, U+00B9 ISOnum
_entityName.Add(185, "sup1");
_entityValue.Add("ordm", 186); // masculine ordinal indicator, U+00BA ISOnum
_entityName.Add(186, "ordm");
_entityValue.Add("raquo", 187);
// right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum
_entityName.Add(187, "raquo");
_entityValue.Add("frac14", 188); // vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum
_entityName.Add(188, "frac14");
_entityValue.Add("frac12", 189); // vulgar fraction one half = fraction one half, U+00BD ISOnum
_entityName.Add(189, "frac12");
_entityValue.Add("frac34", 190); // vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum
_entityName.Add(190, "frac34");
_entityValue.Add("iquest", 191); // inverted question mark = turned question mark, U+00BF ISOnum
_entityName.Add(191, "iquest");
_entityValue.Add("Agrave", 192);
// latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1
_entityName.Add(192, "Agrave");
_entityValue.Add("Aacute", 193); // latin capital letter A with acute, U+00C1 ISOlat1
_entityName.Add(193, "Aacute");
_entityValue.Add("Acirc", 194); // latin capital letter A with circumflex, U+00C2 ISOlat1
_entityName.Add(194, "Acirc");
_entityValue.Add("Atilde", 195); // latin capital letter A with tilde, U+00C3 ISOlat1
_entityName.Add(195, "Atilde");
_entityValue.Add("Auml", 196); // latin capital letter A with diaeresis, U+00C4 ISOlat1
_entityName.Add(196, "Auml");
_entityValue.Add("Aring", 197);
// latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1
_entityName.Add(197, "Aring");
_entityValue.Add("AElig", 198); // latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
_entityName.Add(198, "AElig");
_entityValue.Add("Ccedil", 199); // latin capital letter C with cedilla, U+00C7 ISOlat1
_entityName.Add(199, "Ccedil");
_entityValue.Add("Egrave", 200); // latin capital letter E with grave, U+00C8 ISOlat1
_entityName.Add(200, "Egrave");
_entityValue.Add("Eacute", 201); // latin capital letter E with acute, U+00C9 ISOlat1
_entityName.Add(201, "Eacute");
_entityValue.Add("Ecirc", 202); // latin capital letter E with circumflex, U+00CA ISOlat1
_entityName.Add(202, "Ecirc");
_entityValue.Add("Euml", 203); // latin capital letter E with diaeresis, U+00CB ISOlat1
_entityName.Add(203, "Euml");
_entityValue.Add("Igrave", 204); // latin capital letter I with grave, U+00CC ISOlat1
_entityName.Add(204, "Igrave");
_entityValue.Add("Iacute", 205); // latin capital letter I with acute, U+00CD ISOlat1
_entityName.Add(205, "Iacute");
_entityValue.Add("Icirc", 206); // latin capital letter I with circumflex, U+00CE ISOlat1
_entityName.Add(206, "Icirc");
_entityValue.Add("Iuml", 207); // latin capital letter I with diaeresis, U+00CF ISOlat1
_entityName.Add(207, "Iuml");
_entityValue.Add("ETH", 208); // latin capital letter ETH, U+00D0 ISOlat1
_entityName.Add(208, "ETH");
_entityValue.Add("Ntilde", 209); // latin capital letter N with tilde, U+00D1 ISOlat1
_entityName.Add(209, "Ntilde");
_entityValue.Add("Ograve", 210); // latin capital letter O with grave, U+00D2 ISOlat1
_entityName.Add(210, "Ograve");
_entityValue.Add("Oacute", 211); // latin capital letter O with acute, U+00D3 ISOlat1
_entityName.Add(211, "Oacute");
_entityValue.Add("Ocirc", 212); // latin capital letter O with circumflex, U+00D4 ISOlat1
_entityName.Add(212, "Ocirc");
_entityValue.Add("Otilde", 213); // latin capital letter O with tilde, U+00D5 ISOlat1
_entityName.Add(213, "Otilde");
_entityValue.Add("Ouml", 214); // latin capital letter O with diaeresis, U+00D6 ISOlat1
_entityName.Add(214, "Ouml");
_entityValue.Add("times", 215); // multiplication sign, U+00D7 ISOnum
_entityName.Add(215, "times");
_entityValue.Add("Oslash", 216);
// latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1
_entityName.Add(216, "Oslash");
_entityValue.Add("Ugrave", 217); // latin capital letter U with grave, U+00D9 ISOlat1
_entityName.Add(217, "Ugrave");
_entityValue.Add("Uacute", 218); // latin capital letter U with acute, U+00DA ISOlat1
_entityName.Add(218, "Uacute");
_entityValue.Add("Ucirc", 219); // latin capital letter U with circumflex, U+00DB ISOlat1
_entityName.Add(219, "Ucirc");
_entityValue.Add("Uuml", 220); // latin capital letter U with diaeresis, U+00DC ISOlat1
_entityName.Add(220, "Uuml");
_entityValue.Add("Yacute", 221); // latin capital letter Y with acute, U+00DD ISOlat1
_entityName.Add(221, "Yacute");
_entityValue.Add("THORN", 222); // latin capital letter THORN, U+00DE ISOlat1
_entityName.Add(222, "THORN");
_entityValue.Add("szlig", 223); // latin small letter sharp s = ess-zed, U+00DF ISOlat1
_entityName.Add(223, "szlig");
_entityValue.Add("agrave", 224);
// latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1
_entityName.Add(224, "agrave");
_entityValue.Add("aacute", 225); // latin small letter a with acute, U+00E1 ISOlat1
_entityName.Add(225, "aacute");
_entityValue.Add("acirc", 226); // latin small letter a with circumflex, U+00E2 ISOlat1
_entityName.Add(226, "acirc");
_entityValue.Add("atilde", 227); // latin small letter a with tilde, U+00E3 ISOlat1
_entityName.Add(227, "atilde");
_entityValue.Add("auml", 228); // latin small letter a with diaeresis, U+00E4 ISOlat1
_entityName.Add(228, "auml");
_entityValue.Add("aring", 229);
// latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1
_entityName.Add(229, "aring");
_entityValue.Add("aelig", 230); // latin small letter ae = latin small ligature ae, U+00E6 ISOlat1
_entityName.Add(230, "aelig");
_entityValue.Add("ccedil", 231); // latin small letter c with cedilla, U+00E7 ISOlat1
_entityName.Add(231, "ccedil");
_entityValue.Add("egrave", 232); // latin small letter e with grave, U+00E8 ISOlat1
_entityName.Add(232, "egrave");
_entityValue.Add("eacute", 233); // latin small letter e with acute, U+00E9 ISOlat1
_entityName.Add(233, "eacute");
_entityValue.Add("ecirc", 234); // latin small letter e with circumflex, U+00EA ISOlat1
_entityName.Add(234, "ecirc");
_entityValue.Add("euml", 235); // latin small letter e with diaeresis, U+00EB ISOlat1
_entityName.Add(235, "euml");
_entityValue.Add("igrave", 236); // latin small letter i with grave, U+00EC ISOlat1
_entityName.Add(236, "igrave");
_entityValue.Add("iacute", 237); // latin small letter i with acute, U+00ED ISOlat1
_entityName.Add(237, "iacute");
_entityValue.Add("icirc", 238); // latin small letter i with circumflex, U+00EE ISOlat1
_entityName.Add(238, "icirc");
_entityValue.Add("iuml", 239); // latin small letter i with diaeresis, U+00EF ISOlat1
_entityName.Add(239, "iuml");
_entityValue.Add("eth", 240); // latin small letter eth, U+00F0 ISOlat1
_entityName.Add(240, "eth");
_entityValue.Add("ntilde", 241); // latin small letter n with tilde, U+00F1 ISOlat1
_entityName.Add(241, "ntilde");
_entityValue.Add("ograve", 242); // latin small letter o with grave, U+00F2 ISOlat1
_entityName.Add(242, "ograve");
_entityValue.Add("oacute", 243); // latin small letter o with acute, U+00F3 ISOlat1
_entityName.Add(243, "oacute");
_entityValue.Add("ocirc", 244); // latin small letter o with circumflex, U+00F4 ISOlat1
_entityName.Add(244, "ocirc");
_entityValue.Add("otilde", 245); // latin small letter o with tilde, U+00F5 ISOlat1
_entityName.Add(245, "otilde");
_entityValue.Add("ouml", 246); // latin small letter o with diaeresis, U+00F6 ISOlat1
_entityName.Add(246, "ouml");
_entityValue.Add("divide", 247); // division sign, U+00F7 ISOnum
_entityName.Add(247, "divide");
_entityValue.Add("oslash", 248);
// latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1
_entityName.Add(248, "oslash");
_entityValue.Add("ugrave", 249); // latin small letter u with grave, U+00F9 ISOlat1
_entityName.Add(249, "ugrave");
_entityValue.Add("uacute", 250); // latin small letter u with acute, U+00FA ISOlat1
_entityName.Add(250, "uacute");
_entityValue.Add("ucirc", 251); // latin small letter u with circumflex, U+00FB ISOlat1
_entityName.Add(251, "ucirc");
_entityValue.Add("uuml", 252); // latin small letter u with diaeresis, U+00FC ISOlat1
_entityName.Add(252, "uuml");
_entityValue.Add("yacute", 253); // latin small letter y with acute, U+00FD ISOlat1
_entityName.Add(253, "yacute");
_entityValue.Add("thorn", 254); // latin small letter thorn, U+00FE ISOlat1
_entityName.Add(254, "thorn");
_entityValue.Add("yuml", 255); // latin small letter y with diaeresis, U+00FF ISOlat1
_entityName.Add(255, "yuml");
_entityValue.Add("fnof", 402); // latin small f with hook = function = florin, U+0192 ISOtech
_entityName.Add(402, "fnof");
_entityValue.Add("Alpha", 913); // greek capital letter alpha, U+0391
_entityName.Add(913, "Alpha");
_entityValue.Add("Beta", 914); // greek capital letter beta, U+0392
_entityName.Add(914, "Beta");
_entityValue.Add("Gamma", 915); // greek capital letter gamma, U+0393 ISOgrk3
_entityName.Add(915, "Gamma");
_entityValue.Add("Delta", 916); // greek capital letter delta, U+0394 ISOgrk3
_entityName.Add(916, "Delta");
_entityValue.Add("Epsilon", 917); // greek capital letter epsilon, U+0395
_entityName.Add(917, "Epsilon");
_entityValue.Add("Zeta", 918); // greek capital letter zeta, U+0396
_entityName.Add(918, "Zeta");
_entityValue.Add("Eta", 919); // greek capital letter eta, U+0397
_entityName.Add(919, "Eta");
_entityValue.Add("Theta", 920); // greek capital letter theta, U+0398 ISOgrk3
_entityName.Add(920, "Theta");
_entityValue.Add("Iota", 921); // greek capital letter iota, U+0399
_entityName.Add(921, "Iota");
_entityValue.Add("Kappa", 922); // greek capital letter kappa, U+039A
_entityName.Add(922, "Kappa");
_entityValue.Add("Lambda", 923); // greek capital letter lambda, U+039B ISOgrk3
_entityName.Add(923, "Lambda");
_entityValue.Add("Mu", 924); // greek capital letter mu, U+039C
_entityName.Add(924, "Mu");
_entityValue.Add("Nu", 925); // greek capital letter nu, U+039D
_entityName.Add(925, "Nu");
_entityValue.Add("Xi", 926); // greek capital letter xi, U+039E ISOgrk3
_entityName.Add(926, "Xi");
_entityValue.Add("Omicron", 927); // greek capital letter omicron, U+039F
_entityName.Add(927, "Omicron");
_entityValue.Add("Pi", 928); // greek capital letter pi, U+03A0 ISOgrk3
_entityName.Add(928, "Pi");
_entityValue.Add("Rho", 929); // greek capital letter rho, U+03A1
_entityName.Add(929, "Rho");
_entityValue.Add("Sigma", 931); // greek capital letter sigma, U+03A3 ISOgrk3
_entityName.Add(931, "Sigma");
_entityValue.Add("Tau", 932); // greek capital letter tau, U+03A4
_entityName.Add(932, "Tau");
_entityValue.Add("Upsilon", 933); // greek capital letter upsilon, U+03A5 ISOgrk3
_entityName.Add(933, "Upsilon");
_entityValue.Add("Phi", 934); // greek capital letter phi, U+03A6 ISOgrk3
_entityName.Add(934, "Phi");
_entityValue.Add("Chi", 935); // greek capital letter chi, U+03A7
_entityName.Add(935, "Chi");
_entityValue.Add("Psi", 936); // greek capital letter psi, U+03A8 ISOgrk3
_entityName.Add(936, "Psi");
_entityValue.Add("Omega", 937); // greek capital letter omega, U+03A9 ISOgrk3
_entityName.Add(937, "Omega");
_entityValue.Add("alpha", 945); // greek small letter alpha, U+03B1 ISOgrk3
_entityName.Add(945, "alpha");
_entityValue.Add("beta", 946); // greek small letter beta, U+03B2 ISOgrk3
_entityName.Add(946, "beta");
_entityValue.Add("gamma", 947); // greek small letter gamma, U+03B3 ISOgrk3
_entityName.Add(947, "gamma");
_entityValue.Add("delta", 948); // greek small letter delta, U+03B4 ISOgrk3
_entityName.Add(948, "delta");
_entityValue.Add("epsilon", 949); // greek small letter epsilon, U+03B5 ISOgrk3
_entityName.Add(949, "epsilon");
_entityValue.Add("zeta", 950); // greek small letter zeta, U+03B6 ISOgrk3
_entityName.Add(950, "zeta");
_entityValue.Add("eta", 951); // greek small letter eta, U+03B7 ISOgrk3
_entityName.Add(951, "eta");
_entityValue.Add("theta", 952); // greek small letter theta, U+03B8 ISOgrk3
_entityName.Add(952, "theta");
_entityValue.Add("iota", 953); // greek small letter iota, U+03B9 ISOgrk3
_entityName.Add(953, "iota");
_entityValue.Add("kappa", 954); // greek small letter kappa, U+03BA ISOgrk3
_entityName.Add(954, "kappa");
_entityValue.Add("lambda", 955); // greek small letter lambda, U+03BB ISOgrk3
_entityName.Add(955, "lambda");
_entityValue.Add("mu", 956); // greek small letter mu, U+03BC ISOgrk3
_entityName.Add(956, "mu");
_entityValue.Add("nu", 957); // greek small letter nu, U+03BD ISOgrk3
_entityName.Add(957, "nu");
_entityValue.Add("xi", 958); // greek small letter xi, U+03BE ISOgrk3
_entityName.Add(958, "xi");
_entityValue.Add("omicron", 959); // greek small letter omicron, U+03BF NEW
_entityName.Add(959, "omicron");
_entityValue.Add("pi", 960); // greek small letter pi, U+03C0 ISOgrk3
_entityName.Add(960, "pi");
_entityValue.Add("rho", 961); // greek small letter rho, U+03C1 ISOgrk3
_entityName.Add(961, "rho");
_entityValue.Add("sigmaf", 962); // greek small letter final sigma, U+03C2 ISOgrk3
_entityName.Add(962, "sigmaf");
_entityValue.Add("sigma", 963); // greek small letter sigma, U+03C3 ISOgrk3
_entityName.Add(963, "sigma");
_entityValue.Add("tau", 964); // greek small letter tau, U+03C4 ISOgrk3
_entityName.Add(964, "tau");
_entityValue.Add("upsilon", 965); // greek small letter upsilon, U+03C5 ISOgrk3
_entityName.Add(965, "upsilon");
_entityValue.Add("phi", 966); // greek small letter phi, U+03C6 ISOgrk3
_entityName.Add(966, "phi");
_entityValue.Add("chi", 967); // greek small letter chi, U+03C7 ISOgrk3
_entityName.Add(967, "chi");
_entityValue.Add("psi", 968); // greek small letter psi, U+03C8 ISOgrk3
_entityName.Add(968, "psi");
_entityValue.Add("omega", 969); // greek small letter omega, U+03C9 ISOgrk3
_entityName.Add(969, "omega");
_entityValue.Add("thetasym", 977); // greek small letter theta symbol, U+03D1 NEW
_entityName.Add(977, "thetasym");
_entityValue.Add("upsih", 978); // greek upsilon with hook symbol, U+03D2 NEW
_entityName.Add(978, "upsih");
_entityValue.Add("piv", 982); // greek pi symbol, U+03D6 ISOgrk3
_entityName.Add(982, "piv");
_entityValue.Add("bull", 8226); // bullet = black small circle, U+2022 ISOpub
_entityName.Add(8226, "bull");
_entityValue.Add("hellip", 8230); // horizontal ellipsis = three dot leader, U+2026 ISOpub
_entityName.Add(8230, "hellip");
_entityValue.Add("prime", 8242); // prime = minutes = feet, U+2032 ISOtech
_entityName.Add(8242, "prime");
_entityValue.Add("Prime", 8243); // double prime = seconds = inches, U+2033 ISOtech
_entityName.Add(8243, "Prime");
_entityValue.Add("oline", 8254); // overline = spacing overscore, U+203E NEW
_entityName.Add(8254, "oline");
_entityValue.Add("frasl", 8260); // fraction slash, U+2044 NEW
_entityName.Add(8260, "frasl");
_entityValue.Add("weierp", 8472); // script capital P = power set = Weierstrass p, U+2118 ISOamso
_entityName.Add(8472, "weierp");
_entityValue.Add("image", 8465); // blackletter capital I = imaginary part, U+2111 ISOamso
_entityName.Add(8465, "image");
_entityValue.Add("real", 8476); // blackletter capital R = real part symbol, U+211C ISOamso
_entityName.Add(8476, "real");
_entityValue.Add("trade", 8482); // trade mark sign, U+2122 ISOnum
_entityName.Add(8482, "trade");
_entityValue.Add("alefsym", 8501); // alef symbol = first transfinite cardinal, U+2135 NEW
_entityName.Add(8501, "alefsym");
_entityValue.Add("larr", 8592); // leftwards arrow, U+2190 ISOnum
_entityName.Add(8592, "larr");
_entityValue.Add("uarr", 8593); // upwards arrow, U+2191 ISOnum
_entityName.Add(8593, "uarr");
_entityValue.Add("rarr", 8594); // rightwards arrow, U+2192 ISOnum
_entityName.Add(8594, "rarr");
_entityValue.Add("darr", 8595); // downwards arrow, U+2193 ISOnum
_entityName.Add(8595, "darr");
_entityValue.Add("harr", 8596); // left right arrow, U+2194 ISOamsa
_entityName.Add(8596, "harr");
_entityValue.Add("crarr", 8629); // downwards arrow with corner leftwards = carriage return, U+21B5 NEW
_entityName.Add(8629, "crarr");
_entityValue.Add("lArr", 8656); // leftwards double arrow, U+21D0 ISOtech
_entityName.Add(8656, "lArr");
_entityValue.Add("uArr", 8657); // upwards double arrow, U+21D1 ISOamsa
_entityName.Add(8657, "uArr");
_entityValue.Add("rArr", 8658); // rightwards double arrow, U+21D2 ISOtech
_entityName.Add(8658, "rArr");
_entityValue.Add("dArr", 8659); // downwards double arrow, U+21D3 ISOamsa
_entityName.Add(8659, "dArr");
_entityValue.Add("hArr", 8660); // left right double arrow, U+21D4 ISOamsa
_entityName.Add(8660, "hArr");
_entityValue.Add("forall", 8704); // for all, U+2200 ISOtech
_entityName.Add(8704, "forall");
_entityValue.Add("part", 8706); // partial differential, U+2202 ISOtech
_entityName.Add(8706, "part");
_entityValue.Add("exist", 8707); // there exists, U+2203 ISOtech
_entityName.Add(8707, "exist");
_entityValue.Add("empty", 8709); // empty set = null set = diameter, U+2205 ISOamso
_entityName.Add(8709, "empty");
_entityValue.Add("nabla", 8711); // nabla = backward difference, U+2207 ISOtech
_entityName.Add(8711, "nabla");
_entityValue.Add("isin", 8712); // element of, U+2208 ISOtech
_entityName.Add(8712, "isin");
_entityValue.Add("notin", 8713); // not an element of, U+2209 ISOtech
_entityName.Add(8713, "notin");
_entityValue.Add("ni", 8715); // contains as member, U+220B ISOtech
_entityName.Add(8715, "ni");
_entityValue.Add("prod", 8719); // n-ary product = product sign, U+220F ISOamsb
_entityName.Add(8719, "prod");
_entityValue.Add("sum", 8721); // n-ary sumation, U+2211 ISOamsb
_entityName.Add(8721, "sum");
_entityValue.Add("minus", 8722); // minus sign, U+2212 ISOtech
_entityName.Add(8722, "minus");
_entityValue.Add("lowast", 8727); // asterisk operator, U+2217 ISOtech
_entityName.Add(8727, "lowast");
_entityValue.Add("radic", 8730); // square root = radical sign, U+221A ISOtech
_entityName.Add(8730, "radic");
_entityValue.Add("prop", 8733); // proportional to, U+221D ISOtech
_entityName.Add(8733, "prop");
_entityValue.Add("infin", 8734); // infinity, U+221E ISOtech
_entityName.Add(8734, "infin");
_entityValue.Add("ang", 8736); // angle, U+2220 ISOamso
_entityName.Add(8736, "ang");
_entityValue.Add("and", 8743); // logical and = wedge, U+2227 ISOtech
_entityName.Add(8743, "and");
_entityValue.Add("or", 8744); // logical or = vee, U+2228 ISOtech
_entityName.Add(8744, "or");
_entityValue.Add("cap", 8745); // intersection = cap, U+2229 ISOtech
_entityName.Add(8745, "cap");
_entityValue.Add("cup", 8746); // union = cup, U+222A ISOtech
_entityName.Add(8746, "cup");
_entityValue.Add("int", 8747); // integral, U+222B ISOtech
_entityName.Add(8747, "int");
_entityValue.Add("there4", 8756); // therefore, U+2234 ISOtech
_entityName.Add(8756, "there4");
_entityValue.Add("sim", 8764); // tilde operator = varies with = similar to, U+223C ISOtech
_entityName.Add(8764, "sim");
_entityValue.Add("cong", 8773); // approximately equal to, U+2245 ISOtech
_entityName.Add(8773, "cong");
_entityValue.Add("asymp", 8776); // almost equal to = asymptotic to, U+2248 ISOamsr
_entityName.Add(8776, "asymp");
_entityValue.Add("ne", 8800); // not equal to, U+2260 ISOtech
_entityName.Add(8800, "ne");
_entityValue.Add("equiv", 8801); // identical to, U+2261 ISOtech
_entityName.Add(8801, "equiv");
_entityValue.Add("le", 8804); // less-than or equal to, U+2264 ISOtech
_entityName.Add(8804, "le");
_entityValue.Add("ge", 8805); // greater-than or equal to, U+2265 ISOtech
_entityName.Add(8805, "ge");
_entityValue.Add("sub", 8834); // subset of, U+2282 ISOtech
_entityName.Add(8834, "sub");
_entityValue.Add("sup", 8835); // superset of, U+2283 ISOtech
_entityName.Add(8835, "sup");
_entityValue.Add("nsub", 8836); // not a subset of, U+2284 ISOamsn
_entityName.Add(8836, "nsub");
_entityValue.Add("sube", 8838); // subset of or equal to, U+2286 ISOtech
_entityName.Add(8838, "sube");
_entityValue.Add("supe", 8839); // superset of or equal to, U+2287 ISOtech
_entityName.Add(8839, "supe");
_entityValue.Add("oplus", 8853); // circled plus = direct sum, U+2295 ISOamsb
_entityName.Add(8853, "oplus");
_entityValue.Add("otimes", 8855); // circled times = vector product, U+2297 ISOamsb
_entityName.Add(8855, "otimes");
_entityValue.Add("perp", 8869); // up tack = orthogonal to = perpendicular, U+22A5 ISOtech
_entityName.Add(8869, "perp");
_entityValue.Add("sdot", 8901); // dot operator, U+22C5 ISOamsb
_entityName.Add(8901, "sdot");
_entityValue.Add("lceil", 8968); // left ceiling = apl upstile, U+2308 ISOamsc
_entityName.Add(8968, "lceil");
_entityValue.Add("rceil", 8969); // right ceiling, U+2309 ISOamsc
_entityName.Add(8969, "rceil");
_entityValue.Add("lfloor", 8970); // left floor = apl downstile, U+230A ISOamsc
_entityName.Add(8970, "lfloor");
_entityValue.Add("rfloor", 8971); // right floor, U+230B ISOamsc
_entityName.Add(8971, "rfloor");
_entityValue.Add("lang", 9001); // left-pointing angle bracket = bra, U+2329 ISOtech
_entityName.Add(9001, "lang");
_entityValue.Add("rang", 9002); // right-pointing angle bracket = ket, U+232A ISOtech
_entityName.Add(9002, "rang");
_entityValue.Add("loz", 9674); // lozenge, U+25CA ISOpub
_entityName.Add(9674, "loz");
_entityValue.Add("spades", 9824); // black spade suit, U+2660 ISOpub
_entityName.Add(9824, "spades");
_entityValue.Add("clubs", 9827); // black club suit = shamrock, U+2663 ISOpub
_entityName.Add(9827, "clubs");
_entityValue.Add("hearts", 9829); // black heart suit = valentine, U+2665 ISOpub
_entityName.Add(9829, "hearts");
_entityValue.Add("diams", 9830); // black diamond suit, U+2666 ISOpub
_entityName.Add(9830, "diams");
_entityValue.Add("quot", 34); // quotation mark = APL quote, U+0022 ISOnum
_entityName.Add(34, "quot");
_entityValue.Add("amp", 38); // ampersand, U+0026 ISOnum
_entityName.Add(38, "amp");
_entityValue.Add("lt", 60); // less-than sign, U+003C ISOnum
_entityName.Add(60, "lt");
_entityValue.Add("gt", 62); // greater-than sign, U+003E ISOnum
_entityName.Add(62, "gt");
_entityValue.Add("OElig", 338); // latin capital ligature OE, U+0152 ISOlat2
_entityName.Add(338, "OElig");
_entityValue.Add("oelig", 339); // latin small ligature oe, U+0153 ISOlat2
_entityName.Add(339, "oelig");
_entityValue.Add("Scaron", 352); // latin capital letter S with caron, U+0160 ISOlat2
_entityName.Add(352, "Scaron");
_entityValue.Add("scaron", 353); // latin small letter s with caron, U+0161 ISOlat2
_entityName.Add(353, "scaron");
_entityValue.Add("Yuml", 376); // latin capital letter Y with diaeresis, U+0178 ISOlat2
_entityName.Add(376, "Yuml");
_entityValue.Add("circ", 710); // modifier letter circumflex accent, U+02C6 ISOpub
_entityName.Add(710, "circ");
_entityValue.Add("tilde", 732); // small tilde, U+02DC ISOdia
_entityName.Add(732, "tilde");
_entityValue.Add("ensp", 8194); // en space, U+2002 ISOpub
_entityName.Add(8194, "ensp");
_entityValue.Add("emsp", 8195); // em space, U+2003 ISOpub
_entityName.Add(8195, "emsp");
_entityValue.Add("thinsp", 8201); // thin space, U+2009 ISOpub
_entityName.Add(8201, "thinsp");
_entityValue.Add("zwnj", 8204); // zero width non-joiner, U+200C NEW RFC 2070
_entityName.Add(8204, "zwnj");
_entityValue.Add("zwj", 8205); // zero width joiner, U+200D NEW RFC 2070
_entityName.Add(8205, "zwj");
_entityValue.Add("lrm", 8206); // left-to-right mark, U+200E NEW RFC 2070
_entityName.Add(8206, "lrm");
_entityValue.Add("rlm", 8207); // right-to-left mark, U+200F NEW RFC 2070
_entityName.Add(8207, "rlm");
_entityValue.Add("ndash", 8211); // en dash, U+2013 ISOpub
_entityName.Add(8211, "ndash");
_entityValue.Add("mdash", 8212); // em dash, U+2014 ISOpub
_entityName.Add(8212, "mdash");
_entityValue.Add("lsquo", 8216); // left single quotation mark, U+2018 ISOnum
_entityName.Add(8216, "lsquo");
_entityValue.Add("rsquo", 8217); // right single quotation mark, U+2019 ISOnum
_entityName.Add(8217, "rsquo");
_entityValue.Add("sbquo", 8218); // single low-9 quotation mark, U+201A NEW
_entityName.Add(8218, "sbquo");
_entityValue.Add("ldquo", 8220); // left double quotation mark, U+201C ISOnum
_entityName.Add(8220, "ldquo");
_entityValue.Add("rdquo", 8221); // right double quotation mark, U+201D ISOnum
_entityName.Add(8221, "rdquo");
_entityValue.Add("bdquo", 8222); // double low-9 quotation mark, U+201E NEW
_entityName.Add(8222, "bdquo");
_entityValue.Add("dagger", 8224); // dagger, U+2020 ISOpub
_entityName.Add(8224, "dagger");
_entityValue.Add("Dagger", 8225); // double dagger, U+2021 ISOpub
_entityName.Add(8225, "Dagger");
_entityValue.Add("permil", 8240); // per mille sign, U+2030 ISOtech
_entityName.Add(8240, "permil");
_entityValue.Add("lsaquo", 8249); // single left-pointing angle quotation mark, U+2039 ISO proposed
_entityName.Add(8249, "lsaquo");
_entityValue.Add("rsaquo", 8250); // single right-pointing angle quotation mark, U+203A ISO proposed
_entityName.Add(8250, "rsaquo");
_entityValue.Add("euro", 8364); // euro sign, U+20AC NEW
_entityName.Add(8364, "euro");
_maxEntitySize = 8 + 1; // we add the # char
#endregion
}
private HtmlEntity()
{
}
#endregion
#region Public Methods
/// <summary>
/// Replace known entities by characters.
/// </summary>
/// <param name="text">The source text.</param>
/// <returns>The result text.</returns>
public static string DeEntitize(string text)
{
if (text == null)
return null;
if (text.Length == 0)
return text;
StringBuilder sb = new StringBuilder(text.Length);
ParseState state = ParseState.Text;
StringBuilder entity = new StringBuilder(10);
for (int i = 0; i < text.Length; i++)
{
switch (state)
{
case ParseState.Text:
switch (text[i])
{
case '&':
state = ParseState.EntityStart;
break;
default:
sb.Append(text[i]);
break;
}
break;
case ParseState.EntityStart:
switch (text[i])
{
case ';':
if (entity.Length == 0)
{
sb.Append("&;");
}
else
{
if (entity[0] == '#')
{
string e = entity.ToString();
try
{
int code = Convert.ToInt32(e.Substring(1, e.Length - 1));
sb.Append(Convert.ToChar(code));
}
catch
{
sb.Append("&#" + e + ";");
}
}
else
{
// named entity?
int code;
object o = _entityValue[entity.ToString()];
if (o == null)
{
// nope
sb.Append("&" + entity + ";");
}
else
{
// we found one
code = (int) o;
sb.Append(Convert.ToChar(code));
}
}
entity.Remove(0, entity.Length);
}
state = ParseState.Text;
break;
case '&':
// new entity start without end, it was not an entity...
sb.Append("&" + entity);
entity.Remove(0, entity.Length);
break;
default:
entity.Append(text[i]);
if (entity.Length > _maxEntitySize)
{
// unknown stuff, just don't touch it
state = ParseState.Text;
sb.Append("&" + entity);
entity.Remove(0, entity.Length);
}
break;
}
break;
}
}
// finish the work
if (state == ParseState.EntityStart)
{
sb.Append("&" + entity);
}
return sb.ToString();
}
/// <summary>
/// Clone and entitize an HtmlNode. This will affect attribute values and nodes' text. It will also entitize all child nodes.
/// </summary>
/// <param name="node">The node to entitize.</param>
/// <returns>An entitized cloned node.</returns>
public static HtmlNode Entitize(HtmlNode node)
{
if (node == null)
{
throw new ArgumentNullException("node");
}
HtmlNode result = node.CloneNode(true);
if (result.HasAttributes)
Entitize(result.Attributes);
if (result.HasChildNodes)
{
Entitize(result.ChildNodes);
}
else
{
if (result.NodeType == HtmlNodeType.Text)
{
((HtmlTextNode) result).Text = Entitize(((HtmlTextNode) result).Text, true, true);
}
}
return result;
}
/// <summary>
/// Replace characters above 127 by entities.
/// </summary>
/// <param name="text">The source text.</param>
/// <returns>The result text.</returns>
public static string Entitize(string text)
{
return Entitize(text, true);
}
/// <summary>
/// Replace characters above 127 by entities.
/// </summary>
/// <param name="text">The source text.</param>
/// <param name="useNames">If set to false, the function will not use known entities name. Default is true.</param>
/// <returns>The result text.</returns>
public static string Entitize(string text, bool useNames)
{
return Entitize(text, useNames, false);
}
/// <summary>
/// Replace characters above 127 by entities.
/// </summary>
/// <param name="text">The source text.</param>
/// <param name="useNames">If set to false, the function will not use known entities name. Default is true.</param>
/// <param name="entitizeQuotAmpAndLtGt">If set to true, the [quote], [ampersand], [lower than] and [greather than] characters will be entitized.</param>
/// <returns>The result text</returns>
public static string Entitize(string text, bool useNames, bool entitizeQuotAmpAndLtGt)
// _entityValue.Add("quot", 34); // quotation mark = APL quote, U+0022 ISOnum
// _entityName.Add(34, "quot");
// _entityValue.Add("amp", 38); // ampersand, U+0026 ISOnum
// _entityName.Add(38, "amp");
// _entityValue.Add("lt", 60); // less-than sign, U+003C ISOnum
// _entityName.Add(60, "lt");
// _entityValue.Add("gt", 62); // greater-than sign, U+003E ISOnum
// _entityName.Add(62, "gt");
{
if (text == null)
return null;
if (text.Length == 0)
return text;
StringBuilder sb = new StringBuilder(text.Length);
for (int i = 0; i < text.Length; i++)
{
int code = text[i];
if ((code > 127) ||
(entitizeQuotAmpAndLtGt && ((code == 34) || (code == 38) || (code == 60) || (code == 62))))
{
string entity = _entityName[code] as string;
if ((entity == null) || (!useNames))
{
sb.Append("&#" + code + ";");
}
else
{
sb.Append("&" + entity + ";");
}
}
else
{
sb.Append(text[i]);
}
}
return sb.ToString();
}
#endregion
#region Private Methods
private static void Entitize(HtmlAttributeCollection collection)
{
foreach (HtmlAttribute at in collection)
{
at.Value = Entitize(at.Value);
}
}
private static void Entitize(HtmlNodeCollection collection)
{
foreach (HtmlNode node in collection)
{
if (node.HasAttributes)
Entitize(node.Attributes);
if (node.HasChildNodes)
{
Entitize(node.ChildNodes);
}
else
{
if (node.NodeType == HtmlNodeType.Text)
{
((HtmlTextNode) node).Text = Entitize(((HtmlTextNode) node).Text, true, true);
}
}
}
}
#endregion
#region Nested type: ParseState
private enum ParseState
{
Text,
EntityStart
}
#endregion
}
}
Loaded 100 of 48146 files, more files were not shown because too many files have changed in this diff. Show more