From nobody Wed Nov 5 18:27:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496682648434473.00943988219376; Mon, 5 Jun 2017 10:10:48 -0700 (PDT) Received: from localhost ([::1]:34440 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHvWf-00059V-Rq for importer@patchew.org; Mon, 05 Jun 2017 13:10:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHvFT-0004a7-EG for qemu-devel@nongnu.org; Mon, 05 Jun 2017 12:53:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHvFS-0003rd-G1 for qemu-devel@nongnu.org; Mon, 05 Jun 2017 12:52:59 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35016) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHvFS-0003r4-Bl for qemu-devel@nongnu.org; Mon, 05 Jun 2017 12:52:58 -0400 Received: by mail-qt0-x242.google.com with SMTP id x58so9853924qtc.2 for ; Mon, 05 Jun 2017 09:52:58 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id c6sm1637044qtb.56.2017.06.05.09.52.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jun 2017 09:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=0PSVdR1D39N1/h4eREDaXo+1a2QK4PkAMwEx2YkLwzw=; b=d+c/ZhzCpUTf+yL8M3Vt4TfUSMZ2RRpX4Wy6Y8CJVWGk5EXyY0cga7QMDvoFBfC4BK XyUwR7rO1DqjrnYowziozKobN5gyYtKk0LA7gfL/gMYnbflBlu2B//CP+nbBKLDpHLym jk7gCsDIQXgSk4OqEJGkqlLOKPdK+h18y1VOd4km3qRatx85KAsGXOiDrmXT4H+tyeXN iRfEf92QSeVUVdgxcKuU0Y2byLkVzTsFR3/MmhoJakxuOops4YKVW1Q9tovTmtrWoy3Z F8ZcU0+0sMqKgyGcWgYSgZ4dpHMxrYQCBN2P8ivzH+XpzOa44+y9JqCNAUap98MjTX1H uaJg== 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:cc:subject:date:message-id :in-reply-to:references; bh=0PSVdR1D39N1/h4eREDaXo+1a2QK4PkAMwEx2YkLwzw=; b=TEkvI0WcO4T6fmecM0U2VL5Whp5y8OHrOvGF1VYyYfeqHlH7MW0b+kcHQyA0A+ZDyJ vG4qU4xxNOnWevdwBju0FPhZbD2vPxAag8J4kVrikVt0vKm2aDUAcBm4Jj0ReK2PB5Rk eAcwU/bRZbRUbsdqLHKsBX0mOjjH94JUBa/uZoOU7h0/KV9XZhkYIedGKMs+eQTpKtgT R7GkkMHu3fci99RrG5nAahp4xUEL83QiHss9u/pPVhmmlH0DbtUhTGzkRQxTl56BzCZX 9F2GBMHJOQQFgY5Us6BpOopYn46ptCFtw+mZOEEIKfYqWNFCmwcwdcs5rby+HTc4xcOQ PL4Q== X-Gm-Message-State: AODbwcCQ/YJY0+hRXq3ltKLu/DffgpIQt885J6+gmEhF2KwPU/kC9Ddk KUQsm0DI/iXUeo2ysMM= X-Received: by 10.200.36.108 with SMTP id d41mr25451067qtd.42.1496681577505; Mon, 05 Jun 2017 09:52:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 5 Jun 2017 09:52:22 -0700 Message-Id: <20170605165233.4135-16-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170605165233.4135-1-rth@twiddle.net> References: <20170605165233.4135-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::242 Subject: [Qemu-devel] [PULL 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =20 #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, TCGOpco= de opc, =20 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 =3D args[0]; + if (a0 =3D=3D 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; =20 case INDEX_op_goto_tb: @@ -1767,6 +1772,10 @@ static inline void tcg_out_op(TCGContext *s, TCGOpco= de opc, s->tb_jmp_reset_offset[args[0]] =3D tcg_current_code_size(s); break; =20 + 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[] =3D { { INDEX_op_exit_tb, { } }, { INDEX_op_goto_tb, { } }, { INDEX_op_br, { } }, + { INDEX_op_goto_ptr, { "r" } }, =20 { 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]); =20 + /* + * 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 =3D s->code_ptr; + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R2, 0); + + /* TB epilogue */ tb_ret_addr =3D s->code_ptr; =20 /* lmg %r6,%r15,fs+48(%r15) (restore registers) */ --=20 2.9.4