From patchwork Fri Mar 30 17:05:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 392DEB6EEF for ; Sat, 31 Mar 2012 04:06:56 +1100 (EST) Received: from localhost ([::1]:50298 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDfHp-0003ic-Uy for incoming@patchwork.ozlabs.org; Fri, 30 Mar 2012 13:06:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDfHY-0003aB-MN for qemu-devel@nongnu.org; Fri, 30 Mar 2012 13:06:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDfHU-0002on-Es for qemu-devel@nongnu.org; Fri, 30 Mar 2012 13:06:36 -0400 Received: from mail-qc0-f173.google.com ([209.85.216.173]:37647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDfHU-0002nm-8P for qemu-devel@nongnu.org; Fri, 30 Mar 2012 13:06:32 -0400 Received: by mail-qc0-f173.google.com with SMTP id c20so497338qcs.4 for ; Fri, 30 Mar 2012 10:06:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=bXx1/5s0V4jcOCOblANHW8JEH49y7N//69/U3E/uniE=; b=gf2gc2hiR5TrJAv/UedLop9+ZHhw1ACq4eQTQxIb+txV7uwWagSWjAqjQOg+x+VH5P z/ll2Y4BU/6SVInieBAjdDcakNJKYHJbQwfXfiHnWCZS8xOtinSO7UefR3vrc2Dia+u2 E+LT3qWUZdUz12n0VU4NawOzgWnZoinscRu1dR9vxhgb4aZimWnZ/a6fKXtwa+Ye959N Yb2u7/gZD9YmTpjr1ofsZlpXhlTiZyksra+FBFuG7l0N+ERErPLKdJhozvERVmqHRZWx tAT4joUKCZD+cnKXMurF19pzwVq0vs3eNPDS3YcoPZXLfjou1+866eipd7W7H5zh+d7x Poqw== Received: by 10.224.210.129 with SMTP id gk1mr6402382qab.85.1333127191632; Fri, 30 Mar 2012 10:06:31 -0700 (PDT) Received: from pebble.com ([200.7.43.190]) by mx.google.com with ESMTPS id fq1sm19227716qab.10.2012.03.30.10.06.29 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Mar 2012 10:06:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 30 Mar 2012 13:05:44 -0400 Message-Id: <1333127144-7088-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1333127144-7088-1-git-send-email-rth@twiddle.net> References: <1333127144-7088-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.216.173 Cc: aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 5/5] target-mips: Add accessors for the two 32-bit halves of a 64-bit FPR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Not much used yet, but more users to come. Signed-off-by: Richard Henderson --- target-mips/translate.c | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/target-mips/translate.c b/target-mips/translate.c index 10d8407..2396339 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -750,6 +750,29 @@ static void gen_store_fpr64(DisasContext *ctx, TCGv_i64 t, int reg) } } +static void gen_load_fpr_pair(DisasContext *ctx, TCGv_i32 tl, + TCGv_i32 th, int reg) +{ + gen_load_fpr32(ctx, tl, reg); + gen_load_fpr32h(ctx, th, reg); +} + +static void gen_store_fpr_pair(DisasContext *ctx, TCGv_i32 tl, + TCGv_i32 th, int reg) +{ +#if TCG_TARGET_REG_BITS == 32 + tcg_gen_mov_i32(TCGV_LOW(fpu_f64[reg]), tl); + tcg_gen_mov_i32(TCGV_HIGH(fpu_f64[reg]), th); +#else + if (ctx->hflags & MIPS_HFLAG_F64) { + tcg_gen_concat32_i64(fpu_f64[reg], tl, th); + } else { + tcg_gen_mov_i32(fpu_f32[reg], tl); + tcg_gen_mov_i32(fpu_fh32[reg], th); + } +#endif +} + static inline int get_fp_bit (int cc) { if (cc) @@ -7691,8 +7714,7 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1, gen_load_fpr32(ctx, fp0, fs); gen_load_fpr32(ctx, fp1, ft); - gen_store_fpr32h(ctx, fp0, fd); - gen_store_fpr32(ctx, fp1, fd); + gen_store_fpr_pair(ctx, fp1, fp0, fd); tcg_temp_free_i32(fp0); tcg_temp_free_i32(fp1); } @@ -7706,8 +7728,7 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1, gen_load_fpr32(ctx, fp0, fs); gen_load_fpr32h(ctx, fp1, ft); - gen_store_fpr32(ctx, fp1, fd); - gen_store_fpr32h(ctx, fp0, fd); + gen_store_fpr_pair(ctx, fp1, fp0, fd); tcg_temp_free_i32(fp0); tcg_temp_free_i32(fp1); } @@ -7721,8 +7742,7 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1, gen_load_fpr32h(ctx, fp0, fs); gen_load_fpr32(ctx, fp1, ft); - gen_store_fpr32(ctx, fp1, fd); - gen_store_fpr32h(ctx, fp0, fd); + gen_store_fpr_pair(ctx, fp1, fp0, fd); tcg_temp_free_i32(fp0); tcg_temp_free_i32(fp1); } @@ -7736,8 +7756,7 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1, gen_load_fpr32h(ctx, fp0, fs); gen_load_fpr32h(ctx, fp1, ft); - gen_store_fpr32(ctx, fp1, fd); - gen_store_fpr32h(ctx, fp0, fd); + gen_store_fpr_pair(ctx, fp1, fp0, fd); tcg_temp_free_i32(fp0); tcg_temp_free_i32(fp1); } @@ -7909,10 +7928,8 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc, tcg_gen_andi_tl(t0, t0, 0x7); tcg_gen_brcondi_tl(TCG_COND_NE, t0, 0, l1); - gen_load_fpr32(ctx, fp, fs); - gen_load_fpr32h(ctx, fph, fs); - gen_store_fpr32(ctx, fp, fd); - gen_store_fpr32h(ctx, fph, fd); + gen_load_fpr_pair(ctx, fp, fph, fs); + gen_store_fpr_pair(ctx, fp, fph, fd); tcg_gen_br(l2); gen_set_label(l1); tcg_gen_brcondi_tl(TCG_COND_NE, t0, 4, l2); @@ -7920,14 +7937,11 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc, #ifdef TARGET_WORDS_BIGENDIAN gen_load_fpr32(ctx, fp, fs); gen_load_fpr32h(ctx, fph, ft); - gen_store_fpr32h(ctx, fp, fd); - gen_store_fpr32(ctx, fph, fd); #else gen_load_fpr32h(ctx, fph, fs); gen_load_fpr32(ctx, fp, ft); - gen_store_fpr32(ctx, fph, fd); - gen_store_fpr32h(ctx, fp, fd); #endif + gen_store_fpr_pair(ctx, fph, fp, fd); gen_set_label(l2); tcg_temp_free_i32(fp); tcg_temp_free_i32(fph);