From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LHrZz-0002zS-3y for qemu-devel@nongnu.org; Tue, 30 Dec 2008 22:17:07 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LHrZx-0002z3-Jt for qemu-devel@nongnu.org; Tue, 30 Dec 2008 22:17:05 -0500 Received: from [199.232.76.173] (port=51246 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LHrZx-0002yw-D5 for qemu-devel@nongnu.org; Tue, 30 Dec 2008 22:17:05 -0500 Received: from mx20.gnu.org ([199.232.41.8]:31423) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LHrZx-0005ZR-4P for qemu-devel@nongnu.org; Tue, 30 Dec 2008 22:17:05 -0500 Received: from mail.codesourcery.com ([65.74.133.4]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LHrZw-0006hn-F5 for qemu-devel@nongnu.org; Tue, 30 Dec 2008 22:17:04 -0500 From: Nathan Froyd Date: Tue, 30 Dec 2008 19:09:52 -0800 Message-Id: <1230693022-18380-11-git-send-email-froydnj@codesourcery.com> In-Reply-To: <1230693022-18380-1-git-send-email-froydnj@codesourcery.com> References: <1230693022-18380-1-git-send-email-froydnj@codesourcery.com> Subject: [Qemu-devel] [PATCH 10/40] Add vmrg{l,h}{b,h,w} instructions. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Nathan Froyd --- target-ppc/helper.h | 6 ++++++ target-ppc/op_helper.c | 35 +++++++++++++++++++++++++++++++++++ target-ppc/translate.c | 6 ++++++ 3 files changed, 47 insertions(+), 0 deletions(-) diff --git a/target-ppc/helper.h b/target-ppc/helper.h index efe7a1a..5a05157 100644 --- a/target-ppc/helper.h +++ b/target-ppc/helper.h @@ -123,6 +123,12 @@ DEF_HELPER_3(vminuw, void, avr, avr, avr) DEF_HELPER_3(vmaxub, void, avr, avr, avr) DEF_HELPER_3(vmaxuh, void, avr, avr, avr) DEF_HELPER_3(vmaxuw, void, avr, avr, avr) +DEF_HELPER_3(vmrglb, void, avr, avr, avr) +DEF_HELPER_3(vmrglh, void, avr, avr, avr) +DEF_HELPER_3(vmrglw, void, avr, avr, avr) +DEF_HELPER_3(vmrghb, void, avr, avr, avr) +DEF_HELPER_3(vmrghh, void, avr, avr, avr) +DEF_HELPER_3(vmrghw, void, avr, avr, avr) DEF_HELPER_3(vcmpequb, i32, avr, avr, avr) DEF_HELPER_3(vcmpequh, i32, avr, avr, avr) DEF_HELPER_3(vcmpequw, i32, avr, avr, avr) diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c index 5daa62f..0e502bc 100644 --- a/target-ppc/op_helper.c +++ b/target-ppc/op_helper.c @@ -2065,6 +2065,41 @@ VMINMAX(uw, u32) #undef VMINMAX_DO #undef VMINMAX +#define VMRG_DO(name, element, highp) \ + void helper_v##name (ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b) \ + { \ + ppc_avr_t result; \ + int i; \ + size_t n_elems = N_ELEMS(element); \ + for (i = 0; i < n_elems/2; i++) { \ + if (highp) { \ + result.element[i*2+HI_IDX] = a->element[i]; \ + result.element[i*2+LO_IDX] = b->element[i]; \ + } else { \ + result.element[n_elems - i*2 - (1+HI_IDX)] = b->element[n_elems - i - 1]; \ + result.element[n_elems - i*2 - (1+LO_IDX)] = a->element[n_elems - i - 1]; \ + } \ + } \ + *r = result; \ + } +#if defined(WORDS_BIGENDIAN) +#define MRGHI 0 +#define MRGL0 1 +#else +#define MRGHI 1 +#define MRGLO 0 +#endif +#define VMRG(suffix, element) \ + VMRG_DO(mrgl##suffix, element, MRGHI) \ + VMRG_DO(mrgh##suffix, element, MRGLO) +VMRG(b, u8) +VMRG(h, u16) +VMRG(w, u32) +#undef VMRG_DO +#undef VMRG +#undef MRGHI +#undef MRGLO + #undef VECTOR_FOR_INORDER_I #undef HI_IDX #undef LO_IDX diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 7ebdb21..13fccf3 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -6205,6 +6205,12 @@ GEN_VXFORM(vavguw, 1, 18); GEN_VXFORM(vavgsb, 1, 20); GEN_VXFORM(vavgsh, 1, 21); GEN_VXFORM(vavgsw, 1, 22); +GEN_VXFORM(vmrghb, 6, 0); +GEN_VXFORM(vmrghh, 6, 1); +GEN_VXFORM(vmrghw, 6, 2); +GEN_VXFORM(vmrglb, 6, 4); +GEN_VXFORM(vmrglh, 6, 5); +GEN_VXFORM(vmrglw, 6, 6); #define GEN_VXRFORM1(opname, name, str, opc2, opc3) \ GEN_HANDLER2(name, str, 0x4, opc2, opc3, 0x00000000, PPC_ALTIVEC) \ -- 1.6.0.5