From 5335a145a178630a8d157cd927c5bd697d1e362e Mon Sep 17 00:00:00 2001 From: aurel32 Date: Sun, 4 Jan 2009 22:12:09 +0000 Subject: [PATCH] Add vpks{h, w}{s, u}s, vpku{h, w}us, and vpku{h, w}um instructions. Signed-off-by: Nathan Froyd Signed-off-by: Aurelien Jarno git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6182 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-ppc/helper.h | 8 ++++++++ target-ppc/op_helper.c | 35 +++++++++++++++++++++++++++++++++++ target-ppc/translate.c | 8 ++++++++ 3 files changed, 51 insertions(+) diff --git a/target-ppc/helper.h b/target-ppc/helper.h index 6c60426059..f5f5282f2c 100644 --- a/target-ppc/helper.h +++ b/target-ppc/helper.h @@ -169,6 +169,14 @@ DEF_HELPER_4(vmsumubm, void, avr, avr, avr, avr) DEF_HELPER_4(vmsummbm, void, avr, avr, avr, avr) DEF_HELPER_4(vsel, void, avr, avr, avr, avr) DEF_HELPER_4(vperm, void, avr, avr, avr, avr) +DEF_HELPER_3(vpkshss, void, avr, avr, avr) +DEF_HELPER_3(vpkshus, void, avr, avr, avr) +DEF_HELPER_3(vpkswss, void, avr, avr, avr) +DEF_HELPER_3(vpkswus, void, avr, avr, avr) +DEF_HELPER_3(vpkuhus, void, avr, avr, avr) +DEF_HELPER_3(vpkuwus, void, avr, avr, avr) +DEF_HELPER_3(vpkuhum, void, avr, avr, avr) +DEF_HELPER_3(vpkuwum, void, avr, avr, avr) DEF_HELPER_1(efscfsi, i32, i32) DEF_HELPER_1(efscfui, i32, i32) diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index 869878f7f5..1c820885ab 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -2190,6 +2190,41 @@ void helper_vperm (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c) *r = result; } +#if defined(WORDS_BIGENDIAN) +#define PKBIG 1 +#else +#define PKBIG 0 +#endif +#define VPK(suffix, from, to, cvt, dosat) \ + void helper_vpk##suffix (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ + { \ + int i; \ + int sat = 0; \ + ppc_avr_t result; \ + ppc_avr_t *a0 = PKBIG ? a : b; \ + ppc_avr_t *a1 = PKBIG ? b : a; \ + VECTOR_FOR_INORDER_I (i, from) { \ + result.to[i] = cvt(a0->from[i], &sat); \ + result.to[i+ARRAY_SIZE(r->from)] = cvt(a1->from[i], &sat); \ + } \ + *r = result; \ + if (dosat && sat) { \ + env->vscr |= (1 << VSCR_SAT); \ + } \ + } +#define I(x, y) (x) +VPK(shss, s16, s8, cvtshsb, 1) +VPK(shus, s16, u8, cvtshub, 1) +VPK(swss, s32, s16, cvtswsh, 1) +VPK(swus, s32, u16, cvtswuh, 1) +VPK(uhus, u16, u8, cvtuhub, 1) +VPK(uwus, u32, u16, cvtuwuh, 1) +VPK(uhum, u16, u8, I, 0) +VPK(uwum, u32, u16, I, 0) +#undef I +#undef VPK +#undef PKBIG + #define VROTATE(suffix, element) \ void helper_vrl##suffix (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ { \ diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 112d05d567..2b814fe0b0 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -6273,6 +6273,14 @@ GEN_VXFORM(vsubcuw, 0, 22); GEN_VXFORM(vrlb, 2, 0); GEN_VXFORM(vrlh, 2, 1); GEN_VXFORM(vrlw, 2, 2); +GEN_VXFORM(vpkuhum, 7, 0); +GEN_VXFORM(vpkuwum, 7, 1); +GEN_VXFORM(vpkuhus, 7, 2); +GEN_VXFORM(vpkuwus, 7, 3); +GEN_VXFORM(vpkshus, 7, 4); +GEN_VXFORM(vpkswus, 7, 5); +GEN_VXFORM(vpkshss, 7, 6); +GEN_VXFORM(vpkswss, 7, 7); #define GEN_VXFORM_NOA(name, opc2, opc3) \ GEN_HANDLER(name, 0x04, opc2, opc3, 0x001f0000, PPC_ALTIVEC) \ -- 2.11.4.GIT