Commit 09a245e1 authored by Bharata B Rao's avatar Bharata B Rao Committed by David Gibson
Browse files

target-ppc: add vrldnm and vrlwnm instructions 



vrldnm: Vector Rotate Left Doubleword then AND with Mask
vrlwnm: Vector Rotate Left Word then AND with Mask

Signed-off-by: default avatarBharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: default avatarNikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 3e00884f

disas/ppc.c

+2 −0
Original line number Diff line number Diff line
@@ -2287,7 +2287,9 @@ const struct powerpc_opcode powerpc_opcodes[] = { 
{ "vrlw",      VX(4,  132), VX_MASK,	PPCVEC,		{ VD, VA, VB } },

{ "vrsqrtefp", VX(4,  330), VX_MASK,	PPCVEC,		{ VD, VB } },

{ "vrldmi",    VX(4,  197), VX_MASK,    PPCVEC,         { VD, VA, VB } },

{ "vrldnm",    VX(4,  453), VX_MASK,    PPCVEC,         { VD, VA, VB } },

{ "vrlwmi",    VX(4,  133), VX_MASK,    PPCVEC,         { VD, VA, VB} },

{ "vrlwnm",    VX(4,  389), VX_MASK,    PPCVEC,         { VD, VA, VB } },

{ "vsel",      VXA(4,  42), VXA_MASK,	PPCVEC,		{ VD, VA, VB, VC } },

{ "vsl",       VX(4,  452), VX_MASK,	PPCVEC,		{ VD, VA, VB } },

{ "vslb",      VX(4,  260), VX_MASK,	PPCVEC,		{ VD, VA, VB } },

target-ppc/helper.h

+2 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ DEF_HELPER_3(vrefp, void, env, avr, avr) 
DEF_HELPER_3(vrsqrtefp, void, env, avr, avr)

DEF_HELPER_3(vrlwmi, void, avr, avr, avr)

DEF_HELPER_3(vrldmi, void, avr, avr, avr)

DEF_HELPER_3(vrldnm, void, avr, avr, avr)

DEF_HELPER_3(vrlwnm, void, avr, avr, avr)

DEF_HELPER_5(vmaddfp, void, env, avr, avr, avr, avr)

DEF_HELPER_5(vnmsubfp, void, env, avr, avr, avr, avr)

DEF_HELPER_3(vexptefp, void, env, avr, avr)

target-ppc/int_helper.c

+10 −4
Original line number Diff line number Diff line
@@ -1718,7 +1718,7 @@ void helper_vrsqrtefp(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *b) 
    }

}



#define VRLMI(name, size, element)                                    \

#define VRLMI(name, size, element, insert)                            \

void helper_##name(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)          \

{                                                                     \

    int i;                                                            \
@@ -1733,12 +1733,18 @@ void helper_##name(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ 
        begin = extract##size(src2, 16, 6);                           \

        rot_val = rol##size(src1, shift);                             \

        mask = mask_u##size(begin, end);                              \

        if (insert) {                                                 \

            r->element[i] = (rot_val & mask) | (src3 & ~mask);        \

        } else {                                                      \

            r->element[i] = (rot_val & mask);                         \

        }                                                             \

    }                                                                 \

}



VRLMI(vrldmi, 64, u64);

VRLMI(vrlwmi, 32, u32);

VRLMI(vrldmi, 64, u64, 1);

VRLMI(vrlwmi, 32, u32, 1);

VRLMI(vrldnm, 64, u64, 0);

VRLMI(vrlwnm, 32, u32, 0);



void helper_vsel(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b,

                 ppc_avr_t *c)

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

+6 −0
Original line number Diff line number Diff line
@@ -442,6 +442,9 @@ GEN_VXFORM(vmulesw, 4, 14); 
GEN_VXFORM(vslb, 2, 4);

GEN_VXFORM(vslh, 2, 5);

GEN_VXFORM(vslw, 2, 6);

GEN_VXFORM(vrlwnm, 2, 6);

GEN_VXFORM_DUAL(vslw, PPC_ALTIVEC, PPC_NONE, \

                vrlwnm, PPC_NONE, PPC2_ISA300)

GEN_VXFORM(vsld, 2, 23);

GEN_VXFORM(vsrb, 2, 8);

GEN_VXFORM(vsrh, 2, 9);
@@ -496,6 +499,9 @@ GEN_VXFORM(vrldmi, 2, 3); 
GEN_VXFORM_DUAL(vrld, PPC_NONE, PPC2_ALTIVEC_207, \

                vrldmi, PPC_NONE, PPC2_ISA300)

GEN_VXFORM(vsl, 2, 7);

GEN_VXFORM(vrldnm, 2, 7);

GEN_VXFORM_DUAL(vsl, PPC_ALTIVEC, PPC_NONE, \

                vrldnm, PPC_NONE, PPC2_ISA300)

GEN_VXFORM(vsr, 2, 11);

GEN_VXFORM_ENV(vpkuhum, 7, 0);

GEN_VXFORM_ENV(vpkuwum, 7, 1);

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

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ GEN_VXFORM(vmulesh, 4, 13), 
GEN_VXFORM_207(vmulesw, 4, 14),

GEN_VXFORM(vslb, 2, 4),

GEN_VXFORM(vslh, 2, 5),

GEN_VXFORM(vslw, 2, 6),

GEN_VXFORM_DUAL(vslw, vrlwnm, 2, 6, PPC_ALTIVEC, PPC_NONE),

GEN_VXFORM_207(vsld, 2, 23),

GEN_VXFORM(vsrb, 2, 8),

GEN_VXFORM(vsrh, 2, 9),
@@ -145,7 +145,7 @@ GEN_VXFORM(vrlb, 2, 0), 
GEN_VXFORM(vrlh, 2, 1),

GEN_VXFORM_DUAL(vrlw, vrlwmi, 2, 2, PPC_ALTIVEC, PPC_NONE),

GEN_VXFORM_DUAL(vrld, vrldmi, 2, 3, PPC_NONE, PPC2_ALTIVEC_207),

GEN_VXFORM(vsl, 2, 7),

GEN_VXFORM_DUAL(vsl, vrldnm, 2, 7, PPC_ALTIVEC, PPC_NONE),

GEN_VXFORM(vsr, 2, 11),

GEN_VXFORM(vpkuhum, 7, 0),

GEN_VXFORM(vpkuwum, 7, 1),