Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek <jan.bo...@gmail.com> --- target/i386/ops_sse.h | 3 --- target/i386/ops_sse_header.h | 2 -- target/i386/translate.c | 12 +++++++++++- 3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 058ed5cdfc..92d0544474 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -338,7 +338,6 @@ static inline int satsw(int x) } #define FMAXUB(a, b) ((a) > (b)) ? (a) : (b) -#define FMAXSW(a, b) ((int16_t)(a) > (int16_t)(b)) ? (a) : (b) #define FCMPGTB(a, b) ((int8_t)(a) > (int8_t)(b) ? -1 : 0) #define FCMPGTW(a, b) ((int16_t)(a) > (int16_t)(b) ? -1 : 0) @@ -355,8 +354,6 @@ static inline int satsw(int x) SSE_HELPER_B(helper_pmaxub, FMAXUB) -SSE_HELPER_W(helper_pmaxsw, FMAXSW) - SSE_HELPER_B(helper_pcmpgtb, FCMPGTB) SSE_HELPER_W(helper_pcmpgtw, FCMPGTW) SSE_HELPER_L(helper_pcmpgtl, FCMPGTL) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index 3d0e321230..bf38738783 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -62,8 +62,6 @@ DEF_HELPER_3(glue(pslldq, SUFFIX), void, env, Reg, Reg) SSE_HELPER_B(pmaxub, FMAXUB) -SSE_HELPER_W(pmaxsw, FMAXSW) - SSE_HELPER_B(pcmpgtb, FCMPGTB) SSE_HELPER_W(pcmpgtw, FCMPGTW) SSE_HELPER_L(pcmpgtl, FCMPGTL) diff --git a/target/i386/translate.c b/target/i386/translate.c index 893fe1253f..48bfb4e47b 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2844,7 +2844,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] = { [0xeb] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xec] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xed] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, - [0xee] = MMX_OP2(pmaxsw), + [0xee] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xef] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xf0] = { NULL, NULL, NULL, SSE_SPECIAL }, /* lddqu */ [0xf1] = MMX_OP2(psllw), @@ -3206,6 +3206,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *env, DisasContext *s, #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_pmaxs_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), (s), (modrm), (vece), tcg_gen_gvec_smax, 0112) +#define gen_pmaxs_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), (s), (modrm), (vece), tcg_gen_gvec_smax, 0112) +#define gen_vpmaxs_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (s), (modrm), (vece), tcg_gen_gvec_smax, 0123) +#define gen_vpmaxs_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (s), (modrm), (vece), tcg_gen_gvec_smax, 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) @@ -3431,6 +3436,11 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b) 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 0xee | M_0F: gen_pmaxs_mm(env, s, modrm, MO_16); return; + case 0xee | M_0F | P_66: gen_pmaxs_xmm(env, s, modrm, MO_16); return; + case 0xee | M_0F | P_66 | VEX_128: gen_vpmaxs_xmm(env, s, modrm, MO_16); return; + case 0xee | M_0F | P_66 | VEX_256: gen_vpmaxs_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