Re-enable most IR optimisations. It's only really redundant-Put

elimination which is causing a problem right now and so is disabled;
tree-building is also potentially dodgy.

git-svn-id: svn://svn.valgrind.org/vex/trunk@394

diff --git a/VEX/priv/guest-x86/toIR.c b/VEX/priv/guest-x86/toIR.c
index 69e170e49aa0901943d38b97f055b1fc728d6cb5..8aee1acadc66c772d86dc435dd89a5a34a1f67e7 100644 (file)
--- a/VEX/priv/guest-x86/toIR.c
+++ b/VEX/priv/guest-x86/toIR.c
@@ -127,7 +127,7 @@ IRBB* bbToIR_X86Instr ( UChar* x86code,
    DisResult  dres;
    static Int n_resteers = 0;
    Int        d_resteers = 0;
-   Int        resteerBelow = 0; //10;  /* the threshold value */
+   Int        resteerBelow = 10;  /* the threshold value */
 
    /* Set up globals. */
    host_is_bigendian = host_bigendian;

diff --git a/VEX/priv/ir/iropt.c b/VEX/priv/ir/iropt.c
index eb2fb2d8492c9a36cb0cf117737179acc6bf8668..3d0b88f308ca54bcc5178abcc82ad9b1fbb003ea 100644 (file)
--- a/VEX/priv/ir/iropt.c
+++ b/VEX/priv/ir/iropt.c
@@ -3022,13 +3022,13 @@ IRBB* cheap_transformations (
       vex_printf("\n========= REDUNDANT GET\n\n" );
       ppIRBB(bb);
    }
-
+#if 0
    redundant_put_removal_BB ( bb );
    if (iropt_verbose) {
       vex_printf("\n========= REDUNDANT PUT\n\n" );
       ppIRBB(bb);
    }
-
+#endif
    bb = cprop_BB ( bb );
    if (iropt_verbose) {
       vex_printf("\n========= CPROPD\n\n" );
@@ -3138,7 +3138,6 @@ IRBB* do_iropt_BB ( IRBB* bb0,
 
    Bool show_res = False;
    Bool do_expensive;
-return bb0;
    IRBB *bb, *bb2;
 
    n_total++;
@@ -3190,7 +3189,7 @@ return bb0;
 
    /* Finally, rebuild trees, for the benefit of instruction
       selection. */
-
+   dead_BB(bb);
    treebuild_BB( bb );
    if (show_res || iropt_verbose) {
       vex_printf("\n========= TREEd \n\n" );