From nobody Sun Feb 8 14:57:28 2026 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 1495663812957171.426061030941; Wed, 24 May 2017 15:10:12 -0700 (PDT) Received: from localhost ([::1]:57028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDeTr-0000Mg-H9 for importer@patchew.org; Wed, 24 May 2017 18:10:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDeSM-0007aI-47 for qemu-devel@nongnu.org; Wed, 24 May 2017 18:08:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDeSK-000579-Rh for qemu-devel@nongnu.org; Wed, 24 May 2017 18:08:38 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:35940) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDeSK-00056z-NM for qemu-devel@nongnu.org; Wed, 24 May 2017 18:08:36 -0400 Received: by mail-qk0-x243.google.com with SMTP id y128so28223887qka.3 for ; Wed, 24 May 2017 15:08:36 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id y188sm3347693qkb.49.2017.05.24.15.08.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 15:08:35 -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=NUKjNmAfdxtJMMSiVbszP4KgyoKRdvFpAkU/t9fGL6Y=; b=bj1q9sLquWZ10gNggrLEfp1tkX/f6Uq14oqJTWvU/9E1BBSm13ceYZLRnAcfwwNsLn EbPQKWJUtXiNE1rYU0/u0d5Hmqi8kG70F255pSscuv0vnH00Fh8mn2vGSLM4Cdr+2vMK ExTST+N6lz798gpVA/Jait3mkT0sdXQMCLZO2oln0vlHcLEH5uUeMEJXJ5Aso47O+iYm lt/HS0bSD/xbhgmiQjIxDaAieulzD+LbcwoCb0XP8k3wWWqF/x4L7C8JlQj0W3/hfWC0 76E2KtcTmdKxhVQvM5IOik5whWQokvjNcaht1fJBpxj2MdpSOysjyFV2rfz+9j+biVGc jZOw== 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=NUKjNmAfdxtJMMSiVbszP4KgyoKRdvFpAkU/t9fGL6Y=; b=kCW2rsbO71jgCUm7cHYslqR928eOTWMW5x0vK4SyjAHIHZA+bpfDWdiBPJvX144bh8 47B7Ebv1J2NfROT0Mx2xLY4LIFj1QS6r0MCyUJjp14Pg7tfvqeCodObihowpkeHzQgjG J0ZFgiDxoELB5caqVulqI1vtInckIsZwkmuNLdwZM66bhs1LVnW6gy+CQ2Hw6L+fRVXZ TifeREOU2jkU5hpHCQuz6ON1JsHqnRhECG/3N5C0ma/YoQcc6/dNp/wfVUuLn/HjkEyP tM18tMNEpEs3TbF13B69dVhEXhb2KqgbbRlBhdXqipM/A9l46l3+iVQ8XgGtZRXy56rK xS3g== X-Gm-Message-State: AODbwcBTjJPrTLnRGGCfNl25h0JkzBrqz0MnA5KM93huWQaWx1uk+C+9 cRyylzIs/XbHXXYm4gA= X-Received: by 10.55.17.82 with SMTP id b79mr34348800qkh.18.1495663715826; Wed, 24 May 2017 15:08:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 15:08:25 -0700 Message-Id: <20170524220827.21154-3-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170524220827.21154-1-rth@twiddle.net> References: <20170524220827.21154-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH 2/4] target/s390x: End the TB after EXECUTE 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: thuth@redhat.com, aurelien@aurel32.net 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" This split will be required for implementing EXECUTE properly. Do this now as a separate step to aid comparison of before and after TB listings. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target/s390x/mem_helper.c | 54 ++++++++++++++++++++++++++++---------------= ---- target/s390x/translate.c | 6 +++++- 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 4b96c27..d57d5b1 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1234,6 +1234,7 @@ void HELPER(ex)(CPUS390XState *env, uint32_t ilen, ui= nt64_t r1, uint64_t addr) S390CPU *cpu =3D s390_env_get_cpu(env); uint64_t insn =3D cpu_lduw_code(env, addr); uint8_t opc =3D insn >> 8; + uint32_t cc; =20 /* Or in the contents of R1[56:63]. */ insn |=3D r1 & 0xff; @@ -1263,42 +1264,46 @@ void HELPER(ex)(CPUS390XState *env, uint32_t ilen, = uint64_t r1, uint64_t addr) b2 =3D extract64(insn, 28, 4); d1 =3D extract64(insn, 32, 12); d2 =3D extract64(insn, 16, 12); + + cc =3D env->cc_op; switch (opc & 0xf) { case 0x2: do_helper_mvc(env, l, get_address(env, 0, b1, d1), get_address(env, 0, b2, d2), 0); - return; + break; case 0x4: - env->cc_op =3D do_helper_nc(env, l, get_address(env, 0, b1, d1= ), - get_address(env, 0, b2, d2), 0); - return; + cc =3D do_helper_nc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); + break; case 0x5: - env->cc_op =3D do_helper_clc(env, l, get_address(env, 0, b1, d= 1), - get_address(env, 0, b2, d2), 0); - return; + cc =3D do_helper_clc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); + break; case 0x6: - env->cc_op =3D do_helper_oc(env, l, get_address(env, 0, b1, d1= ), - get_address(env, 0, b2, d2), 0); - return; + cc =3D do_helper_oc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); + break; case 0x7: - env->cc_op =3D do_helper_xc(env, l, get_address(env, 0, b1, d1= ), - get_address(env, 0, b2, d2), 0); - return; + cc =3D do_helper_xc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); + break; case 0xc: do_helper_tr(env, l, get_address(env, 0, b1, d1), get_address(env, 0, b2, d2), 0); - return; + break; case 0xd: - env->cc_op =3D do_helper_trt(env, l, get_address(env, 0, b1, d= 1), - get_address(env, 0, b2, d2), 0); - return; + cc =3D do_helper_trt(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); + break; + default: + goto abort; } } else if (opc =3D=3D 0x0a) { /* supervisor call */ env->int_svc_code =3D extract64(insn, 48, 8); env->int_svc_ilen =3D ilen; helper_exception(env, EXCP_SVC); - return; + g_assert_not_reached(); } else if (opc =3D=3D 0xbf) { uint32_t r1, r3, b2, d2; =20 @@ -1306,10 +1311,15 @@ void HELPER(ex)(CPUS390XState *env, uint32_t ilen, = uint64_t r1, uint64_t addr) r3 =3D extract64(insn, 48, 4); b2 =3D extract64(insn, 44, 4); d2 =3D extract64(insn, 32, 12); - env->cc_op =3D helper_icm(env, r1, get_address(env, 0, b2, d2), r3= ); - return; + cc =3D helper_icm(env, r1, get_address(env, 0, b2, d2), r3); + } else { + abort: + cpu_abort(CPU(cpu), + "EXECUTE on instruction prefix 0x%x not implemented\n", + opc); + g_assert_not_reached(); } =20 - cpu_abort(CPU(cpu), "EXECUTE on instruction prefix 0x%x not implemente= d\n", - opc); + env->cc_op =3D cc; + env->psw.addr +=3D ilen; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 5b8333f..70212c8 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1163,6 +1163,8 @@ typedef enum { the PC (for whatever reason), so there's no need to do it again on exiting the TB. */ EXIT_PC_UPDATED, + /* We have updated the PC and CC values. */ + EXIT_PC_CC_UPDATED, /* We are exiting the TB, but have neither emitted a goto_tb, nor updated the PC for the next instruction to be executed. */ EXIT_PC_STALE, @@ -2216,7 +2218,7 @@ static ExitStatus op_ex(DisasContext *s, DisasOps *o) tcg_temp_free_i64(v1); } =20 - return NO_EXIT; + return EXIT_PC_CC_UPDATED; } =20 static ExitStatus op_fieb(DisasContext *s, DisasOps *o) @@ -5489,6 +5491,8 @@ void gen_intermediate_code(CPUS390XState *env, struct= TranslationBlock *tb) /* Next TB starts off with CC_OP_DYNAMIC, so make sure the cc op type is in env */ update_cc_op(&dc); + /* FALLTHRU */ + case EXIT_PC_CC_UPDATED: /* Exit the TB, either by raising a debug exception or by return. = */ if (do_debug) { gen_exception(EXCP_DEBUG); --=20 2.9.4