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 4f00f3273d..f57eaa2c77 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -338,7 +338,6 @@ static inline int satsw(int x) } #define FMINUB(a, b) ((a) < (b)) ? (a) : (b) -#define FMINSW(a, b) ((int16_t)(a) < (int16_t)(b)) ? (a) : (b) #define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) #define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b) @@ -358,7 +357,6 @@ static inline int satsw(int x) SSE_HELPER_B(helper_pminub, FMINUB) SSE_HELPER_B(helper_pmaxub, FMAXUB) -SSE_HELPER_W(helper_pminsw, FMINSW) SSE_HELPER_W(helper_pmaxsw, FMAXSW) SSE_HELPER_B(helper_pcmpgtb, FCMPGTB) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 829c132ae4..a7f99e5427 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -63,7 +63,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) SSE_HELPER_B(pminub, FMINUB) SSE_HELPER_B(pmaxub, FMAXUB) -SSE_HELPER_W(pminsw, FMINSW) SSE_HELPER_W(pmaxsw, FMAXSW) SSE_HELPER_B(pcmpgtb, FCMPGTB) diff --git a/target/i386/translate.c b/target/i386/translate.c index 5b19e9ac4b..d601c6d4c2 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2840,7 +2840,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] = { [0xe7] = { SSE_SPECIAL , SSE_SPECIAL }, /* movntq, movntq */ [0xe8] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xe9] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, - [0xea] = MMX_OP2(pminsw), + [0xea] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xeb] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xec] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xed] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, @@ -3196,6 +3196,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *env, DisasContext *s, #define gen_vpsubus_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (s), (modrm), (vece), tcg_gen_gvec_ussub, 0123) #define gen_vpsubus_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (s), (modrm), (vece), tcg_gen_gvec_ussub, 0123) +#define gen_pmins_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), (s), (modrm), (vece), tcg_gen_gvec_smin, 0112) +#define gen_pmins_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), (s), (modrm), (vece), tcg_gen_gvec_smin, 0112) +#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_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) @@ -3411,6 +3416,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 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; + case 0xea | M_0F | P_66 | VEX_256: gen_vpmins_ymm(env, s, modrm, MO_16); return; + case 0xdb | M_0F: gen_pand_mm(env, s, modrm); return; case 0xdb | M_0F | P_66: gen_pand_xmm(env, s, modrm); return; case 0xdb | M_0F | P_66 | VEX_128: gen_vpand_xmm(env, s, modrm); return; -- 2.20.1