From d55dbf92d3bebc48b04e0ac905ee03d8f9f619ed Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 18 Mar 2007 17:35:22 +0000
Subject: [PATCH] * fixed assembling of cvt(t)ss2si

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

diff --git a/compiler/i386/i386tab.inc b/compiler/i386/i386tab.inc
index 85d05afad9..fa838014af 100644
--- a/compiler/i386/i386tab.inc
+++ b/compiler/i386/i386tab.inc
@@ -7158,14 +7158,14 @@
     opcode  : A_CVTSS2SI;
     ops     : 2;
     optypes : (ot_reg32 or ot_bits64,ot_memory,ot_none);
-    code    : #193#219#208#2#15#45#72;
+    code    : #219#193#208#2#15#45#72;
     flags   : if_katmai or if_sse
   ),
   (
     opcode  : A_CVTSS2SI;
     ops     : 2;
     optypes : (ot_reg32 or ot_bits64,ot_xmmreg,ot_none);
-    code    : #211#219#208#2#15#45#72;
+    code    : #219#211#208#2#15#45#72;
     flags   : if_katmai or if_sse
   ),
   (
@@ -7186,14 +7186,14 @@
     opcode  : A_CVTTSS2SI;
     ops     : 2;
     optypes : (ot_reg32 or ot_bits64,ot_memory,ot_none);
-    code    : #193#219#208#2#15#44#72;
+    code    : #219#193#208#2#15#44#72;
     flags   : if_katmai or if_sse
   ),
   (
     opcode  : A_CVTTSS2SI;
     ops     : 2;
     optypes : (ot_reg32 or ot_bits64,ot_xmmreg,ot_none);
-    code    : #211#219#208#2#15#44#72;
+    code    : #219#211#208#2#15#44#72;
     flags   : if_katmai or if_sse
   ),
   (
diff --git a/compiler/x86/aasmcpu.pas b/compiler/x86/aasmcpu.pas
index f55afef9d5..dfe0df3dd2 100644
--- a/compiler/x86/aasmcpu.pas
+++ b/compiler/x86/aasmcpu.pas
@@ -2176,11 +2176,11 @@ implementation
               end;
             219 :
               begin
+                bytes[0]:=$f3;
+                objdata.writebytes(bytes,1);
 {$ifdef x86_64}
                 maybewriterex;
 {$endif x86_64}
-                bytes[0]:=$f3;
-                objdata.writebytes(bytes,1);
               end;
             220 :
               begin
diff --git a/compiler/x86/x86ins.dat b/compiler/x86/x86ins.dat
index 1c22285371..c47b9268ab 100644
--- a/compiler/x86/x86ins.dat
+++ b/compiler/x86/x86ins.dat
@@ -2302,8 +2302,8 @@ xmmreg,reg32|64       \323\333\321\2\x0F\x2A\110      KATMAI,SSE
 
 [CVTSS2SI]
 (Ch_Wop2, Ch_Rop1, Ch_None)
-reg32|64,mem          \301\333\320\2\x0F\x2D\110      KATMAI,SSE
-reg32|64,xmmreg       \323\333\320\2\x0F\x2D\110      KATMAI,SSE
+reg32|64,mem          \333\301\320\2\x0F\x2D\110      KATMAI,SSE
+reg32|64,xmmreg       \333\323\320\2\x0F\x2D\110      KATMAI,SSE
 
 [CVTTPS2PI]
 (Ch_Wop2, Ch_Rop1, Ch_None)
@@ -2312,8 +2312,8 @@ mmxreg,xmmreg         \323\331\2\x0F\x2C\110          KATMAI,SSE,MMX
 
 [CVTTSS2SI]
 (Ch_Wop2, Ch_Rop1, Ch_None)
-reg32|64,mem          \301\333\320\2\x0F\x2C\110      KATMAI,SSE
-reg32|64,xmmreg       \323\333\320\2\x0F\x2C\110      KATMAI,SSE
+reg32|64,mem          \333\301\320\2\x0F\x2C\110      KATMAI,SSE
+reg32|64,xmmreg       \333\323\320\2\x0F\x2C\110      KATMAI,SSE
 
 [DIVPS]
 (Ch_Mop2, Ch_Rop1, Ch_None)
diff --git a/compiler/x86_64/x8664tab.inc b/compiler/x86_64/x8664tab.inc
index 4627e9a629..e3c84d5b37 100644
--- a/compiler/x86_64/x8664tab.inc
+++ b/compiler/x86_64/x8664tab.inc
@@ -7116,14 +7116,14 @@
     opcode  : A_CVTSS2SI;
     ops     : 2;
     optypes : (ot_reg32 or ot_bits64,ot_memory,ot_none);
-    code    : #193#219#208#2#15#45#72;
+    code    : #219#193#208#2#15#45#72;
     flags   : if_katmai or if_sse
   ),
   (
     opcode  : A_CVTSS2SI;
     ops     : 2;
     optypes : (ot_reg32 or ot_bits64,ot_xmmreg,ot_none);
-    code    : #211#219#208#2#15#45#72;
+    code    : #219#211#208#2#15#45#72;
     flags   : if_katmai or if_sse
   ),
   (
@@ -7144,14 +7144,14 @@
     opcode  : A_CVTTSS2SI;
     ops     : 2;
     optypes : (ot_reg32 or ot_bits64,ot_memory,ot_none);
-    code    : #193#219#208#2#15#44#72;
+    code    : #219#193#208#2#15#44#72;
     flags   : if_katmai or if_sse
   ),
   (
     opcode  : A_CVTTSS2SI;
     ops     : 2;
     optypes : (ot_reg32 or ot_bits64,ot_xmmreg,ot_none);
-    code    : #211#219#208#2#15#44#72;
+    code    : #219#211#208#2#15#44#72;
     flags   : if_katmai or if_sse
   ),
   (