- removed long deprecated/buggy assembler cse optimiser for i386

   o bumped ppu version because optimiser settings can be embedded in generic
     token streams

git-svn-id: trunk@30835 -

compiler/aopt.pas

@@ -279,14 +279,6 @@ Unit aopt;
                 if pass = 0 then
                   PeepHoleOptPass1;
               end;
-            If (cs_opt_asmcse in current_settings.optimizerswitches) Then
-              Begin
-//                DFA:=TAOptDFACpu.Create(AsmL,BlockStart,BlockEnd,LabelInfo);
-                { data flow analyzer }
-//                DFA.DoDFA;
-                { common subexpression elimination }
-      {          CSE;}
-              End;
             { more peephole optimizations }
             if (cs_opt_peephole in current_settings.optimizerswitches) then
               begin

compiler/globtype.pas

@@ -269,7 +269,7 @@ interface
        toptimizerswitch = (cs_opt_none,
          cs_opt_level1,cs_opt_level2,cs_opt_level3,cs_opt_level4,
          cs_opt_regvar,cs_opt_uncertain,cs_opt_size,cs_opt_stackframe,
-         cs_opt_peephole,cs_opt_asmcse,cs_opt_loopunroll,cs_opt_tailrecursion,cs_opt_nodecse,
+         cs_opt_peephole,cs_opt_loopunroll,cs_opt_tailrecursion,cs_opt_nodecse,
          cs_opt_nodedfa,cs_opt_loopstrength,cs_opt_scheduler,cs_opt_autoinline,cs_useebp,cs_userbp,
          cs_opt_reorder_fields,cs_opt_fastmath,
          { Allow removing expressions whose result is not used, even when this
@@ -315,7 +315,7 @@ interface
        OptimizerSwitchStr : array[toptimizerswitch] of string[17] = ('',
          'LEVEL1','LEVEL2','LEVEL3','LEVEL4',
          'REGVAR','UNCERTAIN','SIZE','STACKFRAME',
-         'PEEPHOLE','ASMCSE','LOOPUNROLL','TAILREC','CSE',
+         'PEEPHOLE','LOOPUNROLL','TAILREC','CSE',
          'DFA','STRENGTH','SCHEDULE','AUTOINLINE','USEEBP','USERBP',
          'ORDERFIELDS','FASTMATH','DEADVALUES','REMOVEEMPTYPROCS',
          'CONSTPROP',

compiler/i386/aopt386.pas

@@ -37,7 +37,7 @@ Implementation
 Uses
   globtype,
   globals,
-  DAOpt386,POpt386,CSOpt386;
+  DAOpt386,POpt386;
 
 
 Procedure Optimize(AsmL: TAsmList);
@@ -74,13 +74,6 @@ Begin
                if pass = 0 then
                  PeepHoleOptPass1(AsmL, BlockStart, BlockEnd);
            end;
-        { Data flow analyzer }
-         If (cs_opt_asmcse in current_settings.optimizerswitches) Then
-           begin
-             if dfa.pass_generate_code then
-              { common subexpression elimination }
-               changed := CSE(asmL, blockStart, blockEnd, pass) or changed;
-           end;
         { More peephole optimizations }
          if (cs_opt_peephole in current_settings.optimizerswitches) then
            begin

compiler/i386/cpuinfo.pas

@@ -139,7 +139,7 @@ Const
                                  { no need to write info about those }
                                  [cs_opt_level1,cs_opt_level2,cs_opt_level3]+
                                  [cs_opt_peephole,cs_opt_regvar,cs_opt_stackframe,
-                                  cs_opt_asmcse,cs_opt_loopunroll,cs_opt_uncertain,
+                                  cs_opt_loopunroll,cs_opt_uncertain,
                                   cs_opt_tailrecursion,cs_opt_nodecse,cs_useebp,
 				  cs_opt_reorder_fields,cs_opt_fastmath];
 

compiler/i8086/cpuinfo.pas

@@ -139,7 +139,7 @@ Const
                                  { no need to write info about those }
                                  [cs_opt_level1,cs_opt_level2,cs_opt_level3]+
                                  [cs_opt_peephole,cs_opt_regvar,cs_opt_stackframe,
-                                  cs_opt_asmcse,cs_opt_loopunroll,cs_opt_uncertain,
+                                  cs_opt_loopunroll,cs_opt_uncertain,
                                   cs_opt_tailrecursion,cs_opt_nodecse,cs_useebp,
 				  cs_opt_reorder_fields,cs_opt_fastmath];
 

compiler/ppu.pas

@@ -43,7 +43,7 @@ type
 {$endif Test_Double_checksum}
 
 const
-  CurrentPPUVersion = 175;
+  CurrentPPUVersion = 176;
 
 { buffer sizes }
   maxentrysize = 1024;