소스 검색

- removed newcg define

carl 23 년 전
부모
커밋
1ef442f4bf
4개의 변경된 파일29개의 추가작업 그리고 48개의 파일을 삭제
  1. 15 19
      compiler/node.pas
  2. 6 6
      compiler/options.pas
  3. 4 18
      compiler/parser.pas
  4. 4 5
      compiler/version.pas

+ 15 - 19
compiler/node.pas

@@ -100,8 +100,8 @@ interface
           continuen,       {A continue statement.}
 (*          repeatn,       {A repeat until block.}
           whilen,         {A while do statement.}*)
-	  whilerepeatn,     {A while or repeat statement.}
-          forn,     	    {A for loop.}
+      whilerepeatn,     {A while or repeat statement.}
+          forn,             {A for loop.}
           exitn,            {An exit statement.}
           withn,            {A with statement.}
           casen,            {A case statement.}
@@ -126,7 +126,7 @@ interface
           nothingn,
           loadvmtn,
           guidconstn,
-          rttin		    {Rtti information so they can be accessed in result/firstpass.}
+          rttin         {Rtti information so they can be accessed in result/firstpass.}
        );
 
       const
@@ -186,7 +186,7 @@ interface
           'continuen',
 (*          'repeatn',
           'whilen',*)
-	  'whilerepeatn',
+      'whilerepeatn',
           'forn',
           'exitn',
           'withn',
@@ -229,10 +229,10 @@ interface
          nf_varargs_para,  { belongs this para to varargs }
 
          { flags used by loop nodes }
-         nf_backward,	{ set if it is a for ... downto ... do loop }
+         nf_backward,   { set if it is a for ... downto ... do loop }
          nf_varstate,   { do we need to parse childs to set var state }
-	 nf_testatbegin,{ Do a test at the begin of the loop?}
-	 nf_checknegate,{ Negate the loop test?}
+     nf_testatbegin,{ Do a test at the begin of the loop?}
+     nf_checknegate,{ Negate the loop test?}
 
          { taddrnode }
          nf_procvarload,
@@ -338,9 +338,9 @@ interface
           { dermines the number of necessary temp. locations to evaluate
             the node }
 {$ifdef state_tracking}
-	  { Does optimizations by keeping track of the variable states
-	    in a procedure }
-	  function track_state_pass(exec_known:boolean):boolean;virtual;
+      { Does optimizations by keeping track of the variable states
+        in a procedure }
+      function track_state_pass(exec_known:boolean):boolean;virtual;
 {$endif}
           procedure det_temp;virtual;abstract;
 
@@ -371,9 +371,6 @@ interface
        { one child, you have to use it if you want to use         }
        { true- and falselabel                                     }
        tparentnode = class(tnode)
-{$ifdef newcg}
-          falselabel,truelabel : tasmlabel;
-{$endif newcg}
        end;
 
        tnodeclass = class of tnode;
@@ -491,10 +488,6 @@ implementation
     procedure tnode.concattolist(l : tlinkedlist);
 
       begin
-{$ifdef newcg}
-         //!!!!!!! l^.concat(self);
-         {$warning fixme}
-{$endif newcg}
       end;
 
     function tnode.ischild(p : tnode) : boolean;
@@ -533,7 +526,7 @@ implementation
     function Tnode.track_state_pass(exec_known:boolean):boolean;
     
     begin
-	track_state_pass:=false;
+    track_state_pass:=false;
     end;
 {$endif state_tracking}
 
@@ -827,7 +820,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.33  2002-07-23 12:34:30  daniel
+  Revision 1.34  2002-08-09 19:15:41  carl
+     - removed newcg define
+
+  Revision 1.33  2002/07/23 12:34:30  daniel
   * Readded old set code. To use it define 'oldset'. Activated by default
     for ppc.
 

+ 6 - 6
compiler/options.pas

@@ -1346,19 +1346,16 @@ begin
   def_symbol('VER'+version_nr);
   def_symbol('VER'+version_nr+'_'+release_nr);
   def_symbol('VER'+version_nr+'_'+release_nr+'_'+patch_nr);
-{$ifdef newcg}
-  def_symbol('WITHNEWCG');
-{$endif}
 
 { Temporary defines, until things settle down }
   def_symbol('HASWIDECHAR');
   def_symbol('HASWIDESTRING');
   def_symbol('HASOUT');
   { for now, the PowerPC doesn't support variants and interfaces }
-{$ifndef POWERPC}
+{$ifdef i386}
   def_symbol('HASINTF');
   def_symbol('HASVARIANT');
-{$endif POWERPC}
+{$endif i386}
   def_symbol('INTERNSETLENGTH');
   def_symbol('INTERNLENGTH');
   def_symbol('INT64FUNCRESOK');
@@ -1680,7 +1677,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.79  2002-07-26 22:22:10  florian
+  Revision 1.80  2002-08-09 19:15:41  carl
+     - removed newcg define
+
+  Revision 1.79  2002/07/26 22:22:10  florian
     * several PowerPC related fixes to get forward with system unit compilation
 
   Revision 1.78  2002/07/26 21:15:39  florian

+ 4 - 18
compiler/parser.pas

@@ -290,9 +290,6 @@ implementation
          oldrecoverpos : pjmp_buf;
 {$endif Delphi}
 {$endif useexcept}
-{$ifdef newcg}
-         oldcg         : pcg;
-{$endif newcg}
 {$ifdef GDB}
          store_dbx : plongint;
 {$endif GDB}
@@ -358,9 +355,6 @@ implementation
          oldaktmodeswitches:=aktmodeswitches;
          oldstatement_level:=statement_level;
 {         oldexceptblockcounter:=exceptblockcounter; }
-{$ifdef newcg}
-         oldcg:=cg;
-{$endif newcg}
 {$ifdef GDB}
          store_dbx:=dbx_counter;
          dbx_counter:=nil;
@@ -432,17 +426,6 @@ implementation
 
        { init code generator for a new module }
          codegen_newmodule;
-{$ifdef newcg}
-{$ifdef i386}
-         cg:=new(pcg386,init);
-{$endif i386}
-{$ifdef alpha}
-         cg:=new(pcgalpha,init);
-{$endif alpha}
-{$ifdef powerpc}
-         cg:=new(pcgppc,init);
-{$endif powerpc}
-{$endif newcg}
 
          { If the compile level > 1 we get a nice "unit expected" error
            message if we are trying to use a program as unit.}
@@ -635,7 +618,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.35  2002-07-20 17:16:03  florian
+  Revision 1.36  2002-08-09 19:15:41  carl
+     - removed newcg define
+
+  Revision 1.35  2002/07/20 17:16:03  florian
     + source code page support
 
   Revision 1.34  2002/07/01 18:46:24  peter

+ 4 - 5
compiler/version.pas

@@ -34,11 +34,7 @@ interface
        version_nr = '1';
        release_nr = '1';
        patch_nr   = '0';
-{$ifdef newcg}
-       minorpatch = ' NCG';
-{$else newcg}
        minorpatch = '';
-{$endif newcg}
 
        { date string }
 {$ifdef FPC}
@@ -117,7 +113,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.13  2002-07-04 20:43:02  florian
+  Revision 1.14  2002-08-09 19:15:41  carl
+     - removed newcg define
+
+  Revision 1.13  2002/07/04 20:43:02  florian
     * first x86-64 patches
 
   Revision 1.12  2002/05/18 13:34:21  peter