X86: Create a common flag with a name to indicate scalar media instructions.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/arch/x86/isa/insts/simd128/floating_point/data_conversion/convert_floating_point_to_gpr_integer.py b/src/arch/x86/isa/insts/simd128/floating_point/data_conversion/convert_floating_point_to_gpr_integer.py
index 16abd96f4..0b7ca5c5b 100644
--- a/src/arch/x86/isa/insts/simd128/floating_point/data_conversion/convert_floating_point_to_gpr_integer.py
+++ b/src/arch/x86/isa/insts/simd128/floating_point/data_conversion/convert_floating_point_to_gpr_integer.py
@@ -55,74 +55,74 @@
 
 microcode = '''
 def macroop CVTSS2SI_R_XMM {
-    cvtf2i ufp1, xmmlm, srcSize=4, destSize=dsz, ext=(1 | 4)
+    cvtf2i ufp1, xmmlm, srcSize=4, destSize=dsz, ext = Scalar + "| 4"
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTSS2SI_R_M {
     ldfp ufp1, seg, sib, disp, dataSize=8
-    cvtf2i ufp1, ufp1, srcSize=4, destSize=dsz, ext=(1 | 4)
+    cvtf2i ufp1, ufp1, srcSize=4, destSize=dsz, ext = Scalar + "| 4"
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTSS2SI_R_P {
     rdip t7
     ldfp ufp1, seg, riprel, disp, dataSize=8
-    cvtf2i ufp1, ufp1, srcSize=4, destSize=dsz, ext=(1 | 4)
+    cvtf2i ufp1, ufp1, srcSize=4, destSize=dsz, ext = Scalar + "| 4"
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTSD2SI_R_XMM {
-    cvtf2i ufp1, xmmlm, srcSize=8, destSize=dsz, ext=(1 | 4)
+    cvtf2i ufp1, xmmlm, srcSize=8, destSize=dsz, ext = Scalar + "| 4"
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTSD2SI_R_M {
     ldfp ufp1, seg, sib, disp, dataSize=8
-    cvtf2i ufp1, ufp1, srcSize=8, destSize=dsz, ext=(1 | 4)
+    cvtf2i ufp1, ufp1, srcSize=8, destSize=dsz, ext = Scalar + "| 4"
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTSD2SI_R_P {
     rdip t7
     ldfp ufp1, seg, riprel, disp, dataSize=8
-    cvtf2i ufp1, ufp1, srcSize=8, destSize=dsz, ext=(1 | 4)
+    cvtf2i ufp1, ufp1, srcSize=8, destSize=dsz, ext = Scalar + "| 4"
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTTSS2SI_R_XMM {
-    cvtf2i ufp1, xmmlm, srcSize=4, destSize=dsz, ext=1
+    cvtf2i ufp1, xmmlm, srcSize=4, destSize=dsz, ext=Scalar
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTTSS2SI_R_M {
     ldfp ufp1, seg, sib, disp, dataSize=8
-    cvtf2i ufp1, ufp1, srcSize=4, destSize=dsz, ext=1
+    cvtf2i ufp1, ufp1, srcSize=4, destSize=dsz, ext=Scalar
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTTSS2SI_R_P {
     rdip t7
     ldfp ufp1, seg, riprel, disp, dataSize=8
-    cvtf2i ufp1, ufp1, srcSize=4, destSize=dsz, ext=1
+    cvtf2i ufp1, ufp1, srcSize=4, destSize=dsz, ext=Scalar
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTTSD2SI_R_XMM {
-    cvtf2i ufp1, xmmlm, srcSize=8, destSize=dsz, ext=1
+    cvtf2i ufp1, xmmlm, srcSize=8, destSize=dsz, ext=Scalar
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTTSD2SI_R_M {
     ldfp ufp1, seg, sib, disp, dataSize=8
-    cvtf2i ufp1, ufp1, srcSize=8, destSize=dsz, ext=1
+    cvtf2i ufp1, ufp1, srcSize=8, destSize=dsz, ext=Scalar
     mov2int reg, ufp1, size=dsz
 };
 
 def macroop CVTTSD2SI_R_P {
     rdip t7
     ldfp ufp1, seg, riprel, disp, dataSize=8
-    cvtf2i ufp1, ufp1, srcSize=8, destSize=dsz, ext=1
+    cvtf2i ufp1, ufp1, srcSize=8, destSize=dsz, ext=Scalar
     mov2int reg, ufp1, size=dsz
 };
 '''