Forgot to commit this the last time: Use CPUM68K_HAS_DBRA instead of CPUCOLDFIRE (which does not exist anymore).

git-svn-id: trunk@25586 -

rtl/m68k/m68k.inc

@@ -108,12 +108,12 @@ procedure FillChar(var x;count:longint;value:byte); assembler;
    @LMEMSET4:             { fast loop mode section 68010+ }
      move.b d0,(a0)+
    @LMEMSET3:
-{$ifdef CPUCOLDFIRE}
+{$ifndef CPUM68K_HAS_DBRA}
      sub.l #1,d1
      bmi @LMEMSET4
-{$else}
+{$else CPUM68K_HAS_DBRA}
      dbra d1,@LMEMSET4
-{$endif}
+{$endif CPUM68K_HAS_DBRA}
 
    @LMEMSET5:
     end ['d0','d1','a0'];
@@ -155,12 +155,12 @@ asm
 @LMSTRCOPY56:         { 68010 Fast loop mode }
    move.b (a0)+,(a1)+
 @LMSTRCOPY55:
-{$ifdef CPUCOLDFIRE}
+{$ifndef CPUM68K_HAS_DBRA}
    sub.l #1,d1
    bmi @LMSTRCOPY56
-{$else}
+{$else CPUM68K_HAS_DBRA}
    dbra  d1,@LMSTRCOPY56
-{$endif}
+{$endif CPUM68K_HAS_DBRA}
 @Lend:
 end;
 
@@ -195,12 +195,12 @@ procedure strconcat(s1,s2 : pointer);[public,alias: 'STRCONCAT'];
 @Loop:
       move.b  (a1)+,(a0)+          { s1[i] := s2[i];             }
 @ALoop:
-{$ifdef CPUCOLDFIRE}
+{$ifndef CPUM68K_HAS_DBRA}
       sub.l   #1,d6
       bmi     @Loop
-{$else}
+{$else CPUM68K_HAS_DBRA}
       dbra    d6,@Loop
-{$endif}
+{$endif CPUM68K_HAS_DBRA}
       move.l  s1,a0
       add.b   d0,(a0)              { change to new string length }
 @Lend:
@@ -268,10 +268,10 @@ begin
     move.l   dest, a1    {  destination          }
     move.l   source, a0  {  source               }
 
-{$ifndef CPUCOLDFIRE}
+{$ifdef CPUM68K_HAS_DBRA}
     cmpi.l #65535, d0     { check, if this is a word move }
     ble    @LMEMSET00     { use fast dbra mode 68010+     }
-{$endif CPUCOLDFIRE}
+{$endif CPUM68K_HAS_DBRA}
 
     cmp.l      a0,a1         {  check copy direction }
     bls      @LMOVE4
@@ -293,7 +293,7 @@ begin
     bne       @LMOVE3
     bra       @LMOVE5
 
-{$ifndef CPUCOLDFIRE}
+{$ifdef CPUM68K_HAS_DBRA}
   @LMEMSET00:            { use fast loop mode 68010+ }
     cmp.l      a0,a1         {  check copy direction }
     bls      @LMOVE04
@@ -309,7 +309,7 @@ begin
     move.b  (a0)+,(a1)+  { (s >= d) copy loop }
   @LMOVE04:
     dbra      d0,@LMOVE03
-{$endif CPUCOLDFIRE}
+{$endif CPUM68K_HAS_DBRA}
   { end fast loop mode }
   @LMOVE5:
   end ['d0','a0','a1'];