diff --git a/src/arch/x86/isa/decoder/two_byte_opcodes.isa b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
index 6a18e6c62..4c608264c 100644
--- a/src/arch/x86/isa/decoder/two_byte_opcodes.isa
+++ b/src/arch/x86/isa/decoder/two_byte_opcodes.isa
@@ -511,7 +511,7 @@
                     0x4: subps_Vo_Wo();
                     0x5: Inst::MINPS(Vo,Wo);
                     0x6: divps_Vo_Wo();
-                    0x7: maxps_Vo_Wo();
+                    0x7: Inst::MAXPS(Vo,Wo);
                 }
                 // repe (0xF3)
                 0x4: decode OPCODE_OP_BOTTOM3 {
@@ -522,7 +522,7 @@
                     0x4: subss_Vd_Wd();
                     0x5: Inst::MINSS(Vd,Wd);
                     0x6: divss_Vd_Wd();
-                    0x7: maxss_Vd_Wd();
+                    0x7: Inst::MAXSS(Vd,Wd);
                 }
                 // operand size (0x66)
                 0x1: decode OPCODE_OP_BOTTOM3 {
@@ -533,7 +533,7 @@
                     0x4: subpd_Vo_Wo();
                     0x5: Inst::MINPD(Vo,Wo);
                     0x6: divpd_Vo_Wo();
-                    0x7: maxpd_Vo_Wo();
+                    0x7: Inst::MAXPD(Vo,Wo);
                 }
                 // repne (0xF2)
                 0x8: decode OPCODE_OP_BOTTOM3 {
@@ -543,7 +543,7 @@
                     0x4: Inst::SUBSD(Vq,Wq);
                     0x5: Inst::MINSD(Vq,Wq);
                     0x6: Inst::DIVSD(Vq,Wq);
-                    0x7: maxsd_Vq_Wq();
+                    0x7: Inst::MAXSD(Vq,Wq);
                     default: Inst::UD2();
                 }
                 default: Inst::UD2();
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 5c4db2b69..17c97662c 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
@@ -123,8 +123,74 @@ def macroop MINSD_XMM_P {
     ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
     mminf xmml, xmml, ufp1, ext=1, size=8
 };
+
+def macroop MAXPS_XMM_XMM {
+    mmaxf xmml, xmml, xmmlm, ext=0, size=4
+    mmaxf xmmh, xmmh, xmmhm, ext=0, size=4
+};
+
+def macroop MAXPS_XMM_M {
+    ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
+    ldfp ufp2, seg, sib, "DISPLACEMENT + 8", dataSize=8
+    mmaxf xmml, xmml, ufp1, ext=0, size=4
+    mmaxf xmmh, xmmh, ufp2, ext=0, size=4
+};
+
+def macroop MAXPS_XMM_P {
+    rdip t7
+    ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
+    ldfp ufp2, seg, riprel, "DISPLACEMENT + 8", dataSize=8
+    mmaxf xmml, xmml, ufp1, ext=0, size=4
+    mmaxf xmmh, xmmh, ufp2, ext=0, size=4
+};
+
+def macroop MAXPD_XMM_XMM {
+    mmaxf xmml, xmml, xmmlm, ext=0, size=8
+    mmaxf xmmh, xmmh, xmmhm, ext=0, size=8
+};
+
+def macroop MAXPD_XMM_M {
+    ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
+    ldfp ufp2, seg, sib, "DISPLACEMENT + 8", dataSize=8
+    mmaxf xmml, xmml, ufp1, ext=0, size=8
+    mmaxf xmmh, xmmh, ufp2, ext=0, size=8
+};
+
+def macroop MAXPD_XMM_P {
+    rdip t7
+    ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
+    ldfp ufp2, seg, riprel, "DISPLACEMENT + 8", dataSize=8
+    mmaxf xmml, xmml, ufp1, ext=0, size=8
+    mmaxf xmmh, xmmh, ufp2, ext=0, size=8
+};
+
+def macroop MAXSS_XMM_XMM {
+    mmaxf xmml, xmml, xmmlm, ext=1, size=4
+};
+
+def macroop MAXSS_XMM_M {
+    ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
+    mmaxf xmml, xmml, ufp1, ext=1, size=4
+};
+
+def macroop MAXSS_XMM_P {
+    rdip t7
+    ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
+    mmaxf xmml, xmml, ufp1, ext=1, size=4
+};
+
+def macroop MAXSD_XMM_XMM {
+    mmaxf xmml, xmml, xmmlm, ext=1, size=8
+};
+
+def macroop MAXSD_XMM_M {
+    ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
+    mmaxf xmml, xmml, ufp1, ext=1, size=8
+};
+
+def macroop MAXSD_XMM_P {
+    rdip t7
+    ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
+    mmaxf xmml, xmml, ufp1, ext=1, size=8
+};
 '''
-# MAXPS
-# MAXPD
-# MAXSS
-# MAXSD