From patchwork Tue Jun 28 00:39:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9201603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4DB656075F for ; Tue, 28 Jun 2016 00:58:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D34828414 for ; Tue, 28 Jun 2016 00:58:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 311D3285C9; Tue, 28 Jun 2016 00:58:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3F56128414 for ; Tue, 28 Jun 2016 00:58:58 +0000 (UTC) Received: from localhost ([::1]:33541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHhMf-0002k6-D0 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Jun 2016 20:58:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHh4R-0002wY-Mf for qemu-devel@nongnu.org; Mon, 27 Jun 2016 20:40:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHh4Q-0004U8-06 for qemu-devel@nongnu.org; Mon, 27 Jun 2016 20:40:07 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35653) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHh4P-0004Ty-RD for qemu-devel@nongnu.org; Mon, 27 Jun 2016 20:40:05 -0400 Received: by mail-qk0-x241.google.com with SMTP id b136so324444qkg.2 for ; Mon, 27 Jun 2016 17:40:05 -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:in-reply-to:references; bh=QYo2zJ4W9qED0Mve79m3xA8yNlgIdRtcp3ro2wFGehg=; b=GXy3Tk4JoffYgR7k80nCuh4dnksuRJNEBcEhGF7gHKOGtq/EBDuJ4nw1lHwt3w1rbc T3U8VJyYJK1yCUeXRIm61CMUJIEJSj+Mpxnp/BWLEB6pDitMicAL76xbMHdMuyhNwDjU y1geznRx/nK0uufMN0PQc9O2SsHtCtBtpUL6UjYYTgFrDz3BxvlVf6xpHbc8NmuG28qt VW2Do1ndKengxyR+BzUkifzTFob8Pz7ubNfqSb7CviPL7quRnFikBMQxHyJ/sWhsOLkX FOQr+dGkEHocf/JEUi9HwIwqIl4XlLkCNDqn/aIfZIQadv/iJzOzWoqB3TMwl6GRppEL /TQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=QYo2zJ4W9qED0Mve79m3xA8yNlgIdRtcp3ro2wFGehg=; b=bTTcAG1Qpt0uzIqrv1gPvEEtiwl/3KWFxqW49WYQrXz6xWDyGBaFqf1hmR77EVfGfr HC/fTu626pMcAowPLsO2acfdQFoiFi3VxpMU5roC6wohyeIRfx1CeEThgzkIuH0VYm4/ uLhJ72iEt37D0TLXAcsOQyufZxeMYRHQGNtXyuFJDJsZJ5wbxrAyN1m1aYIgHYgWZTjV WLosc1H/TR7d45LgcJ+v+6uGsozfDGmwIOk4LX1MbnYdb5AN2FA2WVD1+bDZIhFTFe/j 79misALA2rc4TPbkENVLTCPGOp+y+NopkUIA81E3FzjkPNEbqxz9NtUNmH18L95t4aSK Po8g== X-Gm-Message-State: ALyK8tJQYvrLhkkdSbS96qZWf3yvhTwFd9baT4QAKl+oFAiBJx2FpfrmzV7qmfRB1XUlOg== X-Received: by 10.55.221.25 with SMTP id n25mr260033qki.110.1467074405384; Mon, 27 Jun 2016 17:40:05 -0700 (PDT) Received: from bigtime.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id 128sm190406qke.10.2016.06.27.17.40.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jun 2016 17:40:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 27 Jun 2016 17:39:09 -0700 Message-Id: <1467074353-26130-21-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1467074353-26130-1-git-send-email-rth@twiddle.net> References: <1467074353-26130-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v4 20/24] target-sparc: Remove helper_ldf_asi, helper_stf_asi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.cave-ayland@ilande.co.uk Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We've now implemented all fp asis inline, except for the no-fault memory reads. The latter can be passed directly to helper_ld_asi. Reviewed-By: Artyom Tarasenko Signed-off-by: Richard Henderson --- target-sparc/helper.h | 2 - target-sparc/ldst_helper.c | 148 --------------------------------------------- target-sparc/translate.c | 48 ++++++++++----- 3 files changed, 32 insertions(+), 166 deletions(-) diff --git a/target-sparc/helper.h b/target-sparc/helper.h index f5afc8d..b506706 100644 --- a/target-sparc/helper.h +++ b/target-sparc/helper.h @@ -18,8 +18,6 @@ DEF_HELPER_2(wrcwp, void, env, tl) DEF_HELPER_FLAGS_2(array8, TCG_CALL_NO_RWG_SE, tl, tl, tl) DEF_HELPER_FLAGS_1(popc, TCG_CALL_NO_RWG_SE, tl, tl) DEF_HELPER_FLAGS_3(ldda_asi, TCG_CALL_NO_WG, void, env, tl, int) -DEF_HELPER_5(ldf_asi, void, env, tl, int, int, int) -DEF_HELPER_FLAGS_5(stf_asi, TCG_CALL_NO_WG, void, env, tl, int, int, int) DEF_HELPER_FLAGS_5(casx_asi, TCG_CALL_NO_WG, tl, env, tl, tl, tl, i32) DEF_HELPER_FLAGS_2(set_softint, TCG_CALL_NO_RWG, void, env, i64) DEF_HELPER_FLAGS_2(clear_softint, TCG_CALL_NO_RWG, void, env, i64) diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index 240c1bc..28cc82d 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -2161,154 +2161,6 @@ void helper_ldda_asi(CPUSPARCState *env, target_ulong addr, int asi) QT0.low = l; } -void helper_ldf_asi(CPUSPARCState *env, target_ulong addr, int asi, int size, - int rd) -{ - unsigned int i; - target_ulong val; - - helper_check_align(env, addr, 3); - addr = asi_address_mask(env, asi, addr); - - switch (asi) { - case ASI_BLK_P: /* UA2007/JPS1 Block load primary */ - case ASI_BLK_S: /* UA2007/JPS1 Block load secondary */ - case ASI_BLK_PL: /* UA2007/JPS1 Block load primary LE */ - case ASI_BLK_SL: /* UA2007/JPS1 Block load secondary LE */ - if (rd & 7) { - helper_raise_exception(env, TT_ILL_INSN); - return; - } - helper_check_align(env, addr, 0x3f); - for (i = 0; i < 8; i++, rd += 2, addr += 8) { - env->fpr[rd / 2].ll = helper_ld_asi(env, addr, asi & 0x8f, MO_Q); - } - return; - - case ASI_BLK_AIUP_4V: /* UA2007 Block load primary, user privilege */ - case ASI_BLK_AIUS_4V: /* UA2007 Block load secondary, user privilege */ - case ASI_BLK_AIUP_L_4V: /* UA2007 Block load primary LE, user privilege */ - case ASI_BLK_AIUS_L_4V: /* UA2007 Block load secondary LE, user privilege */ - case ASI_BLK_AIUP: /* JPS1 Block load primary, user privilege */ - case ASI_BLK_AIUS: /* JPS1 Block load secondary, user privilege */ - case ASI_BLK_AIUPL: /* JPS1 Block load primary LE, user privilege */ - case ASI_BLK_AIUSL: /* JPS1 Block load secondary LE, user privilege */ - if (rd & 7) { - helper_raise_exception(env, TT_ILL_INSN); - return; - } - helper_check_align(env, addr, 0x3f); - for (i = 0; i < 8; i++, rd += 2, addr += 8) { - env->fpr[rd / 2].ll = helper_ld_asi(env, addr, asi & 0x19, MO_Q); - } - return; - - default: - break; - } - - switch (size) { - default: - case 4: - val = helper_ld_asi(env, addr, asi, MO_UL); - if (rd & 1) { - env->fpr[rd / 2].l.lower = val; - } else { - env->fpr[rd / 2].l.upper = val; - } - break; - case 8: - env->fpr[rd / 2].ll = helper_ld_asi(env, addr, asi, MO_Q); - break; - case 16: - env->fpr[rd / 2].ll = helper_ld_asi(env, addr, asi, MO_Q); - env->fpr[rd / 2 + 1].ll = helper_ld_asi(env, addr + 8, asi, MO_Q); - break; - } -} - -void helper_stf_asi(CPUSPARCState *env, target_ulong addr, int asi, int size, - int rd) -{ - unsigned int i; - target_ulong val; - - addr = asi_address_mask(env, asi, addr); - - switch (asi) { - case ASI_BLK_COMMIT_P: /* UA2007/JPS1 Block store primary (cache flush) */ - case ASI_BLK_COMMIT_S: /* UA2007/JPS1 Block store secondary (cache flush) */ - case ASI_BLK_P: /* UA2007/JPS1 Block store primary */ - case ASI_BLK_S: /* UA2007/JPS1 Block store secondary */ - case ASI_BLK_PL: /* UA2007/JPS1 Block store primary LE */ - case ASI_BLK_SL: /* UA2007/JPS1 Block store secondary LE */ - if (rd & 7) { - helper_raise_exception(env, TT_ILL_INSN); - return; - } - helper_check_align(env, addr, 0x3f); - for (i = 0; i < 8; i++, rd += 2, addr += 8) { - helper_st_asi(env, addr, env->fpr[rd / 2].ll, asi & 0x8f, MO_Q); - } - - return; - case ASI_BLK_AIUP_4V: /* UA2007 Block load primary, user privilege */ - case ASI_BLK_AIUS_4V: /* UA2007 Block load secondary, user privilege */ - case ASI_BLK_AIUP_L_4V: /* UA2007 Block load primary LE, user privilege */ - case ASI_BLK_AIUS_L_4V: /* UA2007 Block load secondary LE, user privilege */ - case ASI_BLK_AIUP: /* JPS1 Block store primary, user privilege */ - case ASI_BLK_AIUS: /* JPS1 Block store secondary, user privilege */ - case ASI_BLK_AIUPL: /* JPS1 Block load primary LE, user privilege */ - case ASI_BLK_AIUSL: /* JPS1 Block load secondary LE, user privilege */ - if (rd & 7) { - helper_raise_exception(env, TT_ILL_INSN); - return; - } - helper_check_align(env, addr, 0x3f); - for (i = 0; i < 8; i++, rd += 2, addr += 8) { - helper_st_asi(env, addr, env->fpr[rd / 2].ll, asi & 0x19, MO_Q); - } - - return; - case ASI_FL16_P: /* 16-bit floating point load primary */ - case ASI_FL16_S: /* 16-bit floating point load secondary */ - case ASI_FL16_PL: /* 16-bit floating point load primary, LE */ - case ASI_FL16_SL: /* 16-bit floating point load secondary, LE */ - val = env->fpr[rd / 2].l.lower; - helper_st_asi(env, addr, val, asi & 0x8d, MO_UW); - return; - case ASI_FL8_P: /* 8-bit floating point load primary */ - case ASI_FL8_S: /* 8-bit floating point load secondary */ - case ASI_FL8_PL: /* 8-bit floating point load primary, LE */ - case ASI_FL8_SL: /* 8-bit floating point load secondary, LE */ - val = env->fpr[rd / 2].l.lower; - helper_st_asi(env, addr, val, asi & 0x8d, MO_UB); - return; - default: - helper_check_align(env, addr, 3); - break; - } - - switch (size) { - default: - case 4: - if (rd & 1) { - val = env->fpr[rd / 2].l.lower; - } else { - val = env->fpr[rd / 2].l.upper; - } - helper_st_asi(env, addr, val, asi, MO_UL); - break; - case 8: - helper_st_asi(env, addr, env->fpr[rd / 2].ll, asi, MO_Q); - break; - case 16: - helper_st_asi(env, addr, env->fpr[rd / 2].ll, asi, MO_Q); - helper_st_asi(env, addr + 8, env->fpr[rd / 2 + 1].ll, asi, MO_Q); - break; - } -} - target_ulong helper_casx_asi(CPUSPARCState *env, target_ulong addr, target_ulong val1, target_ulong val2, uint32_t asi) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index cee1e5c..2cf9f83 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -2400,13 +2400,36 @@ static void gen_ldf_asi(DisasContext *dc, TCGv addr, default: { TCGv_i32 r_asi = tcg_const_i32(da.asi); - TCGv_i32 r_size = tcg_const_i32(size); - TCGv_i32 r_rd = tcg_const_i32(rd); + TCGv_i32 r_mop = tcg_const_i32(da.memop); save_state(dc); - gen_helper_ldf_asi(cpu_env, addr, r_asi, r_size, r_rd); - tcg_temp_free_i32(r_rd); - tcg_temp_free_i32(r_size); + /* According to the table in the UA2011 manual, the only + other asis that are valid for ldfa/lddfa/ldqfa are + the NO_FAULT asis. We still need a helper for these, + but we can just use the integer asi helper for them. */ + switch (size) { + case 4: + { + TCGv d64 = tcg_temp_new_i64(); + gen_helper_ld_asi(d64, cpu_env, addr, r_asi, r_mop); + d32 = gen_dest_fpr_F(dc); + tcg_gen_extrl_i64_i32(d32, d64); + tcg_temp_free_i64(d64); + gen_store_fpr_F(dc, rd, d32); + } + break; + case 8: + gen_helper_ld_asi(cpu_fpr[rd / 2], cpu_env, addr, r_asi, r_mop); + break; + case 16: + gen_helper_ld_asi(cpu_fpr[rd / 2], cpu_env, addr, r_asi, r_mop); + tcg_gen_addi_tl(addr, addr, 8); + gen_helper_ld_asi(cpu_fpr[rd/2+1], cpu_env, addr, r_asi, r_mop); + break; + default: + g_assert_not_reached(); + } + tcg_temp_free_i32(r_mop); tcg_temp_free_i32(r_asi); } break; @@ -2478,17 +2501,10 @@ static void gen_stf_asi(DisasContext *dc, TCGv addr, break; default: - { - TCGv_i32 r_asi = tcg_const_i32(da.asi); - TCGv_i32 r_size = tcg_const_i32(size); - TCGv_i32 r_rd = tcg_const_i32(rd); - - save_state(dc); - gen_helper_stf_asi(cpu_env, addr, r_asi, r_size, r_rd); - tcg_temp_free_i32(r_rd); - tcg_temp_free_i32(r_size); - tcg_temp_free_i32(r_asi); - } + /* According to the table in the UA2011 manual, the only + other asis that are valid for ldfa/lddfa/ldqfa are + the PST* asis, which aren't currently handled. */ + gen_exception(dc, TT_ILL_INSN); break; } }