Thu Nov 15 14:20:21 CET 2007 Paolo Molaro <lupus@ximian.com>

	* abcremoval.c, mini.c, ssa.c, ssapre.c: updated to implement
	--enable-minimal=ssa.

svn path=/trunk/mono/; revision=89674

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 0d111944855d3586f6096ea12f1d21952ca43974..9107700115b3762178a93350cfe428f97d01e695 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Nov 15 14:20:21 CET 2007 Paolo Molaro <lupus@ximian.com>
+
+       * abcremoval.c, mini.c, ssa.c, ssapre.c: updated to implement
+       --enable-minimal=ssa.
+
 2007-11-13  Zoltan Varga  <vargaz@gmail.com>
 
        * mini-trampolines.c (mono_delegate_trampoline): Update after 
@@ -103,6 +109,12 @@
        * mini-ppc.h, mini-x86.h:  Handle Leopards renaming of some structure 
        members.
 
+Wed Oct 31 20:23:14 CET 2007 Paolo Molaro <lupus@ximian.com>
+
+       * mini.c, mini-x86.c: when getting back from unmanaged code
+       to managed via a marshaled delegate we also need to set the
+       right domain.
+
 Wed Oct 31 19:53:33 CET 2007 Paolo Molaro <lupus@ximian.com>
 
        * mini-amd64.c, mini-amd64.h, tramp-amd64.c: breakpoint table support

diff --git a/mono/mini/abcremoval.c b/mono/mini/abcremoval.c
index 5d526718e73a403944b090a39bb9935dcc7f443e..a590050a69cdd24ed7bc71461fec14dc8e2f9f4c 100644 (file)
--- a/mono/mini/abcremoval.c
+++ b/mono/mini/abcremoval.c
@@ -13,6 +13,10 @@
 #include <mono/metadata/mempool.h>
 #include <mono/metadata/opcodes.h>
 
+#include "config.h"
+
+#ifndef DISABLE_SSA
+
 #include "inssel.h"
 
 #include "abcremoval.h"
@@ -1461,3 +1465,6 @@ handle_integer_value:
        
        process_block (cfg->bblocks [0], &area);
 }
+
+#endif /* DISABLE_SSA */
+

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index c34d7e9779a8a7215554783eebd7cd73ab086abc..e13b0b6c5ff009054c8db2f9720386d8a42daa1f 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -10820,7 +10820,9 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
 
        if (!header->num_clauses && !cfg->disable_ssa) {
                mono_local_cprop (cfg);
+#ifndef DISABLE_SSA
                mono_ssa_compute (cfg);
+#endif
        }
 #else 
 
@@ -10828,7 +10830,9 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
        if (cfg->opt & (MONO_OPT_SSA | MONO_OPT_ABCREM | MONO_OPT_SSAPRE)) {
                if (!(cfg->comp_done & MONO_COMP_SSA) && !header->num_clauses && !cfg->disable_ssa) {
                        mono_local_cprop (cfg);
+#ifndef DISABLE_SSA
                        mono_ssa_compute (cfg);
+#endif
 
                        if (cfg->verbose_level >= 2) {
                                print_dfn (cfg);
@@ -10843,12 +10847,15 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
 
        if ((cfg->opt & MONO_OPT_CONSPROP) || (cfg->opt & MONO_OPT_COPYPROP)) {
                if (cfg->comp_done & MONO_COMP_SSA) {
+#ifndef DISABLE_SSA
                        mono_ssa_cprop (cfg);
+#endif
                } else {
                        mono_local_cprop (cfg);
                }
        }
 
+#ifndef DISABLE_SSA
        if (cfg->comp_done & MONO_COMP_SSA) {                   
                //mono_ssa_deadce (cfg);
 
@@ -10872,6 +10879,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool
                if (cfg->opt & MONO_OPT_BRANCH)
                        optimize_branches (cfg);
        }
+#endif
 
        /* after SSA removal */
        if (parts == 3)

diff --git a/mono/mini/ssa.c b/mono/mini/ssa.c
index 46cbc934ff6308f7c095d704ffd8621e42732bb6..aa5991ed60e56124f9829b091e38c8ba259c913f 100644 (file)
--- a/mono/mini/ssa.c
+++ b/mono/mini/ssa.c
@@ -11,6 +11,8 @@
 
 #include "mini.h"
 
+#ifndef DISABLE_SSA
+
 #define USE_ORIGINAL_VARS
 #define CREATE_PRUNED_SSA
 
@@ -1276,3 +1278,6 @@ mono_ssa_strength_reduction (MonoCompile *cfg)
        }
 }
 #endif
+
+#endif /* DISABLE_SSA */
+

diff --git a/mono/mini/ssapre.c b/mono/mini/ssapre.c
index 9c2ef0bd322c0ae237955f8e970d363e347652cd..0297a6304ba347ccfececfe5a40ad1980e3dd410 100644 (file)
--- a/mono/mini/ssapre.c
+++ b/mono/mini/ssapre.c
@@ -14,6 +14,9 @@
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/opcodes.h>
 
+#include "config.h"
+
+#ifndef DISABLE_SSA
 #include "inssel.h"
 
 #include "ssapre.h"
@@ -2155,3 +2158,6 @@ mono_perform_ssapre (MonoCompile *cfg) {
        
        mono_mempool_destroy (area.mempool);
 }
+
+#endif /* DISABLE_SSA */
+