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

git-svn-id: trunk@25586 -
This commit is contained in:
svenbarth 2013-09-27 20:54:54 +00:00
parent 8e107217f6
commit dfb0c7da24

View File

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