From patchwork Fri Mar 12 19:22:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 48482 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 01BB0B7C67 for ; Thu, 25 Mar 2010 11:44:14 +1100 (EST) Received: from localhost ([127.0.0.1]:50340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NubBD-0004p4-Bj for incoming@patchwork.ozlabs.org; Wed, 24 Mar 2010 20:44:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nub7b-0003oA-F1 for qemu-devel@nongnu.org; Wed, 24 Mar 2010 20:40:27 -0400 Received: from [140.186.70.92] (port=57519 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nub7U-0003nS-US for qemu-devel@nongnu.org; Wed, 24 Mar 2010 20:40:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nub7R-0000eG-CV for qemu-devel@nongnu.org; Wed, 24 Mar 2010 20:40:20 -0400 Received: from are.twiddle.net ([75.149.56.221]:53029) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nub7R-0000dY-21 for qemu-devel@nongnu.org; Wed, 24 Mar 2010 20:40:17 -0400 Received: by are.twiddle.net (Postfix, from userid 5000) id AFF60BF3; Wed, 24 Mar 2010 17:40:13 -0700 (PDT) Message-Id: <49f3ee6232630e8b215df0431335545f01ed1199.1269476678.git.rth@twiddle.net> In-Reply-To: References: From: Richard Henderson Date: Fri, 12 Mar 2010 11:22:45 -0800 To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 02/10] target-alpha: Implement cpys{, n, e} inline. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Richard Henderson --- target-alpha/helper.h | 4 -- target-alpha/op_helper.c | 18 ---------- target-alpha/translate.c | 78 +++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 74 insertions(+), 26 deletions(-) diff --git a/target-alpha/helper.h b/target-alpha/helper.h index a508077..8e11304 100644 --- a/target-alpha/helper.h +++ b/target-alpha/helper.h @@ -77,10 +77,6 @@ DEF_HELPER_FLAGS_2(cmpgeq, TCG_CALL_CONST | TCG_CALL_PURE, i64, i64, i64) DEF_HELPER_FLAGS_2(cmpgle, TCG_CALL_CONST | TCG_CALL_PURE, i64, i64, i64) DEF_HELPER_FLAGS_2(cmpglt, TCG_CALL_CONST | TCG_CALL_PURE, i64, i64, i64) -DEF_HELPER_FLAGS_2(cpys, TCG_CALL_CONST | TCG_CALL_PURE, i64, i64, i64) -DEF_HELPER_FLAGS_2(cpysn, TCG_CALL_CONST | TCG_CALL_PURE, i64, i64, i64) -DEF_HELPER_FLAGS_2(cpyse, TCG_CALL_CONST | TCG_CALL_PURE, i64, i64, i64) - DEF_HELPER_FLAGS_1(cvtts, TCG_CALL_CONST, i64, i64) DEF_HELPER_FLAGS_1(cvtst, TCG_CALL_CONST, i64, i64) DEF_HELPER_FLAGS_1(cvtqs, TCG_CALL_CONST, i64, i64) diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index 4d2c2ee..2419dc4 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -921,24 +921,6 @@ uint64_t helper_sqrtt (uint64_t a) return float64_to_t(fr); } - -/* Sign copy */ -uint64_t helper_cpys(uint64_t a, uint64_t b) -{ - return (a & 0x8000000000000000ULL) | (b & ~0x8000000000000000ULL); -} - -uint64_t helper_cpysn(uint64_t a, uint64_t b) -{ - return ((~a) & 0x8000000000000000ULL) | (b & ~0x8000000000000000ULL); -} - -uint64_t helper_cpyse(uint64_t a, uint64_t b) -{ - return (a & 0xFFF0000000000000ULL) | (b & ~0xFFF0000000000000ULL); -} - - /* Comparisons */ uint64_t helper_cmptun (uint64_t a, uint64_t b) { diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 719b423..b677378 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -741,6 +741,80 @@ static inline void glue(gen_f, name)(DisasContext *ctx, \ IEEE_INTCVT(cvtqs) IEEE_INTCVT(cvtqt) +static void gen_cpys_internal(int ra, int rb, int rc, int inv_a, uint64_t mask) +{ + TCGv va, vb, vmask; + int za = 0, zb = 0; + + if (unlikely(rc == 31)) { + return; + } + + vmask = tcg_const_i64(mask); + + TCGV_UNUSED_I64(va); + if (ra == 31) { + if (inv_a) { + va = vmask; + } else { + za = 1; + } + } else { + va = tcg_temp_new_i64(); + tcg_gen_mov_i64(va, cpu_fir[ra]); + if (inv_a) { + tcg_gen_not_i64(va, va); + } + tcg_gen_and_i64(va, va, vmask); + } + + TCGV_UNUSED_I64(vb); + if (rb == 31) { + zb = 1; + } else { + vb = tcg_temp_new_i64(); + tcg_gen_andc_i64(vb, cpu_fir[rb], vmask); + } + + switch (za * 2 + zb) { + case 0: + tcg_gen_or_i64(cpu_fir[rc], va, vb); + break; + case 1: + tcg_gen_mov_i64(cpu_fir[rc], va); + break; + case 2: + tcg_gen_mov_i64(cpu_fir[rc], vb); + break; + case 3: + tcg_gen_movi_i64(cpu_fir[rc], 0); + break; + } + + tcg_temp_free(vmask); + if (ra != 31) { + tcg_temp_free(va); + } + if (rb != 31) { + tcg_temp_free(vb); + } +} + +static inline void gen_fcpys(int ra, int rb, int rc) +{ + gen_cpys_internal(ra, rb, rc, 0, 0x8000000000000000ULL); +} + +static inline void gen_fcpysn(int ra, int rb, int rc) +{ + gen_cpys_internal(ra, rb, rc, 1, 0x8000000000000000ULL); +} + +static inline void gen_fcpyse(int ra, int rb, int rc) +{ + gen_cpys_internal(ra, rb, rc, 0, 0xFFF0000000000000ULL); +} + #define FARITH3(name) \ static inline void glue(gen_f, name)(int ra, int rb, int rc) \ { \ @@ -769,10 +843,6 @@ static inline void glue(gen_f, name)(int ra, int rb, int rc) \ tcg_temp_free(vb); \ } \ } -/* ??? Ought to expand these inline; simple masking operations. */ -FARITH3(cpys) -FARITH3(cpysn) -FARITH3(cpyse) /* ??? VAX instruction qualifiers ignored. */ FARITH3(addf)