Browse Source

* get rid of cs_opt_none
* $O+ sets cs_opt_level2 instead of cs_opt_none which made no sense

florian 3 years ago
parent
commit
d2a1f9cb20
4 changed files with 6 additions and 6 deletions
  1. 2 2
      compiler/globtype.pas
  2. 1 0
      compiler/scandir.pas
  3. 2 2
      compiler/switches.pas
  4. 1 2
      compiler/utils/ppuutils/ppudump.pp

+ 2 - 2
compiler/globtype.pas

@@ -342,7 +342,7 @@ interface
 
      type
        { optimizer }
-       toptimizerswitch = (cs_opt_none,
+       toptimizerswitch = (
          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_loopunroll,cs_opt_tailrecursion,cs_opt_nodecse,
@@ -425,7 +425,7 @@ interface
        end;
 
     const
-       OptimizerSwitchStr : array[toptimizerswitch] of string[18] = ('',
+       OptimizerSwitchStr : array[toptimizerswitch] of string[18] = (
          'LEVEL1','LEVEL2','LEVEL3','LEVEL4',
          'REGVAR','UNCERTAIN','SIZE','STACKFRAME',
          'PEEPHOLE','LOOPUNROLL','TAILREC','CSE',

+ 1 - 0
compiler/scandir.pas

@@ -1076,6 +1076,7 @@ unit scandir;
         current_scanner.skipspace;
         { Support also the ON and OFF as switch }
         hs:=current_scanner.readid;
+        writeln(hs);
         if (hs='ON') then
           current_settings.optimizerswitches:=level2optimizerswitches
         else if (hs='OFF') then

+ 2 - 2
compiler/switches.pas

@@ -89,7 +89,7 @@ const
    {L} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
    {M} (typesw:localsw; setsw:ord(cs_generate_rtti)),
    {N} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
-   {O} (typesw:optimizersw; setsw:ord(cs_opt_none)),
+   {O} (typesw:optimizersw; setsw:ord(cs_opt_level2)),
    {P} (typesw:modulesw; setsw:ord(cs_openstring)),
    {Q} (typesw:localsw; setsw:ord(cs_check_overflow)),
    {R} (typesw:localsw; setsw:ord(cs_check_range)),
@@ -131,7 +131,7 @@ const
    {L} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
    {M} (typesw:localsw; setsw:ord(cs_generate_rtti)),
    {N} (typesw:unsupportedsw; setsw:ord(cs_localnone)),
-   {O} (typesw:optimizersw; setsw:ord(cs_opt_none)),
+   {O} (typesw:optimizersw; setsw:ord(cs_opt_level2)),
    {P} (typesw:modulesw; setsw:ord(cs_openstring)),
    {Q} (typesw:localsw; setsw:ord(cs_check_overflow)),
    {R} (typesw:localsw; setsw:ord(cs_check_range)),

+ 1 - 2
compiler/utils/ppuutils/ppudump.pp

@@ -2443,8 +2443,7 @@ const
        );
        { optimizer }
        optimizerswitchname : array[toptimizerswitch] of string[50] =
-        ('cs_opt_none',
-         'cs_opt_level1',
+        ('cs_opt_level1',
          'cs_opt_level2',
          'cs_opt_level3',
          'cs_opt_level4',