2 files changed, 18 insertions, 18 deletions

diff --git a/src/arch/x86/isa/insts/simd128/floating_point/compare/compare_and_write_mask.py b/src/arch/x86/isa/insts/simd128/floating_point/compare/compare_and_write_mask.py
index 09c34600b..e4449be10 100644
--- a/src/arch/x86/isa/insts/simd128/floating_point/compare/compare_and_write_mask.py
+++ b/src/arch/x86/isa/insts/simd128/floating_point/compare/compare_and_write_mask.py
@@ -95,32 +95,32 @@ def macroop CMPPD_XMM_P_I {
 };
 
 def macroop CMPSS_XMM_XMM_I {
-    mcmpf2r xmml, xmml, xmmlm, size=4, ext="IMMEDIATE | 0x8"
+    mcmpf2r xmml, xmml, xmmlm, size=4, ext="IMMEDIATE |" + Scalar
 };
 
 def macroop CMPSS_XMM_M_I {
     ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
-    mcmpf2r xmml, xmml, ufp1, size=4, ext="IMMEDIATE | 0x8"
+    mcmpf2r xmml, xmml, ufp1, size=4, ext="IMMEDIATE |" + Scalar
 };
 
 def macroop CMPSS_XMM_P_I {
     rdip t7
     ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
-    mcmpf2r xmml, xmml, ufp1, size=4, ext="IMMEDIATE | 0x8"
+    mcmpf2r xmml, xmml, ufp1, size=4, ext="IMMEDIATE |" + Scalar
 };
 
 def macroop CMPSD_XMM_XMM_I {
-    mcmpf2r xmml, xmml, xmmlm, size=8, ext="IMMEDIATE | 0x8"
+    mcmpf2r xmml, xmml, xmmlm, size=8, ext="IMMEDIATE |" + Scalar
 };
 
 def macroop CMPSD_XMM_M_I {
     ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
-    mcmpf2r xmml, xmml, ufp1, size=8, ext="IMMEDIATE | 0x8"
+    mcmpf2r xmml, xmml, ufp1, size=8, ext="IMMEDIATE |" + Scalar
 };
 
 def macroop CMPSD_XMM_P_I {
     rdip t7
     ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
-    mcmpf2r xmml, xmml, ufp1, size=8, ext="IMMEDIATE | 0x8"
+    mcmpf2r xmml, xmml, ufp1, size=8, ext="IMMEDIATE |" + Scalar
 };
 '''
diff --git a/src/arch/x86/isa/insts/simd128/floating_point/compare/compare_and_write_minimum_or_maximum.py b/src/arch/x86/isa/insts/simd128/floating_point/compare/compare_and_write_minimum_or_maximum.py
index 17c97662c..0a62ce343 100644
--- a/src/arch/x86/isa/insts/simd128/floating_point/compare/compare_and_write_minimum_or_maximum.py
+++ b/src/arch/x86/isa/insts/simd128/floating_point/compare/compare_and_write_minimum_or_maximum.py
@@ -95,33 +95,33 @@ def macroop MINPD_XMM_P {
 };
 
 def macroop MINSS_XMM_XMM {
-    mminf xmml, xmml, xmmlm, ext=1, size=4
+    mminf xmml, xmml, xmmlm, ext=Scalar, size=4
 };
 
 def macroop MINSS_XMM_M {
     ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
-    mminf xmml, xmml, ufp1, ext=1, size=4
+    mminf xmml, xmml, ufp1, ext=Scalar, size=4
 };
 
 def macroop MINSS_XMM_P {
     rdip t7
     ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
-    mminf xmml, xmml, ufp1, ext=1, size=4
+    mminf xmml, xmml, ufp1, ext=Scalar, size=4
 };
 
 def macroop MINSD_XMM_XMM {
-    mminf xmml, xmml, xmmlm, ext=1, size=8
+    mminf xmml, xmml, xmmlm, ext=Scalar, size=8
 };
 
 def macroop MINSD_XMM_M {
     ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
-    mminf xmml, xmml, ufp1, ext=1, size=8
+    mminf xmml, xmml, ufp1, ext=Scalar, size=8
 };
 
 def macroop MINSD_XMM_P {
     rdip t7
     ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
-    mminf xmml, xmml, ufp1, ext=1, size=8
+    mminf xmml, xmml, ufp1, ext=Scalar, size=8
 };
 
 def macroop MAXPS_XMM_XMM {
@@ -165,32 +165,32 @@ def macroop MAXPD_XMM_P {
 };
 
 def macroop MAXSS_XMM_XMM {
-    mmaxf xmml, xmml, xmmlm, ext=1, size=4
+    mmaxf xmml, xmml, xmmlm, ext=Scalar, size=4
 };
 
 def macroop MAXSS_XMM_M {
     ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
-    mmaxf xmml, xmml, ufp1, ext=1, size=4
+    mmaxf xmml, xmml, ufp1, ext=Scalar, size=4
 };
 
 def macroop MAXSS_XMM_P {
     rdip t7
     ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
-    mmaxf xmml, xmml, ufp1, ext=1, size=4
+    mmaxf xmml, xmml, ufp1, ext=Scalar, size=4
 };
 
 def macroop MAXSD_XMM_XMM {
-    mmaxf xmml, xmml, xmmlm, ext=1, size=8
+    mmaxf xmml, xmml, xmmlm, ext=Scalar, size=8
 };
 
 def macroop MAXSD_XMM_M {
     ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
-    mmaxf xmml, xmml, ufp1, ext=1, size=8
+    mmaxf xmml, xmml, ufp1, ext=Scalar, size=8
 };
 
 def macroop MAXSD_XMM_P {
     rdip t7
     ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
-    mmaxf xmml, xmml, ufp1, ext=1, size=8
+    mmaxf xmml, xmml, ufp1, ext=Scalar, size=8
 };
 '''