ソースを参照

* merged some code which was ifdefed separately for POWERPC and POWERPC64 code but is equal

git-svn-id: trunk@6383 -
tom_at_work 18 年 前
コミット
99bc1ccb75
3 ファイル変更6 行追加26 行削除
  1. 2 5
      compiler/psub.pas
  2. 1 14
      compiler/raatt.pas
  3. 3 7
      compiler/tgobj.pas

+ 2 - 5
compiler/psub.pas

@@ -1021,12 +1021,9 @@ implementation
             current_filepos:=exitpos;
             gen_proc_symbol_end(templist);
             aktproccode.concatlist(templist);
-{$ifdef POWERPC}
+{$if defined(POWERPC) or defined(POWERPC64)}
             fixup_jmps(aktproccode);
-{$endif POWERPC}
-{$ifdef POWERPC64}
-            fixup_jmps(aktproccode);
-{$endif POWERPC64}
+{$endif}
             { insert line debuginfo }
             if (cs_debuginfo in current_settings.moduleswitches) or
                (cs_use_lineinfo in current_settings.globalswitches) then

+ 1 - 14
compiler/raatt.pas

@@ -245,7 +245,7 @@ unit raatt;
               firsttoken:=true;
               exit;
             end;
-{$ifdef POWERPC}
+{$if defined(POWERPC) or defined(POWERPC64)}
            { some PowerPC instructions can have the postfix -, + or .
              this code could be moved to is_asmopcode but I think
              it's better to ifdef it here (FK)
@@ -258,19 +258,6 @@ unit raatt;
                end
            end;
 {$endif POWERPC}
-{$ifdef POWERPC64}
-           { some PowerPC instructions can have the postfix -, + or .
-             this code could be moved to is_asmopcode but I think
-             it's better to ifdef it here (FK)
-           }
-           case c of
-             '.', '-', '+':
-               begin
-                 actasmpattern:=actasmpattern+c;
-                 c:=current_scanner.asmgetchar;
-               end
-           end;
-{$endif POWERPC64}
            { Opcode ? }
            If is_asmopcode(upper(actasmpattern)) then
             Begin

+ 3 - 7
compiler/tgobj.pas

@@ -159,15 +159,11 @@ implementation
        tempfreelist:=nil;
        templist:=nil;
        { we could create a new child class for this but I don't if it is worth the effort (FK) }
-{$ifdef powerpc}
+{$if defined(powerpc) or defined(powerpc64)}
        direction:=1;
-{$else powerpc}
-{$ifdef POWERPC64}
-       direction:=1;
-{$else POWERPC64}
+{$else}
        direction:=-1;
-{$endif POWERPC64}
-{$endif powerpc}
+{$endif}
      end;