Use the gvec infrastructure to achieve the desired functionality.
Signed-off-by: Jan Bobek <jan.bo...@gmail.com>
---
target/i386/ops_sse.h | 2 --
target/i386/ops_sse_header.h | 1 -
target/i386/translate.c | 12 +++++++++++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h
index f57eaa2c77..058ed5cdfc 100644
--- a/target/i386/ops_sse.h
+++ b/target/i386/ops_sse.h
@@ -337,7 +337,6 @@ static inline int satsw(int x)
}
}
-#define FMINUB(a, b) ((a) < (b)) ? (a) : (b)
#define FMAXUB(a, b) ((a) > (b)) ? (a) : (b)
#define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b)
@@ -354,7 +353,6 @@ static inline int satsw(int x)
#define FAVG(a, b) (((a) + (b) + 1) >> 1)
#endif
-SSE_HELPER_B(helper_pminub, FMINUB)
SSE_HELPER_B(helper_pmaxub, FMAXUB)
SSE_HELPER_W(helper_pmaxsw, FMAXSW)
diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h
index a7f99e5427..3d0e321230 100644
--- a/target/i386/ops_sse_header.h
+++ b/target/i386/ops_sse_header.h
@@ -60,7 +60,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg)
#define SSE_HELPER_Q(name, F)\
DEF_HELPER_3(glue(name, SUFFIX), void, env, Reg, Reg)
-SSE_HELPER_B(pminub, FMINUB)
SSE_HELPER_B(pmaxub, FMAXUB)
SSE_HELPER_W(pmaxsw, FMAXSW)
diff --git a/target/i386/translate.c b/target/i386/translate.c
index d601c6d4c2..893fe1253f 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -2824,7 +2824,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] = {
[0xd7] = { SSE_SPECIAL, SSE_SPECIAL }, /* pmovmskb */
[0xd8] = { SSE_TOMBSTONE, SSE_TOMBSTONE },
[0xd9] = { SSE_TOMBSTONE, SSE_TOMBSTONE },
- [0xda] = MMX_OP2(pminub),
+ [0xda] = { SSE_TOMBSTONE, SSE_TOMBSTONE },
[0xdb] = { SSE_TOMBSTONE, SSE_TOMBSTONE },
[0xdc] = { SSE_TOMBSTONE, SSE_TOMBSTONE },
[0xdd] = { SSE_TOMBSTONE, SSE_TOMBSTONE },
@@ -3201,6 +3201,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *env,
DisasContext *s,
#define gen_vpmins_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (s),
(modrm), (vece), tcg_gen_gvec_smin, 0123)
#define gen_vpmins_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (s),
(modrm), (vece), tcg_gen_gvec_smin, 0123)
+#define gen_pminu_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), (s),
(modrm), (vece), tcg_gen_gvec_umin, 0112)
+#define gen_pminu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), (s),
(modrm), (vece), tcg_gen_gvec_umin, 0112)
+#define gen_vpminu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (s),
(modrm), (vece), tcg_gen_gvec_umin, 0123)
+#define gen_vpminu_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (s),
(modrm), (vece), tcg_gen_gvec_umin, 0123)
+
#define gen_pand_mm(env, s, modrm) gen_gvec_ld_modrm_mm ((env), (s),
(modrm), MO_64, tcg_gen_gvec_and, 0112)
#define gen_pand_xmm(env, s, modrm) gen_gvec_ld_modrm_xmm ((env), (s),
(modrm), MO_64, tcg_gen_gvec_and, 0112)
#define gen_vpand_xmm(env, s, modrm) gen_gvec_ld_modrm_vxmm((env), (s),
(modrm), MO_64, tcg_gen_gvec_and, 0123)
@@ -3416,6 +3421,11 @@ static void gen_sse(CPUX86State *env, DisasContext *s,
int b)
case 0xe9 | M_0F | P_66 | VEX_128: gen_vpsubs_xmm(env, s, modrm, MO_16);
return;
case 0xe9 | M_0F | P_66 | VEX_256: gen_vpsubs_ymm(env, s, modrm, MO_16);
return;
+ case 0xda | M_0F: gen_pminu_mm(env, s, modrm, MO_8);
return;
+ case 0xda | M_0F | P_66: gen_pminu_xmm(env, s, modrm, MO_8);
return;
+ case 0xda | M_0F | P_66 | VEX_128: gen_vpminu_xmm(env, s, modrm, MO_8);
return;
+ case 0xda | M_0F | P_66 | VEX_256: gen_vpminu_ymm(env, s, modrm, MO_8);
return;
+
case 0xea | M_0F: gen_pmins_mm(env, s, modrm, MO_16);
return;
case 0xea | M_0F | P_66: gen_pmins_xmm(env, s, modrm, MO_16);
return;
case 0xea | M_0F | P_66 | VEX_128: gen_vpmins_xmm(env, s, modrm, MO_16);
return;
--
2.20.1
