瀏覽代碼

- removed ppc-specific tcgpara.composite field, it's no longer used or
necessary

git-svn-id: trunk@23581 -

Jonas Maebe 12 年之前
父節點
當前提交
2b78bb1674
共有 4 個文件被更改,包括 1 次插入28 次删除
  1. 0 18
      compiler/parabase.pas
  2. 0 6
      compiler/paramgr.pas
  3. 0 3
      compiler/powerpc/cpupara.pas
  4. 1 1
      compiler/ppu.pas

+ 0 - 18
compiler/parabase.pas

@@ -80,9 +80,6 @@ unit parabase;
           Alignment : ShortInt;
           Alignment : ShortInt;
           Size      : TCGSize;  { Size of the parameter included in all locations }
           Size      : TCGSize;  { Size of the parameter included in all locations }
           Temporary : boolean;  { created on the fly, no permanent references exist to this somewhere that will cause it to be disposed }
           Temporary : boolean;  { created on the fly, no permanent references exist to this somewhere that will cause it to be disposed }
-{$ifdef powerpc}
-          composite: boolean; { under the AIX abi, how certain parameters are passed depends on whether they are composite or not }
-{$endif powerpc}
           constructor init;
           constructor init;
           destructor  done;
           destructor  done;
           procedure   reset;
           procedure   reset;
@@ -135,9 +132,6 @@ implementation
         location:=nil;
         location:=nil;
         def:=nil;
         def:=nil;
         temporary:=false;
         temporary:=false;
-{$ifdef powerpc}
-        composite:=false;
-{$endif powerpc}
       end;
       end;
 
 
 
 
@@ -160,9 +154,6 @@ implementation
         alignment:=0;
         alignment:=0;
         size:=OS_NO;
         size:=OS_NO;
         intsize:=0;
         intsize:=0;
-{$ifdef powerpc}
-        composite:=false;
-{$endif powerpc}
       end;
       end;
 
 
     procedure TCGPara.resetiftemp;
     procedure TCGPara.resetiftemp;
@@ -187,9 +178,6 @@ implementation
         result.alignment:=alignment;
         result.alignment:=alignment;
         result.size:=size;
         result.size:=size;
         result.intsize:=intsize;
         result.intsize:=intsize;
-{$ifdef powerpc}
-        result.composite:=composite;
-{$endif powerpc}
       end;
       end;
 
 
 
 
@@ -289,9 +277,6 @@ implementation
         ppufile.putbyte(byte(Alignment));
         ppufile.putbyte(byte(Alignment));
         ppufile.putbyte(ord(Size));
         ppufile.putbyte(ord(Size));
         ppufile.putaint(IntSize);
         ppufile.putaint(IntSize);
-{$ifdef powerpc}
-        ppufile.putbyte(byte(composite));
-{$endif}
         ppufile.putderef(defderef);
         ppufile.putderef(defderef);
         nparaloc:=0;
         nparaloc:=0;
         hparaloc:=location;
         hparaloc:=location;
@@ -345,9 +330,6 @@ implementation
         Alignment:=shortint(ppufile.getbyte);
         Alignment:=shortint(ppufile.getbyte);
         Size:=TCgSize(ppufile.getbyte);
         Size:=TCgSize(ppufile.getbyte);
         IntSize:=ppufile.getaint;
         IntSize:=ppufile.getaint;
-{$ifdef powerpc}
-        composite:=boolean(ppufile.getbyte);
-{$endif}
         ppufile.getderef(defderef);
         ppufile.getderef(defderef);
         nparaloc:=ppufile.getbyte;
         nparaloc:=ppufile.getbyte;
         while nparaloc>0 do
         while nparaloc>0 do

+ 0 - 6
compiler/paramgr.pas

@@ -383,9 +383,6 @@ implementation
         cgpara.intsize:=parasym.paraloc[callerside].intsize;
         cgpara.intsize:=parasym.paraloc[callerside].intsize;
         cgpara.alignment:=parasym.paraloc[callerside].alignment;
         cgpara.alignment:=parasym.paraloc[callerside].alignment;
         cgpara.def:=parasym.paraloc[callerside].def;
         cgpara.def:=parasym.paraloc[callerside].def;
-{$ifdef powerpc}
-        cgpara.composite:=parasym.paraloc[callerside].composite;
-{$endif powerpc}
         while assigned(paraloc) do
         while assigned(paraloc) do
           begin
           begin
             if paraloc^.size=OS_NO then
             if paraloc^.size=OS_NO then
@@ -453,9 +450,6 @@ implementation
         cgpara.size:=parasym.paraloc[callerside].size;
         cgpara.size:=parasym.paraloc[callerside].size;
         cgpara.intsize:=parasym.paraloc[callerside].intsize;
         cgpara.intsize:=parasym.paraloc[callerside].intsize;
         cgpara.alignment:=parasym.paraloc[callerside].alignment;
         cgpara.alignment:=parasym.paraloc[callerside].alignment;
-{$ifdef powerpc}
-        cgpara.composite:=parasym.paraloc[callerside].composite;
-{$endif powerpc}
         paraloc:=parasym.paraloc[callerside].location;
         paraloc:=parasym.paraloc[callerside].location;
         while assigned(paraloc) do
         while assigned(paraloc) do
           begin
           begin

+ 0 - 3
compiler/powerpc/cpupara.pas

@@ -430,9 +430,6 @@ unit cpupara;
               hp.paraloc[side].size:=paracgsize;
               hp.paraloc[side].size:=paracgsize;
               hp.paraloc[side].intsize:=paralen;
               hp.paraloc[side].intsize:=paralen;
               hp.paraloc[side].def:=paradef;
               hp.paraloc[side].def:=paradef;
-              if (target_info.abi = abi_powerpc_aix) and
-                 (paradef.typ in [recorddef,arraydef]) then
-                hp.paraloc[side].composite:=true;
 {$ifndef cpu64bitaddr}
 {$ifndef cpu64bitaddr}
               if (target_info.abi=abi_powerpc_sysv) and
               if (target_info.abi=abi_powerpc_sysv) and
                  is_64bit(paradef) and
                  is_64bit(paradef) and

+ 1 - 1
compiler/ppu.pas

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