Use the gvec infrastructure to achieve the desired functionality. Signed-off-by: Jan Bobek <jan.bo...@gmail.com> --- target/i386/ops_sse.h | 6 ------ target/i386/ops_sse_header.h | 5 ----- target/i386/translate.c | 33 +++++++++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index 84562a4536..31a761a89a 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -337,7 +337,6 @@ static inline int satsw(int x) } } -#define FADD(a, b) ((a) + (b)) #define FADDUB(a, b) satub((a) + (b)) #define FADDUW(a, b) satuw((a) + (b)) #define FADDSB(a, b) satsb((int8_t)(a) + (int8_t)(b)) @@ -366,11 +365,6 @@ static inline int satsw(int x) #define FAVG(a, b) (((a) + (b) + 1) >> 1) #endif -SSE_HELPER_B(helper_paddb, FADD) -SSE_HELPER_W(helper_paddw, FADD) -SSE_HELPER_L(helper_paddl, FADD) -SSE_HELPER_Q(helper_paddq, FADD) - SSE_HELPER_B(helper_psubb, FSUB) SSE_HELPER_W(helper_psubw, FSUB) SSE_HELPER_L(helper_psubl, FSUB) diff --git a/target/i386/ops_sse_header.h b/target/i386/ops_sse_header.h index abd00ca69d..5c69ab91d4 100644 --- a/target/i386/ops_sse_header.h +++ b/target/i386/ops_sse_header.h @@ -60,11 +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(paddb, FADD) -SSE_HELPER_W(paddw, FADD) -SSE_HELPER_L(paddl, FADD) -SSE_HELPER_Q(paddq, FADD) - SSE_HELPER_B(psubb, FSUB) SSE_HELPER_W(psubw, FSUB) SSE_HELPER_L(psubl, FSUB) diff --git a/target/i386/translate.c b/target/i386/translate.c index 69e9514679..1dbeb49066 100644 --- a/target/i386/translate.c +++ b/target/i386/translate.c @@ -2818,7 +2818,7 @@ static const SSEFunc_0_epp sse_op_table1[256][4] = { [0xd1] = MMX_OP2(psrlw), [0xd2] = MMX_OP2(psrld), [0xd3] = MMX_OP2(psrlq), - [0xd4] = MMX_OP2(paddq), + [0xd4] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, [0xd5] = MMX_OP2(pmullw), [0xd6] = { NULL, SSE_SPECIAL, SSE_SPECIAL, SSE_SPECIAL }, [0xd7] = { SSE_SPECIAL, SSE_SPECIAL }, /* pmovmskb */ @@ -2859,9 +2859,9 @@ static const SSEFunc_0_epp sse_op_table1[256][4] = { [0xf9] = MMX_OP2(psubw), [0xfa] = MMX_OP2(psubl), [0xfb] = MMX_OP2(psubq), - [0xfc] = MMX_OP2(paddb), - [0xfd] = MMX_OP2(paddw), - [0xfe] = MMX_OP2(paddl), + [0xfc] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xfd] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, + [0xfe] = { SSE_TOMBSTONE, SSE_TOMBSTONE }, }; static const SSEFunc_0_epp sse_op_table2[3 * 8][2] = { @@ -3166,6 +3166,11 @@ static inline void gen_gvec_ld_modrm_3(CPUX86State *env, DisasContext *s, gen_ld_modrm_VxHxWx, \ gen_gvec_2_fp, (opctl)) +#define gen_padd_mm(env, s, modrm, vece) gen_gvec_ld_modrm_mm ((env), (s), (modrm), (vece), tcg_gen_gvec_add, 0112) +#define gen_padd_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_xmm ((env), (s), (modrm), (vece), tcg_gen_gvec_add, 0112) +#define gen_vpadd_xmm(env, s, modrm, vece) gen_gvec_ld_modrm_vxmm((env), (s), (modrm), (vece), tcg_gen_gvec_add, 0123) +#define gen_vpadd_ymm(env, s, modrm, vece) gen_gvec_ld_modrm_vymm((env), (s), (modrm), (vece), tcg_gen_gvec_add, 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) @@ -3301,6 +3306,26 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b) | (s->prefix & PREFIX_REPZ ? P_F3 : 0) | (s->prefix & PREFIX_REPNZ ? P_F2 : 0) | (s->prefix & PREFIX_VEX ? (s->vex_l ? VEX_256 : VEX_128) : 0)) { + case 0xfc | M_0F: gen_padd_mm(env, s, modrm, MO_8); return; + case 0xfc | M_0F | P_66: gen_padd_xmm(env, s, modrm, MO_8); return; + case 0xfc | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_8); return; + case 0xfc | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_8); return; + + case 0xfd | M_0F: gen_padd_mm(env, s, modrm, MO_16); return; + case 0xfd | M_0F | P_66: gen_padd_xmm(env, s, modrm, MO_16); return; + case 0xfd | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_16); return; + case 0xfd | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_16); return; + + case 0xfe | M_0F: gen_padd_mm(env, s, modrm, MO_32); return; + case 0xfe | M_0F | P_66: gen_padd_xmm(env, s, modrm, MO_32); return; + case 0xfe | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_32); return; + case 0xfe | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_32); return; + + case 0xd4 | M_0F: gen_padd_mm(env, s, modrm, MO_64); return; + case 0xd4 | M_0F | P_66: gen_padd_xmm(env, s, modrm, MO_64); return; + case 0xd4 | M_0F | P_66 | VEX_128: gen_vpadd_xmm(env, s, modrm, MO_64); return; + case 0xd4 | M_0F | P_66 | VEX_256: gen_vpadd_ymm(env, s, modrm, MO_64); 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