From 79f85c3ae96b9406809c3ee53881d1d891691c5f Mon Sep 17 00:00:00 2001 From: aurel32 Date: Sun, 4 Jan 2009 22:11:10 +0000 Subject: Add vupk{h,l}px instructions. Signed-off-by: Nathan Froyd Signed-off-by: Aurelien Jarno git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6176 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-ppc/helper.h | 2 ++ target-ppc/op_helper.c | 29 +++++++++++++++++++++++++++++ target-ppc/translate.c | 3 +++ 3 files changed, 34 insertions(+) diff --git a/target-ppc/helper.h b/target-ppc/helper.h index 49f7da1670..f1642a0bbe 100644 --- a/target-ppc/helper.h +++ b/target-ppc/helper.h @@ -159,6 +159,8 @@ DEF_HELPER_4(vsldoi, void, avr, avr, 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_2(vupkhpx, void, avr, avr) +DEF_HELPER_2(vupklpx, void, 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 c4060bafe9..9bc213dbc8 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -2248,6 +2248,35 @@ void helper_vsubcuw (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) } } +#if defined(WORDS_BIGENDIAN) +#define UPKHI 1 +#define UPKLO 0 +#else +#define UPKHI 0 +#define UPKLO 1 +#endif +#define VUPKPX(suffix, hi) \ + void helper_vupk##suffix (ppc_avr_t *r, ppc_avr_t *b) \ + { \ + int i; \ + ppc_avr_t result; \ + for (i = 0; i < ARRAY_SIZE(r->u32); i++) { \ + uint16_t e = b->u16[hi ? i : i+4]; \ + uint8_t a = (e >> 15) ? 0xff : 0; \ + uint8_t r = (e >> 10) & 0x1f; \ + uint8_t g = (e >> 5) & 0x1f; \ + uint8_t b = e & 0x1f; \ + result.u32[i] = (a << 24) | (r << 16) | (g << 8) | b; \ + } \ + *r = result; \ + } +VUPKPX(lpx, UPKLO) +VUPKPX(hpx, UPKHI) +#undef VUPKPX + +#undef UPKHI +#undef UPKLO + #undef VECTOR_FOR_INORDER_I #undef HI_IDX #undef LO_IDX diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 53ccd99e6f..e8a620ef3e 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -6289,6 +6289,9 @@ GEN_VXFORM(vrlw, 2, 2); tcg_temp_free_ptr(rd); \ } +GEN_VXFORM_NOA(vupkhpx, 7, 13); +GEN_VXFORM_NOA(vupklpx, 7, 15); + #define GEN_VXFORM_SIMM(name, opc2, opc3) \ GEN_HANDLER(name, 0x04, opc2, opc3, 0x00000000, PPC_ALTIVEC) \ { \ -- cgit v1.2.1