2 files changed, 68 insertions, 4 deletions
diff --git a/src/arch/x86/isa/insts/simd128/integer/compare/compare_and_write_minimum_or_maximum.py b/src/arch/x86/isa/insts/simd128/integer/compare/compare_and_write_minimum_or_maximum.py
index d7f191506..d3bfbb529 100644
--- a/src/arch/x86/isa/insts/simd128/integer/compare/compare_and_write_minimum_or_maximum.py
+++ b/src/arch/x86/isa/insts/simd128/integer/compare/compare_and_write_minimum_or_maximum.py
@@ -94,6 +94,43 @@ def macroop PMINSW_XMM_P {
     mmini xmmh, xmmh, ufp2, size=2, ext=2
 };
 
-# PMAXUB
-# PMAXSW
+def macroop PMAXUB_XMM_XMM {
+    mmaxi xmml, xmml, xmmlm, size=1, ext=0
+    mmaxi xmmh, xmmh, xmmhm, size=1, ext=0
+};
+
+def macroop PMAXUB_XMM_M {
+    ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
+    ldfp ufp2, seg, sib, "DISPLACEMENT + 8", dataSize=8
+    mmaxi xmml, xmml, ufp1, size=1, ext=0
+    mmaxi xmmh, xmmh, ufp2, size=1, ext=0
+};
+
+def macroop PMAXUB_XMM_P {
+    rdip t7
+    ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
+    ldfp ufp2, seg, riprel, "DISPLACEMENT + 8", dataSize=8
+    mmaxi xmml, xmml, ufp1, size=1, ext=0
+    mmaxi xmmh, xmmh, ufp2, size=1, ext=0
+};
+
+def macroop PMAXSW_XMM_XMM {
+    mmaxi xmml, xmml, xmmlm, size=2, ext=2
+    mmaxi xmmh, xmmh, xmmhm, size=2, ext=2
+};
+
+def macroop PMAXSW_XMM_M {
+    ldfp ufp1, seg, sib, "DISPLACEMENT", dataSize=8
+    ldfp ufp2, seg, sib, "DISPLACEMENT + 8", dataSize=8
+    mmaxi xmml, xmml, ufp1, size=2, ext=2
+    mmaxi xmmh, xmmh, ufp2, size=2, ext=2
+};
+
+def macroop PMAXSW_XMM_P {
+    rdip t7
+    ldfp ufp1, seg, riprel, "DISPLACEMENT", dataSize=8
+    ldfp ufp2, seg, riprel, "DISPLACEMENT + 8", dataSize=8
+    mmaxi xmml, xmml, ufp1, size=2, ext=2
+    mmaxi xmmh, xmmh, ufp2, size=2, ext=2
+};
 '''
diff --git a/src/arch/x86/isa/insts/simd64/integer/compare/compare_and_write_minimum_or_maximum.py b/src/arch/x86/isa/insts/simd64/integer/compare/compare_and_write_minimum_or_maximum.py
index 34c1799b0..8d8247300 100644
--- a/src/arch/x86/isa/insts/simd64/integer/compare/compare_and_write_minimum_or_maximum.py
+++ b/src/arch/x86/isa/insts/simd64/integer/compare/compare_and_write_minimum_or_maximum.py
@@ -84,6 +84,33 @@ def macroop PMINSW_MMX_P {
     mmini mmx, mmx, ufp1, size=2, ext=2
 };
 
-# PMAXUB
-# PMAXSW
+def macroop PMAXUB_MMX_MMX {
+    mmaxi mmx, mmx, mmxm, size=1, ext=0
+};
+
+def macroop PMAXUB_MMX_M {
+    ldfp ufp1, seg, sib, disp, dataSize=8
+    mmaxi mmx, mmx, ufp1, size=1, ext=0
+};
+
+def macroop PMAXUB_MMX_P {
+    rdip t7
+    ldfp ufp1, seg, riprel, disp, dataSize=8
+    mmaxi mmx, mmx, ufp1, size=1, ext=0
+};
+
+def macroop PMAXSW_MMX_MMX {
+    mmaxi mmx, mmx, mmxm, size=2, ext=2
+};
+
+def macroop PMAXSW_MMX_M {
+    ldfp ufp1, seg, sib, disp, dataSize=8
+    mmaxi mmx, mmx, ufp1, size=2, ext=2
+};
+
+def macroop PMAXSW_MMX_P {
+    rdip t7
+    ldfp ufp1, seg, riprel, disp, dataSize=8
+    mmaxi mmx, mmx, ufp1, size=2, ext=2
+};
 '''