From patchwork Tue Jul 12 19:02:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9226005 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 15F2A6086B for ; Tue, 12 Jul 2016 19:19:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0298127D85 for ; Tue, 12 Jul 2016 19:19:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB7FF27F94; Tue, 12 Jul 2016 19:19:51 +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 3BA2927D85 for ; Tue, 12 Jul 2016 19:19:51 +0000 (UTC) Received: from localhost ([::1]:42858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN3Di-0007zG-8u for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Jul 2016 15:19:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN2xd-0005N0-49 for qemu-devel@nongnu.org; Tue, 12 Jul 2016 15:03:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bN2xb-0002ke-KD for qemu-devel@nongnu.org; Tue, 12 Jul 2016 15:03:13 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35632) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bN2xb-0002kW-G6 for qemu-devel@nongnu.org; Tue, 12 Jul 2016 15:03:11 -0400 Received: by mail-qt0-x242.google.com with SMTP id q11so886640qtb.2 for ; Tue, 12 Jul 2016 12:03:11 -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=3SAvoP4QO6GrajoBeCLKBxHDowhVbmcQcQly1RPb8rs=; b=En+dG3BQ9V2VykhaFEU/2qou5rqVkU85QQfto1JKXljM4VZQ3zfBtjevwjDstuXN/0 sARvWkL0VuKj0tGSlSiCkIrLsUKbjPNvhVsFJ0A9KT+IvKqpkjo6wvhEOuyCM0lSzzEz 0KK91uMQCtiIdUdDgVkjPW0zCx81Z/EZLpEarHW1nue4iRrB/Y7F7HtvmbRGTlIZVCvj f2MN1ZAkMmlQoY+G8UbIp8cGeqUYQQIaW71Ql2yn/Ni1X54ALXy3f/Naa/xcKCm6Uij9 QA+Jiwrl/Xt8LGWlRxw6ANuRlKccnF016ySH59GQ2QJqC7bzOQTfUQLJZNPe4ADJDBLS 3xHw== 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=3SAvoP4QO6GrajoBeCLKBxHDowhVbmcQcQly1RPb8rs=; b=KmVZwZbGFZD4wTfr2fSRfKKCrZ2tZ31jWKF6mWB7+c8iXMfsWedF8t7UcEsKogJXNO t2ixijuFrLIjg25giFluriPVV9QZHSbAewb93NsnBnYfOHMdBSggnuI0Pf0VSfSo8lnq 1Xv1UU3g9idJ7jbXTD/VJwlHq3C5Q40u1QRUNoYS1JhbekHFJhDabxr8Aja1hCJYJEjG 06MvkFqnevLP/+kT5GndNoeBfzAXPMtjxla4VHGGUnYZ5rypjGq/Ym8P2m38w16F9bqK 2zc+2F1buTn87IDbGGrDopvN1wqgny6UgUYmFceNnrSyn3n5S0iA2qqXjvtJVvumITJN 07Tg== X-Gm-Message-State: ALyK8tJGkZ2kPQqyiJ+BBRaULeEM7Ev9ReFsPQi5oLOKB5JCgeSv8MUciMcAgTPohc0hLA== X-Received: by 10.237.49.101 with SMTP id 92mr5915840qtg.56.1468350191028; Tue, 12 Jul 2016 12:03:11 -0700 (PDT) Received: from bigtime.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id u87sm1209716qkl.30.2016.07.12.12.03.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jul 2016 12:03:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 12 Jul 2016 12:02:13 -0700 Message-Id: <1468350138-9736-20-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468350138-9736-1-git-send-email-rth@twiddle.net> References: <1468350138-9736-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:c0d::242 Subject: [Qemu-devel] [PULL 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: peter.maydell@linaro.org, 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 Tested-by: Mark Cave-Ayland 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 2ea6964..cee1e5c 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);