From patchwork Fri May 26 21:16:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9751219 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 7EA0C60249 for ; Fri, 26 May 2017 21:27:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 680AB28449 for ; Fri, 26 May 2017 21:27:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CF5328459; Fri, 26 May 2017 21:27:56 +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 AFD3D28449 for ; Fri, 26 May 2017 21:27:55 +0000 (UTC) Received: from localhost ([::1]:38567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEMm2-0003yo-Sr for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 May 2017 17:27:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEMbX-0000jt-VD for qemu-devel@nongnu.org; Fri, 26 May 2017 17:17:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEMbX-0008Na-4K for qemu-devel@nongnu.org; Fri, 26 May 2017 17:17:03 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:34668) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dEMbX-0008NO-04 for qemu-devel@nongnu.org; Fri, 26 May 2017 17:17:03 -0400 Received: by mail-qt0-x244.google.com with SMTP id l39so2852803qtb.1 for ; Fri, 26 May 2017 14:17:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=0PSVdR1D39N1/h4eREDaXo+1a2QK4PkAMwEx2YkLwzw=; b=tLnNsYAwn3n/upNafxO12jT461WIOOByzf1mdQfpUxK9BuGbrdNwqb0sOnocExriGO eI63Ztyoh4lBI+vENwBRYUdRApUnSxxm6jq4dpxgJpfoN761hYlo3Sihz64NZ10EptvI 3C7RA9bsJW5PthavZAU+bBSXXEq+QRP5065IEsOi+AVXjPmbhD7JlzKNYIgwxayT0s4P wisvjp93rvo5rSBRDE0+M+WCMnIb5P0OxP6OO3yudAgQN+/tLadVaLl44Rk8vc33apFw CK2OoEZMC1uiFwEYhft34LHVXu9lSxP25vYzFKWVgEZ8hdG+CKwqHovgPD5SZhlH1hg9 WYLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=0PSVdR1D39N1/h4eREDaXo+1a2QK4PkAMwEx2YkLwzw=; b=BowgEXt6+WrrCBR50ShISDirLIfMxqmOjSXCxAs9jVXAcRLcLX5DtbmMQ2tX7gLa7+ EfMA040aHH2qKmNbXgA0efjIT/rVSZtZiLHgepsexAj7EFf76tsM9YFceshBnfhCuBtS nclQcTGr9tFDATR/6nyD0+Rtftf0mHh7dNiyT7AiHfX2MEQYGiwQkw9oPQI4zHZ6E4kc 39YS/niQcm2hBdbDK+Ru7qajTcd786hh6MgYn7/CStx3zvXAv7Fj/rMMVyRj4BWJsc70 mcZ3sqzl5hw5p/KTGNfaB4sQ2/VyxtuSulgLwFPjgzP1qIM/wA9o7QizFafGlDpK2HUA Y3TA== X-Gm-Message-State: AODbwcCXSDMVUdkHPhI6OnWrTZSRxOC50tQ/8yW7wBe6DVnixFS5+i9R k1tkhlKVQ6+Y8W+GzXE= X-Received: by 10.237.62.136 with SMTP id n8mr5371465qtf.0.1495833422372; Fri, 26 May 2017 14:17:02 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id u19sm1262380qtc.64.2017.05.26.14.17.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 May 2017 14:17:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 26 May 2017 14:16:27 -0700 Message-Id: <20170526211638.32301-16-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170526211638.32301-1-rth@twiddle.net> References: <20170526211638.32301-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v7 15/26] tcg/s390: Implement goto_ptr 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Tested-by: Aurelien Jarno Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.h | 2 +- tcg/s390/tcg-target.inc.c | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h index 6b7bcfb..957f0c0 100644 --- a/tcg/s390/tcg-target.h +++ b/tcg/s390/tcg-target.h @@ -92,7 +92,7 @@ extern uint64_t s390_facilities; #define TCG_TARGET_HAS_mulsh_i32 0 #define TCG_TARGET_HAS_extrl_i64_i32 0 #define TCG_TARGET_HAS_extrh_i64_i32 0 -#define TCG_TARGET_HAS_goto_ptr 0 +#define TCG_TARGET_HAS_goto_ptr 1 #define TCG_TARGET_HAS_div2_i64 1 #define TCG_TARGET_HAS_rot_i64 1 diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c index a679280..5d7083e 100644 --- a/tcg/s390/tcg-target.inc.c +++ b/tcg/s390/tcg-target.inc.c @@ -1741,9 +1741,14 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, switch (opc) { case INDEX_op_exit_tb: - /* return value */ - tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R2, args[0]); - tgen_gotoi(s, S390_CC_ALWAYS, tb_ret_addr); + /* Reuse the zeroing that exists for goto_ptr. */ + a0 = args[0]; + if (a0 == 0) { + tgen_gotoi(s, S390_CC_ALWAYS, s->code_gen_epilogue); + } else { + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R2, a0); + tgen_gotoi(s, S390_CC_ALWAYS, tb_ret_addr); + } break; case INDEX_op_goto_tb: @@ -1767,6 +1772,10 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, s->tb_jmp_reset_offset[args[0]] = tcg_current_code_size(s); break; + case INDEX_op_goto_ptr: + tcg_out_insn(s, RR, BCR, S390_CC_ALWAYS, args[0]); + break; + OP_32_64(ld8u): /* ??? LLC (RXY format) is only present with the extended-immediate facility, whereas LLGC is always present. */ @@ -2241,6 +2250,7 @@ static const TCGTargetOpDef s390_op_defs[] = { { INDEX_op_exit_tb, { } }, { INDEX_op_goto_tb, { } }, { INDEX_op_br, { } }, + { INDEX_op_goto_ptr, { "r" } }, { INDEX_op_ld8u_i32, { "r", "r" } }, { INDEX_op_ld8s_i32, { "r", "r" } }, @@ -2439,6 +2449,14 @@ static void tcg_target_qemu_prologue(TCGContext *s) /* br %r3 (go to TB) */ tcg_out_insn(s, RR, BCR, S390_CC_ALWAYS, tcg_target_call_iarg_regs[1]); + /* + * Return path for goto_ptr. Set return value to 0, a-la exit_tb, + * and fall through to the rest of the epilogue. + */ + s->code_gen_epilogue = s->code_ptr; + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R2, 0); + + /* TB epilogue */ tb_ret_addr = s->code_ptr; /* lmg %r6,%r15,fs+48(%r15) (restore registers) */