From cf3230b100430ebd8fd63045936cb93cc09bdcd4 Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Fri, 25 Mar 2016 17:01:11 +0000
Subject: [PATCH] - removed IF_CENTAUR and replaced it with IF_CYRIX.
 Rationale: only 3 Centaur -   specific instructions were marked as CENTAUR,
 all the others were marked   CYRIX, so it wasn't an accurate flag at all

git-svn-id: trunk@33326 -
---
 compiler/i386/i386tab.inc    | 6 +++---
 compiler/i8086/i8086tab.inc  | 6 +++---
 compiler/x86/aasmcpu.pas     | 4 +---
 compiler/x86/x86ins.dat      | 8 ++++----
 compiler/x86_64/x8664tab.inc | 6 +++---
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/compiler/i386/i386tab.inc b/compiler/i386/i386tab.inc
index 59ab8c9197..d97fc4f06d 100644
--- a/compiler/i386/i386tab.inc
+++ b/compiler/i386/i386tab.inc
@@ -7677,21 +7677,21 @@
     ops     : 0;
     optypes : (ot_none,ot_none,ot_none,ot_none);
     code    : #219#3#15#166#192;
-    flags   : if_centaur
+    flags   : if_p6 or if_cyrix
   ),
   (
     opcode  : A_XSHA1;
     ops     : 0;
     optypes : (ot_none,ot_none,ot_none,ot_none);
     code    : #219#3#15#166#200;
-    flags   : if_centaur
+    flags   : if_p6 or if_cyrix
   ),
   (
     opcode  : A_XSHA256;
     ops     : 0;
     optypes : (ot_none,ot_none,ot_none,ot_none);
     code    : #219#3#15#166#208;
-    flags   : if_centaur
+    flags   : if_p6 or if_cyrix
   ),
   (
     opcode  : A_DMINT;
diff --git a/compiler/i8086/i8086tab.inc b/compiler/i8086/i8086tab.inc
index d6bb2d452d..f8f41b9b87 100644
--- a/compiler/i8086/i8086tab.inc
+++ b/compiler/i8086/i8086tab.inc
@@ -7705,21 +7705,21 @@
     ops     : 0;
     optypes : (ot_none,ot_none,ot_none,ot_none);
     code    : #219#3#15#166#192;
-    flags   : if_centaur
+    flags   : if_p6 or if_cyrix
   ),
   (
     opcode  : A_XSHA1;
     ops     : 0;
     optypes : (ot_none,ot_none,ot_none,ot_none);
     code    : #219#3#15#166#200;
-    flags   : if_centaur
+    flags   : if_p6 or if_cyrix
   ),
   (
     opcode  : A_XSHA256;
     ops     : 0;
     optypes : (ot_none,ot_none,ot_none,ot_none);
     code    : #219#3#15#166#208;
-    flags   : if_centaur
+    flags   : if_p6 or if_cyrix
   ),
   (
     opcode  : A_DMINT;
diff --git a/compiler/x86/aasmcpu.pas b/compiler/x86/aasmcpu.pas
index a490b47f87..f2364fe39a 100644
--- a/compiler/x86/aasmcpu.pas
+++ b/compiler/x86/aasmcpu.pas
@@ -460,7 +460,6 @@ implementation
        IF_WILLAMETTE = $08000000; { Willamette instructions }
        IF_PRESCOTT   = $09000000; { Prescott instructions }
        IF_X86_64 = $0a000000;
-       IF_CENTAUR = $0d000000;  { centaur-specific instruction  }
        IF_SANDYBRIDGE = $0e000000; { Sandybridge-specific instruction }
        IF_NEC    = $0f000000;  { NEC V20/V30 instruction }
 
@@ -474,7 +473,7 @@ implementation
          IF_CYRIX or IF_486,
          IF_CYRIX or IF_PENT,
          IF_CYRIX or IF_P6 }
-       IF_CYRIX  = $10000000;  { Cyrix-specific instruction  }
+       IF_CYRIX  = $10000000;  { Cyrix, Centaur or VIA-specific instruction }
        IF_AMD    = $20000000;  { AMD-specific instruction  }
 
        { added flags }
@@ -2742,7 +2741,6 @@ implementation
                 if objdata.CPUType>=cpu_386 then
                   Message(asmw_e_instruction_not_supported_by_cpu);
               { todo: handle these properly }
-              IF_CENTAUR,
               IF_SANDYBRIDGE:
                 ;
             end;
diff --git a/compiler/x86/x86ins.dat b/compiler/x86/x86ins.dat
index 9986efbdf2..92e0f84ec4 100644
--- a/compiler/x86/x86ins.dat
+++ b/compiler/x86/x86ins.dat
@@ -3011,19 +3011,19 @@ void                  \3\x0F\x01\xDE                  386,SVM,PRIV,PROT
 void                  \3\x0F\x01\xDF                  386,SVM,PRIV,PROT
 
 ;
-; Centaur
+; VIA (Centaur)
 ;
 [MONTMUL]
 (Ch_All, Ch_None, Ch_None)
-void                  \333\3\x0F\xA6\xC0              CENTAUR
+void                  \333\3\x0F\xA6\xC0              P6,CYRIX
 
 [XSHA1]
 (Ch_All, Ch_None, Ch_None)
-void                  \333\3\x0F\xA6\xC8              CENTAUR
+void                  \333\3\x0F\xA6\xC8              P6,CYRIX
 
 [XSHA256]
 (Ch_All, Ch_None, Ch_None)
-void                  \333\3\x0F\xA6\xD0              CENTAUR
+void                  \333\3\x0F\xA6\xD0              P6,CYRIX
 
 ;
 ; Geode
diff --git a/compiler/x86_64/x8664tab.inc b/compiler/x86_64/x8664tab.inc
index b4bdb0fdc5..66d9da0282 100644
--- a/compiler/x86_64/x8664tab.inc
+++ b/compiler/x86_64/x8664tab.inc
@@ -7649,21 +7649,21 @@
     ops     : 0;
     optypes : (ot_none,ot_none,ot_none,ot_none);
     code    : #219#3#15#166#192;
-    flags   : if_centaur
+    flags   : if_p6 or if_cyrix
   ),
   (
     opcode  : A_XSHA1;
     ops     : 0;
     optypes : (ot_none,ot_none,ot_none,ot_none);
     code    : #219#3#15#166#200;
-    flags   : if_centaur
+    flags   : if_p6 or if_cyrix
   ),
   (
     opcode  : A_XSHA256;
     ops     : 0;
     optypes : (ot_none,ot_none,ot_none,ot_none);
     code    : #219#3#15#166#208;
-    flags   : if_centaur
+    flags   : if_p6 or if_cyrix
   ),
   (
     opcode  : A_DMINT;