From e27937106fc1062c2909ec84ef67d448ad35944a Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 24 Aug 2008 12:46:42 +0000
Subject: [PATCH] - removed obsolete USECMOV define

git-svn-id: trunk@11645 -
---
 compiler/fpcdefs.inc      |  2 --
 compiler/i386/cpupara.pas |  7 ++++++-
 compiler/i386/popt386.pas | 12 +++---------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/compiler/fpcdefs.inc b/compiler/fpcdefs.inc
index af9f3c592a..8c28329514 100644
--- a/compiler/fpcdefs.inc
+++ b/compiler/fpcdefs.inc
@@ -53,7 +53,6 @@
   {$define x86}
   {$define cpuflags}
   {$define cpuextended}
-  {$define USECMOV}
   {$define SUPPORT_MMX}
   {$define cpumm}
   {$define fewintregisters}
@@ -67,7 +66,6 @@
   {$define cpuextended}
   {$define cpufloat128}
   {$define cputargethasfixedstack}
-  {$define USECMOV}
   {$define cpumm}
 {$endif x86_64}
 
diff --git a/compiler/i386/cpupara.pas b/compiler/i386/cpupara.pas
index 4f902f7e4f..5753cf2946 100644
--- a/compiler/i386/cpupara.pas
+++ b/compiler/i386/cpupara.pas
@@ -135,6 +135,11 @@ unit cpupara;
                         exit;
                       end;
                   end;
+                procvardef:
+                  begin
+                    result:=false;
+                    exit;
+                  end;
               end;
             end;
         end;
@@ -474,7 +479,7 @@ unit cpupara;
                     if (side=callerside) or
                        (po_nostackframe in p.procoptions) then
                       paraloc^.reference.index:=NR_STACK_POINTER_REG
-                    else 
+                    else
                       paraloc^.reference.index:=NR_FRAME_POINTER_REG;
                     varalign:=used_align(size_2_align(l),paraalign,paraalign);
                     paraloc^.reference.offset:=parasize;
diff --git a/compiler/i386/popt386.pas b/compiler/i386/popt386.pas
index 636e5c5b35..e7c6361cc9 100644
--- a/compiler/i386/popt386.pas
+++ b/compiler/i386/popt386.pas
@@ -1747,7 +1747,6 @@ end;
 
 procedure PeepHoleOptPass2(asml: TAsmList; BlockStart, BlockEnd: tai);
 
-{$ifdef  USECMOV}
   function CanBeCMOV(p : tai) : boolean;
     begin
        CanBeCMOV:=assigned(p) and (p.typ=ait_instruction) and
@@ -1763,15 +1762,12 @@ procedure PeepHoleOptPass2(asml: TAsmList; BlockStart, BlockEnd: tai);
          ) and
          (taicpu(p).oper[1]^.typ in [top_reg]);
     end;
-{$endif  USECMOV}
 
 var
   p,hp1,hp2: tai;
-{$ifdef  USECMOV}
   l : longint;
   condition : tasmcond;
   hp3: tai;
-{$endif USECMOV}
   UsedRegs, TmpUsedRegs: TRegSet;
   carryadd_opcode: Tasmop;
 
@@ -1790,10 +1786,10 @@ begin
                   { jb @@1                            cmc
                     inc/dec operand           -->     adc/sbb operand,0
 		  @@1:
-		  
+		
 		  ... and ...
-		  
-                    jnb @@1                            
+		
+                    jnb @@1
                     inc/dec operand           -->     adc/sbb operand,0
 		  @@1: }
                   if GetNextInstruction(p,hp1) and (hp1.typ=ait_instruction) and
@@ -1839,7 +1835,6 @@ begin
                             end;
                         end;
                     end;
-{$ifdef USECMOV}
                   if (current_settings.cputype>=cpu_Pentium2) then
                     begin
                        { check for
@@ -1962,7 +1957,6 @@ begin
                               end;
                          end;
                     end;
-{$endif USECMOV}
                 end;
               A_FSTP,A_FISTP:
                 if doFpuLoadStoreOpt(asmL,p) then