From patchwork Thu Jun 2 05:57:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9149139 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 CD6D160467 for ; Thu, 2 Jun 2016 06:03:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C04DE2654B for ; Thu, 2 Jun 2016 06:03:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4CBC269DA; Thu, 2 Jun 2016 06:03:20 +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 295662654B for ; Thu, 2 Jun 2016 06:03:20 +0000 (UTC) Received: from localhost ([::1]:45359 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Lix-0008Lb-7c for patchwork-qemu-devel@patchwork.kernel.org; Thu, 02 Jun 2016 02:03:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Ldz-0004UN-P4 for qemu-devel@nongnu.org; Thu, 02 Jun 2016 01:58:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8Ldy-0003Bw-Hh for qemu-devel@nongnu.org; Thu, 02 Jun 2016 01:58:11 -0400 Received: from mail-qg0-x243.google.com ([2607:f8b0:400d:c04::243]:33018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8Ldy-0003Bh-Cc for qemu-devel@nongnu.org; Thu, 02 Jun 2016 01:58:10 -0400 Received: by mail-qg0-x243.google.com with SMTP id p34so8068463qgp.0 for ; Wed, 01 Jun 2016 22:58:10 -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=Cisl8y8dQbso1ffmLMcL6NqRMvghzss+cZT7HFMoQeE=; b=rI0jVgCsJtIvFsvbbOKwIMYNX+raZYzx5t7KDN4SLzJZbIgbr9x0eMLA04/hVg2yYq MH8Qdt0uGYa5PnyWnwmGxLh5OUONtv2FqkyEcJ57rCm9jFga/qDTjACf9xHTrF0+amDy fVu1b0zr99NZLzzo+4ylhNNakJPEmQysDouZFhaOQ32/1UsTtKlvqI5csUOtIH/uQrtd i2nY4nxAAcPsZUrT0pzc0L23hUggcCsr3mQsgRq6A/gg96tMsStdvsIqf2UBE+QaQV0J g77NUNGl6/E/0lIzBLL9uIjrXwjtVFmuEgJSKBxPMbS+UxOopsRhczDydZ1tVHUeW1nZ lV9Q== 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=Cisl8y8dQbso1ffmLMcL6NqRMvghzss+cZT7HFMoQeE=; b=J6E4+isYLu6volnEVcNXR2wHoF2c44g4oba0fp5a0Li+3VdHnSanpRaHpuOM+zGH1j 58Aisv8yjG+X+fy/gcjs0y/QTaDHJNP4fTtAUN4jFfavtX0RvrOYgUFdGLaxf78dn+yv 0PhGqlIVk45BuanAe9TM5LOBpoAZBynXf2yHhxWytaI5pgG1XsCu4OU4eYznsYzGpiyw hVcy8neEdrpLx/JmcThFgonyrEGTGVczzhPBpZ3Pes/V+o+ezhsZRmxUdxiKKNo4pDPZ BK7m4J+onu9GwJZRISpKrN/NPbYUOvs7Scgxy+rMVqGNyOCOIlQrgCgnw4KSZX9Hd9Fj Bx6g== X-Gm-Message-State: ALyK8tLLF/WWDgjw16Ej4Gwn1vlVLU8abmYtjk8ajHiHnz3foE48LyibQgF6kEB27RB83A== X-Received: by 10.140.142.70 with SMTP id 67mr3532518qho.36.1464847089846; Wed, 01 Jun 2016 22:58:09 -0700 (PDT) Received: from anchor.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id b10sm11631835qta.3.2016.06.01.22.58.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2016 22:58:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 1 Jun 2016 22:57:15 -0700 Message-Id: <1464847040-22536-20-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1464847040-22536-1-git-send-email-rth@twiddle.net> References: <1464847040-22536-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:c04::243 Subject: [Qemu-devel] [PATCH v3 19/24] target-sparc: Directly implement block and short ldf/stf asis 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, atar4qemu@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson --- target-sparc/translate.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 948869e..9151ab8 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -1989,6 +1989,8 @@ typedef enum { GET_ASI_EXCP, GET_ASI_DIRECT, GET_ASI_DTWINX, + GET_ASI_BLOCK, + GET_ASI_SHORT, } ASIType; typedef struct { @@ -2055,18 +2057,33 @@ static DisasASI get_asi(DisasContext *dc, int insn, TCGMemOp memop) case ASI_AIUPL: /* As if user primary LE */ case ASI_TWINX_AIUP: case ASI_TWINX_AIUP_L: + case ASI_BLK_AIUP_4V: + case ASI_BLK_AIUP_L_4V: + case ASI_BLK_AIUP: + case ASI_BLK_AIUPL: mem_idx = MMU_USER_IDX; break; case ASI_AIUS: /* As if user secondary */ case ASI_AIUSL: /* As if user secondary LE */ case ASI_TWINX_AIUS: case ASI_TWINX_AIUS_L: + case ASI_BLK_AIUS_4V: + case ASI_BLK_AIUS_L_4V: + case ASI_BLK_AIUS: + case ASI_BLK_AIUSL: mem_idx = MMU_USER_SECONDARY_IDX; break; case ASI_S: /* Secondary */ case ASI_SL: /* Secondary LE */ case ASI_TWINX_S: case ASI_TWINX_SL: + case ASI_BLK_COMMIT_S: + case ASI_BLK_S: + case ASI_BLK_SL: + case ASI_FL8_S: + case ASI_FL8_SL: + case ASI_FL16_S: + case ASI_FL16_SL: if (mem_idx == MMU_USER_IDX) { mem_idx = MMU_USER_SECONDARY_IDX; } else if (mem_idx == MMU_KERNEL_IDX) { @@ -2077,6 +2094,13 @@ static DisasASI get_asi(DisasContext *dc, int insn, TCGMemOp memop) case ASI_PL: /* Primary LE */ case ASI_TWINX_P: case ASI_TWINX_PL: + case ASI_BLK_COMMIT_P: + case ASI_BLK_P: + case ASI_BLK_PL: + case ASI_FL8_P: + case ASI_FL8_PL: + case ASI_FL16_P: + case ASI_FL16_PL: break; } switch (asi) { @@ -2104,6 +2128,36 @@ static DisasASI get_asi(DisasContext *dc, int insn, TCGMemOp memop) case ASI_TWINX_SL: type = GET_ASI_DTWINX; break; + case ASI_BLK_COMMIT_P: + case ASI_BLK_COMMIT_S: + case ASI_BLK_AIUP_4V: + case ASI_BLK_AIUP_L_4V: + case ASI_BLK_AIUP: + case ASI_BLK_AIUPL: + case ASI_BLK_AIUS_4V: + case ASI_BLK_AIUS_L_4V: + case ASI_BLK_AIUS: + case ASI_BLK_AIUSL: + case ASI_BLK_S: + case ASI_BLK_SL: + case ASI_BLK_P: + case ASI_BLK_PL: + type = GET_ASI_BLOCK; + break; + case ASI_FL8_S: + case ASI_FL8_SL: + case ASI_FL8_P: + case ASI_FL8_PL: + memop = MO_UB; + type = GET_ASI_SHORT; + break; + case ASI_FL16_S: + case ASI_FL16_SL: + case ASI_FL16_P: + case ASI_FL16_PL: + memop = MO_TEUW; + type = GET_ASI_SHORT; + break; } /* The little-endian asis all have bit 3 set. */ if (asi & 8) { @@ -2309,6 +2363,40 @@ static void gen_ldf_asi(DisasContext *dc, TCGv addr, } break; + case GET_ASI_BLOCK: + /* Valid for lddfa on aligned registers only. */ + if (size == 8 && (rd & 7) == 0) { + TCGv eight; + int i; + + gen_check_align(addr, 0x3f); + gen_address_mask(dc, addr); + + eight = tcg_const_tl(8); + for (i = 0; ; ++i) { + tcg_gen_qemu_ld_i64(cpu_fpr[rd / 2 + i], addr, + da.mem_idx, da.memop); + if (i == 7) { + break; + } + tcg_gen_add_tl(addr, addr, eight); + } + tcg_temp_free(eight); + } else { + gen_exception(dc, TT_ILL_INSN); + } + break; + + case GET_ASI_SHORT: + /* Valid for lddfa only. */ + if (size == 8) { + gen_address_mask(dc, addr); + tcg_gen_qemu_ld_i64(cpu_fpr[rd / 2], addr, da.mem_idx, da.memop); + } else { + gen_exception(dc, TT_ILL_INSN); + } + break; + default: { TCGv_i32 r_asi = tcg_const_i32(da.asi); @@ -2355,6 +2443,40 @@ static void gen_stf_asi(DisasContext *dc, TCGv addr, } break; + case GET_ASI_BLOCK: + /* Valid for stdfa on aligned registers only. */ + if (size == 8 && (rd & 7) == 0) { + TCGv eight; + int i; + + gen_check_align(addr, 0x3f); + gen_address_mask(dc, addr); + + eight = tcg_const_tl(8); + for (i = 0; ; ++i) { + tcg_gen_qemu_st_i64(cpu_fpr[rd / 2 + i], addr, + da.mem_idx, da.memop); + if (i == 7) { + break; + } + tcg_gen_add_tl(addr, addr, eight); + } + tcg_temp_free(eight); + } else { + gen_exception(dc, TT_ILL_INSN); + } + break; + + case GET_ASI_SHORT: + /* Valid for stdfa only. */ + if (size == 8) { + gen_address_mask(dc, addr); + tcg_gen_qemu_st_i64(cpu_fpr[rd / 2], addr, da.mem_idx, da.memop); + } else { + gen_exception(dc, TT_ILL_INSN); + } + break; + default: { TCGv_i32 r_asi = tcg_const_i32(da.asi);