Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek <jan.bo...@gmail.com> --- target/i386/ops_sse.h | 4 ---- target/i386/ops_sse_header.h | 2 -- target/i386/translate.c | 12 +++++++++++- 3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 92d0544474..75ff686bb6 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -337,8 +337,6 @@ static inline int satsw(int x) } } -#define FMAXUB(a, b) ((a) > (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) #define FCMPGTL(a, b) ((int32_t)(a) > (int32_t)(b) ? -1 : 0) @@ -352,8 +350,6 @@ static inline int satsw(int x) #define FAVG(a, b) (((a) + (b) + 1) >> 1) #endif -SSE_HELPER_B(helper_pmaxub, FMAXUB) - 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 bf38738783..9c7451d28e 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -60,8 +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(pmaxub, FMAXUB) - 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 48bfb4e47b..d08d2cedce 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2828,7 +2828,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] = { [0xdb] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdc] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdd] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, - [0xde] = MMX_OP2(pmaxub), + [0xde] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xdf] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xe0] = MMX_OP2(pavgb), [0xe1] = MMX_OP2(psraw), @@ -3211,6 +3211,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *env, DisasContext *s, #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_pmaxu_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), (s), (modrm), (vece), tcg_gen_gvec_umax, 0112) +#define gen_pmaxu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), (s), (modrm), (vece), tcg_gen_gvec_umax, 0112) +#define gen_vpmaxu_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (s), (modrm), (vece), tcg_gen_gvec_umax, 0123) +#define gen_vpmaxu_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (s), (modrm), (vece), tcg_gen_gvec_umax, 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) @@ -3436,6 +3441,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 0xde | M_0F: gen_pmaxu_mm(env, s, modrm, MO_8); return; + case 0xde | M_0F | P_66: gen_pmaxu_xmm(env, s, modrm, MO_8); return; + case 0xde | M_0F | P_66 | VEX_128: gen_vpmaxu_xmm(env, s, modrm, MO_8); return; + case 0xde | M_0F | P_66 | VEX_256: gen_vpmaxu_ymm(env, s, modrm, MO_8); 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; -- 2.20.1