Commit 3e00884f authored by Gautham R. Shenoy's avatar Gautham R. Shenoy Committed by David Gibson
Browse files

target-ppc: add vrldnmi and vrlwmi instructions 



vrldmi: Vector Rotate Left Dword then Mask Insert
vrlwmi: Vector Rotate Left Word then Mask Insert

Signed-off-by: default avatarGautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: default avatarBharata B Rao <bharata@linux.vnet.ibm.com>
( use extract[32,64] and rol[32,64], introduce mask helpers in
  internal.h )
Signed-off-by: default avatarNikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent ecce0369

disas/ppc.c

+2 −0
Original line number Diff line number Diff line
@@ -2286,6 +2286,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { 
{ "vrlh",      VX(4,   68), VX_MASK,	PPCVEC,		{ VD, VA, VB } },

{ "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 } },

{ "vrlwmi",    VX(4,  133), 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
@@ -325,6 +325,8 @@ DEF_HELPER_4(vmaxfp, void, env, avr, avr, avr) 
DEF_HELPER_4(vminfp, void, env, avr, avr, avr)

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_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

+23 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 */

#include "qemu/osdep.h"

#include "cpu.h"

#include "internal.h"

#include "exec/exec-all.h"

#include "qemu/host-utils.h"

#include "exec/helper-proto.h"
@@ -1717,6 +1718,28 @@ void helper_vrsqrtefp(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *b) 
    }

}



#define VRLMI(name, size, element)                                    \

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

{                                                                     \

    int i;                                                            \

    for (i = 0; i < ARRAY_SIZE(r->element); i++) {                    \

        uint##size##_t src1 = a->element[i];                          \

        uint##size##_t src2 = b->element[i];                          \

        uint##size##_t src3 = r->element[i];                          \

        uint##size##_t begin, end, shift, mask, rot_val;              \

                                                                      \

        shift = extract##size(src2, 0, 6);                            \

        end   = extract##size(src2, 8, 6);                            \

        begin = extract##size(src2, 16, 6);                           \

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

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

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

    }                                                                 \

}



VRLMI(vrldmi, 64, u64);

VRLMI(vrlwmi, 32, u32);



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

                 ppc_avr_t *c)

{

target-ppc/internal.h

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 *  PowerPC interal definitions for qemu.

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef PPC_INTERNAL_H

#define PPC_INTERNAL_H



#define FUNC_MASK(name, ret_type, size, max_val)                  \

static inline ret_type name(uint##size##_t start,                 \

                              uint##size##_t end)                 \

{                                                                 \

    ret_type ret, max_bit = size - 1;                             \

                                                                  \

    if (likely(start == 0)) {                                     \

        ret = max_val << (max_bit - end);                         \

    } else if (likely(end == max_bit)) {                          \

        ret = max_val >> start;                                   \

    } else {                                                      \

        ret = (((uint##size##_t)(-1ULL)) >> (start)) ^            \

            (((uint##size##_t)(-1ULL) >> (end)) >> 1);            \

        if (unlikely(start > end)) {                              \

            return ~ret;                                          \

        }                                                         \

    }                                                             \

                                                                  \

    return ret;                                                   \

}



#if defined(TARGET_PPC64)

FUNC_MASK(MASK, target_ulong, 64, UINT64_MAX);

#else

FUNC_MASK(MASK, target_ulong, 32, UINT32_MAX);

#endif

FUNC_MASK(mask_u32, uint32_t, 32, UINT32_MAX);

FUNC_MASK(mask_u64, uint64_t, 64, UINT64_MAX);



#endif /* PPC_INTERNAL_H */

target-ppc/translate.c

+1 −28
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "qemu/osdep.h"

#include "cpu.h"

#include "internal.h"

#include "disas/disas.h"

#include "exec/exec-all.h"

#include "tcg-op.h"
@@ -561,34 +562,6 @@ EXTRACT_HELPER(DCM, 10, 6) 
/* DFP Z23-form */

EXTRACT_HELPER(RMC, 9, 2)



/* Create a mask between <start> and <end> bits */

static inline target_ulong MASK(uint32_t start, uint32_t end)

{

    target_ulong ret;



#if defined(TARGET_PPC64)

    if (likely(start == 0)) {

        ret = UINT64_MAX << (63 - end);

    } else if (likely(end == 63)) {

        ret = UINT64_MAX >> start;

    }

#else

    if (likely(start == 0)) {

        ret = UINT32_MAX << (31  - end);

    } else if (likely(end == 31)) {

        ret = UINT32_MAX >> start;

    }

#endif

    else {

        ret = (((target_ulong)(-1ULL)) >> (start)) ^

            (((target_ulong)(-1ULL) >> (end)) >> 1);

        if (unlikely(start > end))

            return ~ret;

    }



    return ret;

}



EXTRACT_HELPER_SPLIT(xT, 0, 1, 21, 5);

EXTRACT_HELPER_SPLIT(xS, 0, 1, 21, 5);

EXTRACT_HELPER_SPLIT(xA, 2, 1, 16, 5);