Commit e7b1e06f authored by Rajalakshmi Srinivasaraghavan's avatar Rajalakshmi Srinivasaraghavan Committed by David Gibson
Browse files

target-ppc: add vector insert instructions 



The following vector insert instructions are added from ISA 3.0.

vinsertb - Vector Insert Byte
vinserth - Vector Insert Halfword
vinsertw - Vector Insert Word
vinsertd - Vector Insert Doubleword

Signed-off-by: default avatarRajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 6ca038c2

target-ppc/helper.h

+4 −0
Original line number Diff line number Diff line
@@ -250,6 +250,10 @@ DEF_HELPER_2(vspltisw, void, avr, i32) 
DEF_HELPER_3(vspltb, void, avr, avr, i32)

DEF_HELPER_3(vsplth, void, avr, avr, i32)

DEF_HELPER_3(vspltw, void, avr, avr, i32)

DEF_HELPER_3(vinsertb, void, avr, avr, i32)

DEF_HELPER_3(vinserth, void, avr, avr, i32)

DEF_HELPER_3(vinsertw, void, avr, avr, i32)

DEF_HELPER_3(vinsertd, void, avr, avr, i32)

DEF_HELPER_2(vupkhpx, void, avr, avr)

DEF_HELPER_2(vupklpx, void, avr, avr)

DEF_HELPER_2(vupkhsb, void, avr, avr)

target-ppc/int_helper.c

+20 −0
Original line number Diff line number Diff line
@@ -1792,6 +1792,26 @@ VSPLT(w, u32) 
#undef VSPLT

#undef SPLAT_ELEMENT

#undef _SPLAT_MASKED

#if defined(HOST_WORDS_BIGENDIAN)

#define VINSERT(suffix, element)                                            \

    void helper_vinsert##suffix(ppc_avr_t *r, ppc_avr_t *b, uint32_t index) \

    {                                                                       \

        memmove(&r->u8[index], &b->u8[8 - sizeof(r->element)],              \

               sizeof(r->element[0]));                                      \

    }

#else

#define VINSERT(suffix, element)                                            \

    void helper_vinsert##suffix(ppc_avr_t *r, ppc_avr_t *b, uint32_t index) \

    {                                                                       \

        uint32_t d = (16 - index) - sizeof(r->element[0]);                  \

        memmove(&r->u8[d], &b->u8[8], sizeof(r->element[0]));               \

    }

#endif

VINSERT(b, u8)

VINSERT(h, u16)

VINSERT(w, u32)

VINSERT(d, u64)

#undef VINSERT



#define VSPLTI(suffix, element, splat_type)                     \

    void helper_vspltis##suffix(ppc_avr_t *r, uint32_t splat)   \

target-ppc/translate.c

+2 −0
Original line number Diff line number Diff line
@@ -498,6 +498,8 @@ EXTRACT_HELPER(UIMM, 0, 16); 
EXTRACT_HELPER(SIMM5, 16, 5);

/* 5 bits signed immediate value */

EXTRACT_HELPER(UIMM5, 16, 5);

/* 4 bits unsigned immediate value */

EXTRACT_HELPER(UIMM4, 16, 4);

/* Bit count */

EXTRACT_HELPER(NB, 11, 5);

/* Shift count */

target-ppc/translate/vmx-impl.inc.c

+32 −0
Original line number Diff line number Diff line
@@ -639,13 +639,45 @@ static void glue(gen_, name)(DisasContext *ctx) \ 
        tcg_temp_free_ptr(rd);                                          \

    }



#define GEN_VXFORM_UIMM_SPLAT(name, opc2, opc3, splat_max)              \

static void glue(gen_, name)(DisasContext *ctx)                         \

    {                                                                   \

        TCGv_ptr rb, rd;                                                \

        uint8_t uimm = UIMM4(ctx->opcode);                              \

        TCGv_i32 t0 = tcg_temp_new_i32();                               \

        if (unlikely(!ctx->altivec_enabled)) {                          \

            gen_exception(ctx, POWERPC_EXCP_VPU);                       \

            return;                                                     \

        }                                                               \

        if (uimm > splat_max) {                                         \

            uimm = 0;                                                   \

        }                                                               \

        tcg_gen_movi_i32(t0, uimm);                                     \

        rb = gen_avr_ptr(rB(ctx->opcode));                              \

        rd = gen_avr_ptr(rD(ctx->opcode));                              \

        gen_helper_##name(rd, rb, t0);                                  \

        tcg_temp_free_i32(t0);                                          \

        tcg_temp_free_ptr(rb);                                          \

        tcg_temp_free_ptr(rd);                                          \

    }



GEN_VXFORM_UIMM(vspltb, 6, 8);

GEN_VXFORM_UIMM(vsplth, 6, 9);

GEN_VXFORM_UIMM(vspltw, 6, 10);

GEN_VXFORM_UIMM_SPLAT(vinsertb, 6, 12, 15);

GEN_VXFORM_UIMM_SPLAT(vinserth, 6, 13, 14);

GEN_VXFORM_UIMM_SPLAT(vinsertw, 6, 14, 12);

GEN_VXFORM_UIMM_SPLAT(vinsertd, 6, 15, 8);

GEN_VXFORM_UIMM_ENV(vcfux, 5, 12);

GEN_VXFORM_UIMM_ENV(vcfsx, 5, 13);

GEN_VXFORM_UIMM_ENV(vctuxs, 5, 14);

GEN_VXFORM_UIMM_ENV(vctsxs, 5, 15);

GEN_VXFORM_DUAL(vspltisb, PPC_NONE, PPC2_ALTIVEC_207,

                      vinsertb, PPC_NONE, PPC2_ISA300);

GEN_VXFORM_DUAL(vspltish, PPC_NONE, PPC2_ALTIVEC_207,

                      vinserth, PPC_NONE, PPC2_ISA300);

GEN_VXFORM_DUAL(vspltisw, PPC_NONE, PPC2_ALTIVEC_207,

                      vinsertw, PPC_NONE, PPC2_ISA300);



static void gen_vsldoi(DisasContext *ctx)

{

target-ppc/translate/vmx-ops.inc.c

+13 −5
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ GEN_HANDLER_E(name, 0x04, opc2, opc3, 0x00000000, PPC_NONE, PPC2_ALTIVEC_207) 
#define GEN_VXFORM_300(name, opc2, opc3)                                \

GEN_HANDLER_E(name, 0x04, opc2, opc3, 0x00000000, PPC_NONE, PPC2_ISA300)



#define GEN_VXFORM_300_EXT(name, opc2, opc3, inval)                     \

GEN_HANDLER_E(name, 0x04, opc2, opc3, inval, PPC_NONE, PPC2_ISA300)



#define GEN_VXFORM_DUAL(name0, name1, opc2, opc3, type0, type1) \

GEN_HANDLER_E(name0##_##name1, 0x4, opc2, opc3, 0x00000000, type0, type1)
@@ -191,11 +194,16 @@ GEN_VXRFORM(vcmpgefp, 3, 7) 
GEN_VXRFORM_DUAL(vcmpgtfp, vcmpgtud, 3, 11, PPC_ALTIVEC, PPC_NONE)

GEN_VXRFORM_DUAL(vcmpbfp, vcmpgtsd, 3, 15, PPC_ALTIVEC, PPC_NONE)



#define GEN_VXFORM_SIMM(name, opc2, opc3)                               \

    GEN_HANDLER(name, 0x04, opc2, opc3, 0x00000000, PPC_ALTIVEC)

GEN_VXFORM_SIMM(vspltisb, 6, 12),

GEN_VXFORM_SIMM(vspltish, 6, 13),

GEN_VXFORM_SIMM(vspltisw, 6, 14),

#define GEN_VXFORM_DUAL_INV(name0, name1, opc2, opc3, inval0, inval1, type) \

GEN_OPCODE_DUAL(name0##_##name1, 0x04, opc2, opc3, inval0, inval1, type, \

                                                               PPC_NONE)

GEN_VXFORM_DUAL_INV(vspltisb, vinsertb, 6, 12, 0x00000000, 0x100000,

                                               PPC2_ALTIVEC_207),

GEN_VXFORM_DUAL_INV(vspltish, vinserth, 6, 13, 0x00000000, 0x100000,

                                               PPC2_ALTIVEC_207),

GEN_VXFORM_DUAL_INV(vspltisw, vinsertw, 6, 14, 0x00000000, 0x100000,

                                               PPC2_ALTIVEC_207),

GEN_VXFORM_300_EXT(vinsertd, 6, 15, 0x100000),



#define GEN_VXFORM_NOA(name, opc2, opc3)                                \

    GEN_HANDLER(name, 0x04, opc2, opc3, 0x001f0000, PPC_ALTIVEC)