From nobody Fri May 17 11:29:13 2024 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.zohomail.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 1499719647107911.0551436185185; Mon, 10 Jul 2017 13:47:27 -0700 (PDT) Received: from localhost ([::1]:42986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfaW-0002pP-TM for importer@patchew.org; Mon, 10 Jul 2017 16:47:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfYo-0001o8-QE for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUfYl-0004Be-KE for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:38 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUfYl-0004AW-Fu for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:35 -0400 Received: by mail-qt0-x243.google.com with SMTP id m54so14180472qtb.1 for ; Mon, 10 Jul 2017 13:45:35 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id v47sm9961143qtb.11.2017.07.10.13.45.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 13:45:33 -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=bX6B1hIYa5HLZ6+5qGH7LfzLu1YsgPE/CoaEyxD8qdU=; b=Y/Sc52gfouShL2pphdKcr/nK1dBlivgCA+1Q9RxFOwAffB2AbK3pi2iuBuJrgOxuGB 3INarlRQcqbD7gVb43L35QZVdxUga7JXEaEYp7QdU4IpzI4stwTFsZNZrA+iBaEPXWuF XalR45wrfVwwEt+SEyuBS11LU5EpWayhecKx6Y7EVVOGD8GdaK7Xj87tca7xAVjoo+KI 3rKr7+mgxj7M4x10A80ooAgeaPQgFLY5QLeVMk7tnlXSs2NVyP7lnrvzjyuw7pBukcz+ awv35Q8E0UW2qM1ZdZhG6cO5Fa/IJNt7EjsG5Hw5I0FK2f/htiT8X7BddQE9Cd3mcN+T +IEA== 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=bX6B1hIYa5HLZ6+5qGH7LfzLu1YsgPE/CoaEyxD8qdU=; b=PotztDtc0g166wYFEdLFcoAaq+uGkYjjrw+P8uKVOjyWCvW7V+TGAdvqXDKmOenNZK dRG8YpcIBMiBGwia5H5IxRwctO7CtO6aD+sm1bxWjGM/UyQS6GzDDDDB/o6dyQnryfOG kCRSQdLzqDnZazP1+JLGRrWo69jIvXD55mPuMftfFSB70upAelUR0gHhlkfcQMNR2Zd7 H7IjvIBDGinljjjEVSa/gf+OuPaDoZrUY1G2nmAzXgCkj+3auFyP1WVfiB8/nrLFVseh JrGgrVQwnTzGp/iOv+kjZkYQKOtyy0oQbP6xskx30EZDrBgi9KdYu0OjQJGI/dbnCR9I 7/5Q== X-Gm-Message-State: AIVw111uS0sr8bjpJPv+AcgmpEMIx3l2TfYkM2Oo+V5+arovg31ZuxPd I+ftMu4MHgDf29bbXDQ= X-Received: by 10.200.48.237 with SMTP id w42mr7083785qta.54.1499719534172; Mon, 10 Jul 2017 13:45:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 10:45:14 -1000 Message-Id: <20170710204521.2058-2-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710204521.2058-1-rth@twiddle.net> References: <20170710204521.2058-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::243 Subject: [Qemu-devel] [PATCH v3 1/8] target/s390x: Implement CSST 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: aurelien@aurel32.net, david@redhat.com 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" Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target/s390x/helper.h | 1 + target/s390x/cpu_models.c | 2 + target/s390x/mem_helper.c | 189 +++++++++++++++++++++++++++++++++++++++++= ++++ target/s390x/translate.c | 13 +++- target/s390x/insn-data.def | 2 + 5 files changed, 206 insertions(+), 1 deletion(-) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 964097b..23e8d1d 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -33,6 +33,7 @@ DEF_HELPER_3(celgb, i64, env, i64, i32) DEF_HELPER_3(cdlgb, i64, env, i64, i32) DEF_HELPER_3(cxlgb, i64, env, i64, i32) DEF_HELPER_4(cdsg, void, env, i64, i32, i32) +DEF_HELPER_4(csst, i32, env, i32, i64, i64) DEF_HELPER_FLAGS_3(aeb, TCG_CALL_NO_WG, i64, env, i64, i64) DEF_HELPER_FLAGS_3(adb, TCG_CALL_NO_WG, i64, env, i64, i64) DEF_HELPER_FLAGS_5(axb, TCG_CALL_NO_WG, i64, env, i64, i64, i64, i64) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 7cb55dc..2c86b24 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -736,6 +736,8 @@ static void add_qemu_cpu_model_features(S390FeatBitmap = fbm) S390_FEAT_ETF2_ENH, S390_FEAT_STORE_CLOCK_FAST, S390_FEAT_MOVE_WITH_OPTIONAL_SPEC, + S390_FEAT_COMPARE_AND_SWAP_AND_STORE, + S390_FEAT_COMPARE_AND_SWAP_AND_STORE_2, S390_FEAT_GENERAL_INSTRUCTIONS_EXT, S390_FEAT_EXECUTE_EXT, S390_FEAT_FLOATING_POINT_SUPPPORT_ENH, diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index ede8471..513b402 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1353,6 +1353,195 @@ void HELPER(cdsg)(CPUS390XState *env, uint64_t addr, env->regs[r1 + 1] =3D int128_getlo(oldv); } =20 +uint32_t HELPER(csst)(CPUS390XState *env, uint32_t r3, uint64_t a1, uint64= _t a2) +{ +#if !defined(CONFIG_USER_ONLY) || defined(CONFIG_ATOMIC128) + uint32_t mem_idx =3D cpu_mmu_index(env, false); +#endif + uintptr_t ra =3D GETPC(); + uint32_t fc =3D extract32(env->regs[0], 0, 8); + uint32_t sc =3D extract32(env->regs[0], 8, 8); + uint64_t pl =3D get_address(env, 1) & -16; + uint64_t svh, svl; + uint32_t cc; + + /* Sanity check the function code and storage characteristic. */ + if (fc > 1 || sc > 3) { + if (!s390_has_feat(S390_FEAT_COMPARE_AND_SWAP_AND_STORE_2)) { + goto spec_exception; + } + if (fc > 2 || sc > 4 || (fc =3D=3D 2 && (r3 & 1))) { + goto spec_exception; + } + } + + /* Sanity check the alignments. */ + if (extract32(a1, 0, 4 << fc) || extract32(a2, 0, 1 << sc)) { + goto spec_exception; + } + + /* Sanity check writability of the store address. */ +#ifndef CONFIG_USER_ONLY + probe_write(env, a2, mem_idx, ra); +#endif + + /* Note that the compare-and-swap is atomic, and the store is atomic, = but + the complete operation is not. Therefore we do not need to assert = serial + context in order to implement this. That said, restart early if we= can't + support either operation that is supposed to be atomic. */ + if (parallel_cpus) { + int mask =3D 0; +#if !defined(CONFIG_ATOMIC64) + mask =3D -8; +#elif !defined(CONFIG_ATOMIC128) + mask =3D -16; +#endif + if (((4 << fc) | (1 << sc)) & mask) { + cpu_loop_exit_atomic(ENV_GET_CPU(env), ra); + } + } + + /* All loads happen before all stores. For simplicity, load the entire + store value area from the parameter list. */ + svh =3D cpu_ldq_data_ra(env, pl + 16, ra); + svl =3D cpu_ldq_data_ra(env, pl + 24, ra); + + switch (fc) { + case 0: + { + uint32_t nv =3D cpu_ldl_data_ra(env, pl, ra); + uint32_t cv =3D env->regs[r3]; + uint32_t ov; + + if (parallel_cpus) { +#ifdef CONFIG_USER_ONLY + uint32_t *haddr =3D g2h(a1); + ov =3D atomic_cmpxchg__nocheck(haddr, cv, nv); +#else + TCGMemOpIdx oi =3D make_memop_idx(MO_TEUL | MO_ALIGN, mem_= idx); + ov =3D helper_atomic_cmpxchgl_be_mmu(env, a1, cv, nv, oi, = ra); +#endif + } else { + ov =3D cpu_ldl_data_ra(env, a1, ra); + cpu_stl_data_ra(env, a1, (ov =3D=3D cv ? nv : ov), ra); + } + cc =3D (ov !=3D cv); + env->regs[r3] =3D deposit64(env->regs[r3], 32, 32, ov); + } + break; + + case 1: + { + uint64_t nv =3D cpu_ldq_data_ra(env, pl, ra); + uint64_t cv =3D env->regs[r3]; + uint64_t ov; + + if (parallel_cpus) { +#ifdef CONFIG_USER_ONLY +# ifdef CONFIG_ATOMIC64 + uint64_t *haddr =3D g2h(a1); + ov =3D atomic_cmpxchg__nocheck(haddr, cv, nv); +# else + /* Note that we asserted !parallel_cpus above. */ + g_assert_not_reached(); +# endif +#else + TCGMemOpIdx oi =3D make_memop_idx(MO_TEQ | MO_ALIGN, mem_i= dx); + ov =3D helper_atomic_cmpxchgq_be_mmu(env, a1, cv, nv, oi, = ra); +#endif + } else { + ov =3D cpu_ldq_data_ra(env, a1, ra); + cpu_stq_data_ra(env, a1, (ov =3D=3D cv ? nv : ov), ra); + } + cc =3D (ov !=3D cv); + env->regs[r3] =3D ov; + } + break; + + case 2: + { + uint64_t nvh =3D cpu_ldq_data_ra(env, pl, ra); + uint64_t nvl =3D cpu_ldq_data_ra(env, pl + 8, ra); + Int128 nv =3D int128_make128(nvl, nvh); + Int128 cv =3D int128_make128(env->regs[r3 + 1], env->regs[r3]); + Int128 ov; + + if (parallel_cpus) { +#ifdef CONFIG_ATOMIC128 + TCGMemOpIdx oi =3D make_memop_idx(MO_TEQ | MO_ALIGN_16, me= m_idx); + ov =3D helper_atomic_cmpxchgo_be_mmu(env, a1, cv, nv, oi, = ra); + cc =3D !int128_eq(ov, cv); +#else + /* Note that we asserted !parallel_cpus above. */ + g_assert_not_reached(); +#endif + } else { + uint64_t oh =3D cpu_ldq_data_ra(env, a1 + 0, ra); + uint64_t ol =3D cpu_ldq_data_ra(env, a1 + 8, ra); + + ov =3D int128_make128(ol, oh); + cc =3D !int128_eq(ov, cv); + if (cc) { + nv =3D ov; + } + + cpu_stq_data_ra(env, a1 + 0, int128_gethi(nv), ra); + cpu_stq_data_ra(env, a1 + 8, int128_getlo(nv), ra); + } + + env->regs[r3 + 0] =3D int128_gethi(ov); + env->regs[r3 + 1] =3D int128_getlo(ov); + } + break; + + default: + g_assert_not_reached(); + } + + /* Store only if the comparison succeeded. Note that above we use a p= air + of 64-bit big-endian loads, so for sc < 3 we must extract the value + from the most-significant bits of svh. */ + if (cc =3D=3D 0) { + switch (sc) { + case 0: + cpu_stb_data_ra(env, a2, svh >> 56, ra); + break; + case 1: + cpu_stw_data_ra(env, a2, svh >> 48, ra); + break; + case 2: + cpu_stl_data_ra(env, a2, svh >> 32, ra); + break; + case 3: + cpu_stq_data_ra(env, a2, svh, ra); + break; + case 4: + if (parallel_cpus) { +#ifdef CONFIG_ATOMIC128 + TCGMemOpIdx oi =3D make_memop_idx(MO_TEQ | MO_ALIGN_16, me= m_idx); + Int128 sv =3D int128_make128(svl, svh); + helper_atomic_sto_be_mmu(env, a2, sv, oi, ra); +#else + /* Note that we asserted !parallel_cpus above. */ + g_assert_not_reached(); +#endif + } else { + cpu_stq_data_ra(env, a2 + 0, svh, ra); + cpu_stq_data_ra(env, a2 + 8, svl, ra); + } + default: + g_assert_not_reached(); + } + } + + return cc; + + spec_exception: + cpu_restore_state(ENV_GET_CPU(env), ra); + program_interrupt(env, PGM_SPECIFICATION, 6); + g_assert_not_reached(); +} + #if !defined(CONFIG_USER_ONLY) void HELPER(lctlg)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t = r3) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 592d6b0..e739525 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2033,6 +2033,18 @@ static ExitStatus op_cdsg(DisasContext *s, DisasOps = *o) return NO_EXIT; } =20 +static ExitStatus op_csst(DisasContext *s, DisasOps *o) +{ + int r3 =3D get_field(s->fields, r3); + TCGv_i32 t_r3 =3D tcg_const_i32(r3); + + gen_helper_csst(cc_op, cpu_env, t_r3, o->in1, o->in2); + tcg_temp_free_i32(t_r3); + + set_cc_static(s); + return NO_EXIT; +} + #ifndef CONFIG_USER_ONLY static ExitStatus op_csp(DisasContext *s, DisasOps *o) { @@ -5437,7 +5449,6 @@ enum DisasInsnEnum { /* Give smaller names to the various facilities. */ #define FAC_Z S390_FEAT_ZARCH #define FAC_CASS S390_FEAT_COMPARE_AND_SWAP_AND_STORE -#define FAC_CASS2 S390_FEAT_COMPARE_AND_SWAP_AND_STORE_2 #define FAC_DFP S390_FEAT_DFP #define FAC_DFPR S390_FEAT_FLOATING_POINT_SUPPPORT_ENH /* DFP-round= ing */ #define FAC_DO S390_FEAT_STFLE_45 /* distinct-operands */ diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index d3bb851..6ac12b8 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -265,6 +265,8 @@ D(0xbb00, CDS, RS_a, Z, r3_D32, r1_D32, new, r1_D32, cs, 0, MO_= TEQ) D(0xeb31, CDSY, RSY_a, LD, r3_D32, r1_D32, new, r1_D32, cs, 0, MO_= TEQ) C(0xeb3e, CDSG, RSY_a, Z, 0, 0, 0, 0, cdsg, 0) +/* COMPARE AND SWAP AND STORE */ + C(0xc802, CSST, SSF, CASS, la1, a2, 0, 0, csst, 0) =20 /* COMPARE AND TRAP */ D(0xb972, CRT, RRF_c, GIE, r1_32s, r2_32s, 0, 0, ct, 0, 0) --=20 2.9.4 From nobody Fri May 17 11:29:13 2024 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.zohomail.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 1499719653816807.2721300638533; Mon, 10 Jul 2017 13:47:33 -0700 (PDT) Received: from localhost ([::1]:42987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfae-0002yb-Gq for importer@patchew.org; Mon, 10 Jul 2017 16:47:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfYq-0001oF-Mt for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUfYn-0004FP-WF for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:40 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:36854) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUfYn-0004F2-Js for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:37 -0400 Received: by mail-qk0-x242.google.com with SMTP id v143so14388893qkb.3 for ; Mon, 10 Jul 2017 13:45:37 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id v47sm9961143qtb.11.2017.07.10.13.45.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 13:45: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=yQTjKjwJZ8rS70Hbwjp8tDpVSxA571KGI8WDADh+QtM=; b=UjOS0UJ/R0QT4NvIAg0Fs9imiqVG8L/xKNpQXJHFFqMO8uBJFep+6eIhbPxHBh5TFj ghfTQQZ+8eWITd2V+4CRpwowJYU1rWmmAizdeavf5rkEekE8eqqH5WHOn9wFGwDBChag bPG9Eyt+m17Q/Sy5N5UE0VUgoV268saawFLXMk8QM0y4InUFwPOJeRQXbLPl3gPoIXU3 Oz7/iExgZHz6y/CjnCkFtoIcs9uWmcTrHVIZ8cZ+NySQd1sdUSka5+oHNGnsYojicYVp NViv1ZguTO11KkwR2Pmu1Io7VezMKzcF/Y6uLqdm1yknBsiXL5CZRHd1clsGnkPt8T2g d/PA== 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=yQTjKjwJZ8rS70Hbwjp8tDpVSxA571KGI8WDADh+QtM=; b=dWKTqYftOpcnvQ1PIQd43YXMIyFcc1atlIb9zNWBLdXFbTDitdZ5ONefl8JMM/RdYZ EnLMENWQxhvJSVgeOQGOn1z/lUQCBgt2gI0+gFllwSoJbOmbEqFY+g1T3a+noId/4ZXe 1BftELKJlahHRvC3dn5YDSFGRaASxrgRmIlHjj+O85qyRrT67J8ZdAzrqaIYC156aitR IeKJfJsZo3LUy1rxqAf2AoD4VYntIIq94yMxQQUKrkww21vUlrDutKyUkRo3pLJpAJk+ 7vaKZLNqPR1E/4zUgcI8xWZl4xU4ZTDj2JN21s3s6ZkPvYB2Toss80nBpngB5IcTZNAE wQpw== X-Gm-Message-State: AIVw113jpzUhTgk0fMJkwC3UbCwGUmVNzbIjEWY8fPbMooaUaFdQAJ3c qnr3c1bhrdVHoe5nVNc= X-Received: by 10.55.77.13 with SMTP id a13mr6019111qkb.194.1499719536573; Mon, 10 Jul 2017 13:45:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 10:45:15 -1000 Message-Id: <20170710204521.2058-3-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710204521.2058-1-rth@twiddle.net> References: <20170710204521.2058-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::242 Subject: [Qemu-devel] [PATCH v3 2/8] target/s390x: Implement CONVERT UNICODE insns 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: aurelien@aurel32.net, david@redhat.com 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" Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target/s390x/helper.h | 6 + target/s390x/mem_helper.c | 310 +++++++++++++++++++++++++++++++++++++++++= ++++ target/s390x/translate.c | 43 +++++++ target/s390x/insn-data.def | 13 ++ 4 files changed, 372 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 23e8d1d..2793cf3 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -107,6 +107,12 @@ DEF_HELPER_2(stfle, i32, env, i64) DEF_HELPER_FLAGS_2(lpq, TCG_CALL_NO_WG, i64, env, i64) DEF_HELPER_FLAGS_4(stpq, TCG_CALL_NO_WG, void, env, i64, i64, i64) DEF_HELPER_4(mvcos, i32, env, i64, i64, i64) +DEF_HELPER_4(cu12, i32, env, i32, i32, i32) +DEF_HELPER_4(cu14, i32, env, i32, i32, i32) +DEF_HELPER_4(cu21, i32, env, i32, i32, i32) +DEF_HELPER_4(cu24, i32, env, i32, i32, i32) +DEF_HELPER_4(cu41, i32, env, i32, i32, i32) +DEF_HELPER_4(cu42, i32, env, i32, i32, i32) =20 #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 513b402..0b18560 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -2196,3 +2196,313 @@ uint32_t HELPER(mvcos)(CPUS390XState *env, uint64_t= dest, uint64_t src, =20 return cc; } + +/* Decode a Unicode character. A return value < 0 indicates success, stor= ing + the UTF-32 result into OCHAR and the input length into OLEN. A return + value >=3D 0 indicates failure, and the CC value to be returned. */ +typedef int (*decode_unicode_fn)(CPUS390XState *env, uint64_t addr, + uint64_t ilen, bool enh_check, uintptr_t = ra, + uint32_t *ochar, uint32_t *olen); + +/* Encode a Unicode character. A return value < 0 indicates success, stor= ing + the bytes into ADDR and the output length into OLEN. A return value >= =3D 0 + indicates failure, and the CC value to be returned. */ +typedef int (*encode_unicode_fn)(CPUS390XState *env, uint64_t addr, + uint64_t ilen, uintptr_t ra, uint32_t c, + uint32_t *olen); + +static int decode_utf8(CPUS390XState *env, uint64_t addr, uint64_t ilen, + bool enh_check, uintptr_t ra, + uint32_t *ochar, uint32_t *olen) +{ + uint8_t s0, s1, s2, s3; + uint32_t c, l; + + if (ilen < 1) { + return 0; + } + s0 =3D cpu_ldub_data_ra(env, addr, ra); + if (s0 <=3D 0x7f) { + /* one byte character */ + l =3D 1; + c =3D s0; + } else if (s0 <=3D (enh_check ? 0xc1 : 0xbf)) { + /* invalid character */ + return 2; + } else if (s0 <=3D 0xdf) { + /* two byte character */ + l =3D 2; + if (ilen < 2) { + return 0; + } + s1 =3D cpu_ldub_data_ra(env, addr + 1, ra); + c =3D s0 & 0x1f; + c =3D (c << 6) | (s1 & 0x3f); + if (enh_check && (s1 & 0xc0) !=3D 0x80) { + return 2; + } + } else if (s0 <=3D 0xef) { + /* three byte character */ + l =3D 3; + if (ilen < 3) { + return 0; + } + s1 =3D cpu_ldub_data_ra(env, addr + 1, ra); + s2 =3D cpu_ldub_data_ra(env, addr + 2, ra); + c =3D s0 & 0x0f; + c =3D (c << 6) | (s1 & 0x3f); + c =3D (c << 6) | (s2 & 0x3f); + /* Fold the byte-by-byte range descriptions in the PoO into + tests against the complete value. It disallows encodings + that could be smaller, and the UTF-16 surrogates. */ + if (enh_check + && ((s1 & 0xc0) !=3D 0x80 + || (s2 & 0xc0) !=3D 0x80 + || c < 0x1000 + || (c >=3D 0xd800 && c <=3D 0xdfff))) { + return 2; + } + } else if (s0 <=3D (enh_check ? 0xf4 : 0xf7)) { + /* four byte character */ + l =3D 4; + if (ilen < 4) { + return 0; + } + s1 =3D cpu_ldub_data_ra(env, addr + 1, ra); + s2 =3D cpu_ldub_data_ra(env, addr + 2, ra); + s3 =3D cpu_ldub_data_ra(env, addr + 3, ra); + c =3D s0 & 0x0f; + c =3D (c << 6) | (s1 & 0x3f); + c =3D (c << 6) | (s2 & 0x3f); + c =3D (c << 6) | (s3 & 0x3f); + /* See above. */ + if (enh_check + && ((s1 & 0xc0) !=3D 0x80 + || (s2 & 0xc0) !=3D 0x80 + || (s3 & 0xc0) !=3D 0x80 + || c < 0x010000 + || c > 0x10ffff)) { + return 2; + } + } else { + /* invalid character */ + return 2; + } + + *ochar =3D c; + *olen =3D l; + return -1; +} + +static int decode_utf16(CPUS390XState *env, uint64_t addr, uint64_t ilen, + bool enh_check, uintptr_t ra, + uint32_t *ochar, uint32_t *olen) +{ + uint16_t s0, s1; + uint32_t c, l; + + if (ilen < 2) { + return 0; + } + s0 =3D cpu_lduw_data_ra(env, addr, ra); + if ((s0 & 0xfc00) !=3D 0xd800) { + /* one word character */ + l =3D 2; + c =3D s0; + } else { + /* two word character */ + l =3D 4; + if (ilen < 4) { + return 0; + } + s1 =3D cpu_lduw_data_ra(env, addr + 2, ra); + c =3D extract32(s0, 6, 4) + 1; + c =3D (c << 6) | (s0 & 0x3f); + c =3D (c << 10) | (s1 & 0x3ff); + if (enh_check && (s1 & 0xfc00) !=3D 0xdc00) { + /* invalid surrogate character */ + return 2; + } + } + + *ochar =3D c; + *olen =3D l; + return -1; +} + +static int decode_utf32(CPUS390XState *env, uint64_t addr, uint64_t ilen, + bool enh_check, uintptr_t ra, + uint32_t *ochar, uint32_t *olen) +{ + uint32_t c; + + if (ilen < 4) { + return 0; + } + c =3D cpu_ldl_data_ra(env, addr, ra); + if ((c >=3D 0xd800 && c <=3D 0xdbff) || c > 0x10ffff) { + /* invalid unicode character */ + return 2; + } + + *ochar =3D c; + *olen =3D 4; + return -1; +} + +static int encode_utf8(CPUS390XState *env, uint64_t addr, uint64_t ilen, + uintptr_t ra, uint32_t c, uint32_t *olen) +{ + uint8_t d[4]; + uint32_t l, i; + + if (c <=3D 0x7f) { + /* one byte character */ + l =3D 1; + d[0] =3D c; + } else if (c <=3D 0x7ff) { + /* two byte character */ + l =3D 2; + d[1] =3D 0x80 | extract32(c, 0, 6); + d[0] =3D 0xc0 | extract32(c, 6, 5); + } else if (c <=3D 0xffff) { + /* three byte character */ + l =3D 3; + d[2] =3D 0x80 | extract32(c, 0, 6); + d[1] =3D 0x80 | extract32(c, 6, 6); + d[0] =3D 0xe0 | extract32(c, 12, 4); + } else { + /* four byte character */ + l =3D 4; + d[3] =3D 0x80 | extract32(c, 0, 6); + d[2] =3D 0x80 | extract32(c, 6, 6); + d[1] =3D 0x80 | extract32(c, 12, 6); + d[0] =3D 0xf0 | extract32(c, 18, 3); + } + + if (ilen < l) { + return 1; + } + for (i =3D 0; i < l; ++i) { + cpu_stb_data_ra(env, addr + i, d[i], ra); + } + + *olen =3D l; + return -1; +} + +static int encode_utf16(CPUS390XState *env, uint64_t addr, uint64_t ilen, + uintptr_t ra, uint32_t c, uint32_t *olen) +{ + uint16_t d0, d1; + + if (c <=3D 0xffff) { + /* one word character */ + if (ilen < 2) { + return 1; + } + cpu_stw_data_ra(env, addr, c, ra); + *olen =3D 2; + } else { + /* two word character */ + if (ilen < 4) { + return 1; + } + d1 =3D 0xdc00 | extract32(c, 0, 10); + d0 =3D 0xd800 | extract32(c, 10, 6); + d0 =3D deposit32(d0, 6, 4, extract32(c, 16, 5) - 1); + cpu_stw_data_ra(env, addr + 0, d0, ra); + cpu_stw_data_ra(env, addr + 2, d1, ra); + *olen =3D 4; + } + + return -1; +} + +static int encode_utf32(CPUS390XState *env, uint64_t addr, uint64_t ilen, + uintptr_t ra, uint32_t c, uint32_t *olen) +{ + if (ilen < 4) { + return 1; + } + cpu_stl_data_ra(env, addr, c, ra); + *olen =3D 4; + return -1; +} + +static inline uint32_t convert_unicode(CPUS390XState *env, uint32_t r1, + uint32_t r2, uint32_t m3, uintptr_t= ra, + decode_unicode_fn decode, + encode_unicode_fn encode) +{ + uint64_t dst =3D get_address(env, r1); + uint64_t dlen =3D get_length(env, r1 + 1); + uint64_t src =3D get_address(env, r2); + uint64_t slen =3D get_length(env, r2 + 1); + bool enh_check =3D m3 & 1; + int cc, i; + + /* Lest we fail to service interrupts in a timely manner, limit the + amount of work we're willing to do. For now, let's cap at 256. */ + for (i =3D 0; i < 256; ++i) { + uint32_t c, ilen, olen; + + cc =3D decode(env, src, slen, enh_check, ra, &c, &ilen); + if (unlikely(cc >=3D 0)) { + break; + } + cc =3D encode(env, dst, dlen, ra, c, &olen); + if (unlikely(cc >=3D 0)) { + break; + } + + src +=3D ilen; + slen -=3D ilen; + dst +=3D olen; + dlen -=3D olen; + cc =3D 3; + } + + set_address(env, r1, dst); + set_length(env, r1 + 1, dlen); + set_address(env, r2, src); + set_length(env, r2 + 1, slen); + + return cc; +} + +uint32_t HELPER(cu12)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32= _t m3) +{ + return convert_unicode(env, r1, r2, m3, GETPC(), + decode_utf8, encode_utf16); +} + +uint32_t HELPER(cu14)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32= _t m3) +{ + return convert_unicode(env, r1, r2, m3, GETPC(), + decode_utf8, encode_utf32); +} + +uint32_t HELPER(cu21)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32= _t m3) +{ + return convert_unicode(env, r1, r2, m3, GETPC(), + decode_utf16, encode_utf8); +} + +uint32_t HELPER(cu24)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32= _t m3) +{ + return convert_unicode(env, r1, r2, m3, GETPC(), + decode_utf16, encode_utf32); +} + +uint32_t HELPER(cu41)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32= _t m3) +{ + return convert_unicode(env, r1, r2, m3, GETPC(), + decode_utf32, encode_utf8); +} + +uint32_t HELPER(cu42)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32= _t m3) +{ + return convert_unicode(env, r1, r2, m3, GETPC(), + decode_utf32, encode_utf16); +} diff --git a/target/s390x/translate.c b/target/s390x/translate.c index e739525..339b31e 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2122,6 +2122,48 @@ static ExitStatus op_ct(DisasContext *s, DisasOps *o) return NO_EXIT; } =20 +static ExitStatus op_cuXX(DisasContext *s, DisasOps *o) +{ + int m3 =3D get_field(s->fields, m3); + TCGv_i32 r1 =3D tcg_const_i32(get_field(s->fields, r1)); + TCGv_i32 r2 =3D tcg_const_i32(get_field(s->fields, r2)); + TCGv_i32 chk; + + if (!s390_has_feat(S390_FEAT_ETF3_ENH)) { + m3 =3D 0; + } + chk =3D tcg_const_i32(m3); + + switch (s->insn->data) { + case 12: + gen_helper_cu12(cc_op, cpu_env, r1, r2, chk); + break; + case 14: + gen_helper_cu14(cc_op, cpu_env, r1, r2, chk); + break; + case 21: + gen_helper_cu21(cc_op, cpu_env, r1, r2, chk); + break; + case 24: + gen_helper_cu24(cc_op, cpu_env, r1, r2, chk); + break; + case 41: + gen_helper_cu41(cc_op, cpu_env, r1, r2, chk); + break; + case 42: + gen_helper_cu42(cc_op, cpu_env, r1, r2, chk); + break; + default: + g_assert_not_reached(); + } + + tcg_temp_free_i32(r1); + tcg_temp_free_i32(r2); + tcg_temp_free_i32(chk); + set_cc_static(s); + return NO_EXIT; +} + #ifndef CONFIG_USER_ONLY static ExitStatus op_diag(DisasContext *s, DisasOps *o) { @@ -5477,6 +5519,7 @@ enum DisasInsnEnum { #define FAC_EH S390_FEAT_STFLE_49 /* execution-hint */ #define FAC_PPA S390_FEAT_STFLE_49 /* processor-assist */ #define FAC_LZRB S390_FEAT_STFLE_53 /* load-and-zero-rightmost-byte= */ +#define FAC_ETF3 S390_FEAT_EXTENDED_TRANSLATION_3 =20 static const DisasInsn insn_info[] =3D { #include "insn-data.def" diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 6ac12b8..323a301 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -313,6 +313,19 @@ C(0xb3a1, CDLGBR, RRF_e, FPE, 0, r2_o, f1, 0, cdlgb, 0) C(0xb3a2, CXLGBR, RRF_e, FPE, 0, r2_o, x1, 0, cxlgb, 0) =20 +/* CONVERT UTF-8 TO UTF-16 */ + D(0xb2a7, CU12, RRF_c, Z, 0, 0, 0, 0, cuXX, 0, 12) +/* CONVERT UTF-8 TO UTF-32 */ + D(0xb9b0, CU14, RRF_c, ETF3, 0, 0, 0, 0, cuXX, 0, 14) +/* CONVERT UTF-16 to UTF-8 */ + D(0xb2a6, CU21, RRF_c, Z, 0, 0, 0, 0, cuXX, 0, 21) +/* CONVERT UTF-16 to UTF-32 */ + D(0xb9b1, CU24, RRF_c, ETF3, 0, 0, 0, 0, cuXX, 0, 24) +/* CONVERT UTF-32 to UTF-8 */ + D(0xb9b2, CU41, RRF_c, ETF3, 0, 0, 0, 0, cuXX, 0, 41) +/* CONVERT UTF-32 to UTF-16 */ + D(0xb9b3, CU42, RRF_c, ETF3, 0, 0, 0, 0, cuXX, 0, 42) + /* DIVIDE */ C(0x1d00, DR, RR_a, Z, r1_D32, r2_32s, new_P, r1_P32, divs32, = 0) C(0x5d00, D, RX_a, Z, r1_D32, m2_32s, new_P, r1_P32, divs32, = 0) --=20 2.9.4 From nobody Fri May 17 11:29:13 2024 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.zohomail.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 1499719818401571.0684823124601; Mon, 10 Jul 2017 13:50:18 -0700 (PDT) Received: from localhost ([::1]:42995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfdH-0005Zy-Ko for importer@patchew.org; Mon, 10 Jul 2017 16:50:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfZq-0002cT-Th for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUfZn-00058d-PH for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:42 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:35832) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUfZn-00058V-JO for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:39 -0400 Received: by mail-qk0-f194.google.com with SMTP id 16so14398958qkg.2 for ; Mon, 10 Jul 2017 13:46:39 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id v47sm9961143qtb.11.2017.07.10.13.45.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 13:45:37 -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=AmkMqH8mWIuATc9Z/ocJcpa63hm9+Pcc2XZgSM52FQ0=; b=HPhW/xK0Tj2uQWGCruZEmi2PERCBmC9Yw6/D14GsrOeR3B1xIUH/8SUB16hOsb4SZV eafUPfJD2yFt8IUlo+ROcpaNKCNpwpvFPtyCd99lhfO4v+k0d0YWfPZJ2CnZDoztMSU6 Ltw0NKg6ftF928Kj2Wo+JC7NeTw9bO5CCAlE/ZOA3nv4QiQI0/J68cNEsPuayKvXNdZp Vuwz4Jg9laEfljVNnUi4QeBRvTanmPG0g6uUfVFBIxsQakIrq08YEDbYpkuN1CJkDUoJ f3Kc3ij4xxnKV+GgqWKb4WQy1i8n+Y2x1fn2mzkCq0efADe6H0L9t9caDjq3/w4symX4 VL6g== 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=AmkMqH8mWIuATc9Z/ocJcpa63hm9+Pcc2XZgSM52FQ0=; b=Mai5zmuhiV6NjlAZTZG4fm5tapZwIo2bMNBkPaYkIa/YY0WBAiWlrOZPp97FfJ4HK/ Yi0pNStVkYZKWsUK+P21/+xcDleJ5xun034leee7ATeDyku1LtKansNTEabpm2ly0iC1 DVGT3QpbNZf59VyJNHLsQwUwQn1CikBlpz9Edo14lo/w3m1QUL1qEW5e0VTanOEVM/5u VQZ1Ed7mOYc4nebD16nJOa9+jiw+CtCx2rseuRRBEyM6WhMPOtjsnsitv48OQPmtJeW1 2nKFjKjAcqL14+07nq6RomWMJZJCLVQ53f1DdLKr8WkeMA1KE0T6YTfN39zAeZE0+9qG lYqQ== X-Gm-Message-State: AIVw113w6m4eyBXVNAynKHqRfsPXVnv3NSXpWoUbkLNN7JcVbDTUIBqY U6qA0zclyQt9CwXYULc= X-Received: by 10.55.20.8 with SMTP id e8mr6699369qkh.74.1499719538477; Mon, 10 Jul 2017 13:45:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 10:45:16 -1000 Message-Id: <20170710204521.2058-4-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710204521.2058-1-rth@twiddle.net> References: <20170710204521.2058-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.194 Subject: [Qemu-devel] [PATCH v3 3/8] target/s390x: Tidy SRST 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: aurelien@aurel32.net, david@redhat.com 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" Since we require all registers saved on input, read R0 from ENV instead of passing it manually. Recognize the specification exception when R0 contains incorrect data. Keep high bits of result registers unmodified when in 31 or 24-bit mode. Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/helper.h | 2 +- target/s390x/mem_helper.c | 25 ++++++++++++++----------- target/s390x/translate.c | 9 +++++++-- target/s390x/insn-data.def | 2 +- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 2793cf3..a2e5b9b 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -12,7 +12,7 @@ DEF_HELPER_FLAGS_3(divs32, TCG_CALL_NO_WG, s64, env, s64,= s64) DEF_HELPER_FLAGS_3(divu32, TCG_CALL_NO_WG, i64, env, i64, i64) DEF_HELPER_FLAGS_3(divs64, TCG_CALL_NO_WG, s64, env, s64, s64) DEF_HELPER_FLAGS_4(divu64, TCG_CALL_NO_WG, i64, env, i64, i64, i64) -DEF_HELPER_4(srst, i64, env, i64, i64, i64) +DEF_HELPER_3(srst, void, env, i32, i32) DEF_HELPER_4(clst, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_4(mvn, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(mvo, TCG_CALL_NO_WG, void, env, i32, i64, i64) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 0b18560..74b48aa 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -538,18 +538,21 @@ static inline void set_length(CPUS390XState *env, int= reg, uint64_t length) } =20 /* search string (c is byte to search, r2 is string, r1 end of string) */ -uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end, - uint64_t str) +void HELPER(srst)(CPUS390XState *env, uint32_t r1, uint32_t r2) { uintptr_t ra =3D GETPC(); + uint64_t end, str; uint32_t len; - uint8_t v, c =3D r0; + uint8_t v, c =3D env->regs[0]; =20 - str =3D wrap_address(env, str); - end =3D wrap_address(env, end); + /* Bits 32-55 must contain all 0. */ + if (env->regs[0] & 0xffffff00u) { + cpu_restore_state(ENV_GET_CPU(env), ra); + program_interrupt(env, PGM_SPECIFICATION, 6); + } =20 - /* Assume for now that R2 is unmodified. */ - env->retxl =3D str; + str =3D get_address(env, r2); + end =3D get_address(env, r1); =20 /* Lest we fail to service interrupts in a timely manner, limit the amount of work we're willing to do. For now, let's cap at 8k. */ @@ -557,20 +560,20 @@ uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0= , uint64_t end, if (str + len =3D=3D end) { /* Character not found. R1 & R2 are unmodified. */ env->cc_op =3D 2; - return end; + return; } v =3D cpu_ldub_data_ra(env, str + len, ra); if (v =3D=3D c) { /* Character found. Set R1 to the location; R2 is unmodified.= */ env->cc_op =3D 1; - return str + len; + set_address(env, r1, str + len); + return; } } =20 /* CPU-determined bytes processed. Advance R2 to next byte to process= . */ - env->retxl =3D str + len; env->cc_op =3D 3; - return end; + set_address(env, r2, str + len); } =20 /* unsigned string compare (c is string terminator) */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 339b31e..ba22e3d 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4279,9 +4279,14 @@ static ExitStatus op_stpq(DisasContext *s, DisasOps = *o) =20 static ExitStatus op_srst(DisasContext *s, DisasOps *o) { - gen_helper_srst(o->in1, cpu_env, regs[0], o->in1, o->in2); + TCGv_i32 r1 =3D tcg_const_i32(get_field(s->fields, r1)); + TCGv_i32 r2 =3D tcg_const_i32(get_field(s->fields, r2)); + + gen_helper_srst(cpu_env, r1, r2); + + tcg_temp_free_i32(r1); + tcg_temp_free_i32(r2); set_cc_static(s); - return_low128(o->in2); return NO_EXIT; } =20 diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 323a301..bc6ff01 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -736,7 +736,7 @@ C(0xec57, RXSBG, RIE_f, GIE, 0, r2, r1, 0, rosbg, 0) =20 /* SEARCH STRING */ - C(0xb25e, SRST, RRE, Z, r1_o, r2_o, 0, 0, srst, 0) + C(0xb25e, SRST, RRE, Z, 0, 0, 0, 0, srst, 0) =20 /* SET ACCESS */ C(0xb24e, SAR, RRE, Z, 0, r2_o, 0, 0, sar, 0) --=20 2.9.4 From nobody Fri May 17 11:29:13 2024 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.zohomail.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 149971982099386.01354372842707; Mon, 10 Jul 2017 13:50:20 -0700 (PDT) Received: from localhost ([::1]:42996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfdL-0005ea-JO for importer@patchew.org; Mon, 10 Jul 2017 16:50:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfZs-0002dz-G8 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUfZp-00058z-Bi for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:44 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:35262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUfZp-00058t-7M for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:41 -0400 Received: by mail-qt0-f196.google.com with SMTP id w12so14184670qta.2 for ; Mon, 10 Jul 2017 13:46:41 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id v47sm9961143qtb.11.2017.07.10.13.45.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 13:45:39 -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=XbBQnkI/TpfCvzrakUrtIJsrpxHs9D+6U97yNSNyUhs=; b=D8ATCk7nJANPpIWwEqguKk9PaxHUrZKy22bSIdP/RpZcgwMH1O51gZTEk1qPE8E1nZ ZeHXZBCy1fVthJFZV41kIdOHpIFY2vr3T9mGAiUvxBtsEZjAGsb6P38BuJ8tqrDO2UKr XAknV0IuX0OXtGWYA4WZubPzcrpbHPOX9j+/J9bNncJ/AmT+1xaGY8JdKGj0C0focW2f X8pMNdYFroPsWZBgbpivBdaPHbcGfCbO8RxnZF4YpdxxLMrB6eEeoRpP8ZTKF6ZaPGPx sU/h7eJmowwh7i9UTamYu1zEeHZUdHIs3XF0i9G279BQl0xBfw0XrT6E6hC72q3eXzDq rSxA== 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=XbBQnkI/TpfCvzrakUrtIJsrpxHs9D+6U97yNSNyUhs=; b=JWC8Hm6gqNEqWdGrlilL2HAkNDL/EmgcidCwJRYIDbh+ogp5ZgOApj+rbtn+G32bOf NsQItg6wXvWgYLd9e1iRL8cXLrunRNcGovIRKapi7SK0ZrmA/j7Iut3quLE83yWKy08M Qa4x9d278Do0XNOoWSw0JlPtqaWX86SIRd7kyvKR9pbQzWn/46WJ+/SE+wc7Ugb5wPkb kNV52JMac2VwOmKYwYlz5KrL/zZZDMxtgW/1qtiCqFfH+q/2LhIAQxPbPbN3ftTo2M95 9Ca4CGaHOFNGamGzs5iVboPcRq6ve2XsGmiUPnfLvGP5u3NHwVNKAS/gVszPEzCsEy4q zrBQ== X-Gm-Message-State: AIVw112eM0fyxOrBuFhLbT7YcBkuGfnzFcpTBcROTOmVaw145Y0BbOM6 KtsT6/ei8DHVRb0hgj8= X-Received: by 10.237.40.103 with SMTP id r94mr6624677qtd.205.1499719540474; Mon, 10 Jul 2017 13:45:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 10:45:17 -1000 Message-Id: <20170710204521.2058-5-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710204521.2058-1-rth@twiddle.net> References: <20170710204521.2058-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.216.196 Subject: [Qemu-devel] [PATCH v3 4/8] target/s390x: Implement SRSTU 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: aurelien@aurel32.net, david@redhat.com 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" Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/mem_helper.c | 41 +++++++++++++++++++++++++++++++++++++++++ target/s390x/translate.c | 13 +++++++++++++ target/s390x/insn-data.def | 2 ++ 4 files changed, 57 insertions(+) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index a2e5b9b..32314e0 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -13,6 +13,7 @@ DEF_HELPER_FLAGS_3(divu32, TCG_CALL_NO_WG, i64, env, i64,= i64) DEF_HELPER_FLAGS_3(divs64, TCG_CALL_NO_WG, s64, env, s64, s64) DEF_HELPER_FLAGS_4(divu64, TCG_CALL_NO_WG, i64, env, i64, i64, i64) DEF_HELPER_3(srst, void, env, i32, i32) +DEF_HELPER_3(srstu, void, env, i32, i32) DEF_HELPER_4(clst, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_4(mvn, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(mvo, TCG_CALL_NO_WG, void, env, i32, i64, i64) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 74b48aa..e3db68d 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -576,6 +576,47 @@ void HELPER(srst)(CPUS390XState *env, uint32_t r1, uin= t32_t r2) set_address(env, r2, str + len); } =20 +void HELPER(srstu)(CPUS390XState *env, uint32_t r1, uint32_t r2) +{ + uintptr_t ra =3D GETPC(); + uint32_t len; + uint16_t v, c =3D env->regs[0]; + uint64_t end, str, adj_end; + + /* Bits 32-47 of R0 must be zero. */ + if (env->regs[0] & 0xffff0000u) { + cpu_restore_state(ENV_GET_CPU(env), ra); + program_interrupt(env, PGM_SPECIFICATION, 6); + } + + str =3D get_address(env, r2); + end =3D get_address(env, r1); + + /* If the LSB of the two addresses differ, use one extra byte. */ + adj_end =3D end + ((str ^ end) & 1); + + /* Lest we fail to service interrupts in a timely manner, limit the + amount of work we're willing to do. For now, let's cap at 8k. */ + for (len =3D 0; len < 0x2000; len +=3D 2) { + if (str + len =3D=3D adj_end) { + /* End of input found. */ + env->cc_op =3D 2; + return; + } + v =3D cpu_lduw_data_ra(env, str + len, ra); + if (v =3D=3D c) { + /* Character found. Set R1 to the location; R2 is unmodified.= */ + env->cc_op =3D 1; + set_address(env, r1, str + len); + return; + } + } + + /* CPU-determined bytes processed. Advance R2 to next byte to process= . */ + env->cc_op =3D 3; + set_address(env, r2, str + len); +} + /* unsigned string compare (c is string terminator) */ uint64_t HELPER(clst)(CPUS390XState *env, uint64_t c, uint64_t s1, uint64_= t s2) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index ba22e3d..57e6909 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4290,6 +4290,19 @@ static ExitStatus op_srst(DisasContext *s, DisasOps = *o) return NO_EXIT; } =20 +static ExitStatus op_srstu(DisasContext *s, DisasOps *o) +{ + TCGv_i32 r1 =3D tcg_const_i32(get_field(s->fields, r1)); + TCGv_i32 r2 =3D tcg_const_i32(get_field(s->fields, r2)); + + gen_helper_srstu(cpu_env, r1, r2); + + tcg_temp_free_i32(r1); + tcg_temp_free_i32(r2); + set_cc_static(s); + return NO_EXIT; +} + static ExitStatus op_sub(DisasContext *s, DisasOps *o) { tcg_gen_sub_i64(o->out, o->in1, o->in2); diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index bc6ff01..1d34df03 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -737,6 +737,8 @@ =20 /* SEARCH STRING */ C(0xb25e, SRST, RRE, Z, 0, 0, 0, 0, srst, 0) +/* SEARCH STRING UNICODE */ + C(0xb9be, SRSTU, RRE, ETF3, 0, 0, 0, 0, srstu, 0) =20 /* SET ACCESS */ C(0xb24e, SAR, RRE, Z, 0, r2_o, 0, 0, sar, 0) --=20 2.9.4 From nobody Fri May 17 11:29:13 2024 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.zohomail.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 1499719823472723.0804501023794; Mon, 10 Jul 2017 13:50:23 -0700 (PDT) Received: from localhost ([::1]:42997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfdO-0005fn-5w for importer@patchew.org; Mon, 10 Jul 2017 16:50:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfZv-0002gn-8j for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUfZs-00059f-47 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:47 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:34827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUfZr-00059V-Vb for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:44 -0400 Received: by mail-qk0-f193.google.com with SMTP id 16so14399123qkg.2 for ; Mon, 10 Jul 2017 13:46:43 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id v47sm9961143qtb.11.2017.07.10.13.45.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 13:45:42 -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=z9odawZG2xFkROpQMBJmT07fSBvpO/HJpQ3u/IYWSXc=; b=ig7gd3Gcmi36T/qvVVkOSXuP3y02CoTozsoK894B/U8QzAtLv3qtJ0yoD2uKEouvS3 2k26F6tNk/b715BYa7rBJh5dQGfs2rr75NIhj1JoK41sAfRKLu70mz+I+xbV85CpEMQ+ edUx3ZkTOTQf1KuLK1qp02ZtVX7P1XYeMLhte+Bb6Zxyqeq66ttd9A2QY6riTyehsbIF +NnY9vDGUeiGFS2+MfL7x3tomni7QX+1WcafYQSWmFiuE933/LgDkDaabyy5WkF5AVsd X7fQrZw8UtJ85pxMBFALjrF/sQwjw8XKut6WHTJGVsohbwVH5/gngU7sv0YhSTZYcsSW hHtw== 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=z9odawZG2xFkROpQMBJmT07fSBvpO/HJpQ3u/IYWSXc=; b=heXsYJgGzWrR3Jm97ZKp8CBHiSmmYgTvnaxPVnI/ZqmAXRc/5A7K5UOuHLVvmuMn6i wrdvKskNXmPpWshMV69MSrcGi0vLnYWs0shsxbsZzdk7CaU7vo8wBTiGpRIG97kXNIZ5 YkKKYgCzOROYwoGA+lOtQehhbDHeeUPjfmVBOoTlSTTSu4Ckq70AgxYxmH6YAnF5PHnS FijqAE7nbp6NJ7Pxo0rjvcQfOVku4ZrxqfN/UvmJfEBTPEvcvUhdTFZ0chALKBml9ofh XEVApEIcwD0qV6qOHslNs8gGLBGPxLN8rK05rpxdv3W7tOIr6kjH9gUdK2yQ6ZQBz+gU 12fw== X-Gm-Message-State: AIVw110hNrjj65KyeJPmpeHC10a4mCZm7pDNsDcvNkLzEtJ83N6EUGPj JcrzjDPH6Hj13ehHcqE= X-Received: by 10.55.217.148 with SMTP id q20mr6175683qkl.76.1499719543153; Mon, 10 Jul 2017 13:45:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 10:45:18 -1000 Message-Id: <20170710204521.2058-6-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710204521.2058-1-rth@twiddle.net> References: <20170710204521.2058-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.193 Subject: [Qemu-devel] [PATCH v3 5/8] target/s390x: Implement TRTR 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: aurelien@aurel32.net, david@redhat.com 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" Drop TRT from the set of insns handled internally by EXECUTE. It's more important to adjust the existing helper to handle both TRT and TRTR. Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/helper.h | 1 + target/s390x/mem_helper.c | 20 +++++++++++++------- target/s390x/translate.c | 9 +++++++++ target/s390x/insn-data.def | 2 ++ 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 32314e0..4b02907 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -97,6 +97,7 @@ DEF_HELPER_FLAGS_3(tp, TCG_CALL_NO_WG, i32, env, i64, i32) DEF_HELPER_FLAGS_4(tr, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_4(tre, i64, env, i64, i64, i64) DEF_HELPER_4(trt, i32, env, i32, i64, i64) +DEF_HELPER_4(trtr, i32, env, i32, i64, i64) DEF_HELPER_5(trXX, i32, env, i32, i32, i32, i32) DEF_HELPER_4(cksm, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE, i32, env, i32, i64, i64, i= 64) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index e3db68d..b9d0477 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1277,17 +1277,18 @@ uint64_t HELPER(tre)(CPUS390XState *env, uint64_t a= rray, return array + i; } =20 -static uint32_t do_helper_trt(CPUS390XState *env, uint32_t len, uint64_t a= rray, - uint64_t trans, uintptr_t ra) +static inline uint32_t do_helper_trt(CPUS390XState *env, int len, + uint64_t array, uint64_t trans, + int inc, uintptr_t ra) { - uint32_t i; + int i; =20 for (i =3D 0; i <=3D len; i++) { - uint8_t byte =3D cpu_ldub_data_ra(env, array + i, ra); + uint8_t byte =3D cpu_ldub_data_ra(env, array + i * inc, ra); uint8_t sbyte =3D cpu_ldub_data_ra(env, trans + byte, ra); =20 if (sbyte !=3D 0) { - set_address(env, 1, array + i); + set_address(env, 1, array + i * inc); env->regs[2] =3D deposit64(env->regs[2], 0, 8, sbyte); return (i =3D=3D len) ? 2 : 1; } @@ -1299,7 +1300,13 @@ static uint32_t do_helper_trt(CPUS390XState *env, ui= nt32_t len, uint64_t array, uint32_t HELPER(trt)(CPUS390XState *env, uint32_t len, uint64_t array, uint64_t trans) { - return do_helper_trt(env, len, array, trans, GETPC()); + return do_helper_trt(env, len, array, trans, 1, GETPC()); +} + +uint32_t HELPER(trtr)(CPUS390XState *env, uint32_t len, uint64_t array, + uint64_t trans) +{ + return do_helper_trt(env, len, array, trans, -1, GETPC()); } =20 /* Translate one/two to one/two */ @@ -2119,7 +2126,6 @@ void HELPER(ex)(CPUS390XState *env, uint32_t ilen, ui= nt64_t r1, uint64_t addr) [0x6] =3D do_helper_oc, [0x7] =3D do_helper_xc, [0xc] =3D do_helper_tr, - [0xd] =3D do_helper_trt, }; dx_helper helper =3D dx[opc & 0xf]; =20 diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 57e6909..f94ba7c 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4439,6 +4439,15 @@ static ExitStatus op_trt(DisasContext *s, DisasOps *= o) return NO_EXIT; } =20 +static ExitStatus op_trtr(DisasContext *s, DisasOps *o) +{ + TCGv_i32 l =3D tcg_const_i32(get_field(s->fields, l1)); + gen_helper_trtr(cc_op, cpu_env, l, o->addr1, o->in2); + tcg_temp_free_i32(l); + set_cc_static(s); + return NO_EXIT; +} + static ExitStatus op_trXX(DisasContext *s, DisasOps *o) { TCGv_i32 r1 =3D tcg_const_i32(get_field(s->fields, r1)); diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 1d34df03..ad84c74 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -916,6 +916,8 @@ C(0xdc00, TR, SS_a, Z, la1, a2, 0, 0, tr, 0) /* TRANSLATE AND TEST */ C(0xdd00, TRT, SS_a, Z, la1, a2, 0, 0, trt, 0) +/* TRANSLATE AND TEST REVERSE */ + C(0xd000, TRTR, SS_a, ETF3, la1, a2, 0, 0, trtr, 0) /* TRANSLATE EXTENDED */ C(0xb2a5, TRE, RRE, Z, 0, r2, r1_P, 0, tre, 0) =20 --=20 2.9.4 From nobody Fri May 17 11:29:13 2024 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.zohomail.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 1499719664057437.45302676498807; Mon, 10 Jul 2017 13:47:44 -0700 (PDT) Received: from localhost ([::1]:42988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfam-000382-N3 for importer@patchew.org; Mon, 10 Jul 2017 16:47:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfYz-0001tN-Uq for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUfYw-0004OD-QJ for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:50 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:36862) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUfYw-0004Nd-Jm for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:46 -0400 Received: by mail-qk0-x244.google.com with SMTP id v143so14389323qkb.3 for ; Mon, 10 Jul 2017 13:45:46 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id v47sm9961143qtb.11.2017.07.10.13.45.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 13:45:45 -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=5BKnKNnWygTpQJL12naGRD8PEV1C+g6Ru45Vna5HJ7Q=; b=DGuRWt+jEwI1N1ue/JrAORSOIFWC3ubnxEkYkUmN1JyLLbJoGj/nTCtkCJLr1BR+UI 4VcSjH0RwhfmfV7wSmvNXWa/eZlGyIvCS2QNmkZ1oZtvsR/MYKbtTqE6+kiJ/AUaMcpu pjmJgPId05Alx8AESXupXDwqjbA2+yikLhdUQ8eJxDhs5WaUVjDnex10nVVwXll6B8GA 6JZNLP7zQdTzNK2M1AtXeU28s37fLWbkYgN4AQoEh/U/0Eyp+i3dN+PsiOCFLeCioseK OUlfBHgBdXNJMJywVqDy5rWiFo886b3OEUGZyGGNbnDBkseM2esc991aZrlsfhvddEgP NzHw== 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=5BKnKNnWygTpQJL12naGRD8PEV1C+g6Ru45Vna5HJ7Q=; b=SlUmSPaNp3szVnikIDpgwaruLaMKMYlTCu71TgYLSOEm1pN/35YRn9agV7XaqZFFed HjAOLi33kdxr8mRWXjQX8l3yBujknQwxhVoo+gvyGTEvkjnGStQ/H16lKYGKBzP/tDuf FicFTbYp0pjB0rM99tcaR+R352N51fK/fO45BSpj/aExFRmkMm3NhnmSRoFSJlOwbPr2 MHxtfLIrTDtaNQJU/mNuTftsNkxuukUV7vrUl9YGQBprPFWkPZ6UsO5sPEMx9mbfBqUo L1Bb86I9jxfmyvt6hX7K/hHXYB4owXcVmObGXgJ+dYgLcAiO4cOUOt7q6kSb5Z4GUW3m ZPWQ== X-Gm-Message-State: AIVw111RSPA4mXu853h5nGLdZXHbOpvbOKsLCm+VEFqRKdLNtrT/C9l0 5EXSs3RfgH0yV0xqVFI= X-Received: by 10.55.221.76 with SMTP id n73mr6896336qki.186.1499719545773; Mon, 10 Jul 2017 13:45:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 10:45:19 -1000 Message-Id: <20170710204521.2058-7-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710204521.2058-1-rth@twiddle.net> References: <20170710204521.2058-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::244 Subject: [Qemu-devel] [PATCH v3 6/8] target/s390x: Mark ETF3 and ETF3_ENH facilities as available 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: aurelien@aurel32.net, david@redhat.com 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" Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/cpu_models.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 2c86b24..a4afdd9 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -731,11 +731,13 @@ static void add_qemu_cpu_model_features(S390FeatBitma= p fbm) S390_FEAT_STFLE, S390_FEAT_EXTENDED_IMMEDIATE, S390_FEAT_EXTENDED_TRANSLATION_2, + S390_FEAT_EXTENDED_TRANSLATION_3, S390_FEAT_LONG_DISPLACEMENT, S390_FEAT_LONG_DISPLACEMENT_FAST, S390_FEAT_ETF2_ENH, S390_FEAT_STORE_CLOCK_FAST, S390_FEAT_MOVE_WITH_OPTIONAL_SPEC, + S390_FEAT_ETF3_ENH, S390_FEAT_COMPARE_AND_SWAP_AND_STORE, S390_FEAT_COMPARE_AND_SWAP_AND_STORE_2, S390_FEAT_GENERAL_INSTRUCTIONS_EXT, --=20 2.9.4 From nobody Fri May 17 11:29:13 2024 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.zohomail.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 1499719666930943.4325481765985; Mon, 10 Jul 2017 13:47:46 -0700 (PDT) Received: from localhost ([::1]:42989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfap-00039Z-Lv for importer@patchew.org; Mon, 10 Jul 2017 16:47:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfZ0-0001tc-8Y for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUfYz-0004RU-Bn for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:50 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35257) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUfYz-0004Qq-6N for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:45:49 -0400 Received: by mail-qk0-x241.google.com with SMTP id 16so14399439qkg.2 for ; Mon, 10 Jul 2017 13:45:49 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id v47sm9961143qtb.11.2017.07.10.13.45.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 13:45:47 -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=BcRPcB8fziSNQsUwwqj/GIMvgSdFF8MenJnqme/+hiU=; b=I0fedV8pcyG/UZF/bO2TR0fNrpDKoeuFn2y2KEI8aRSF1vbq5VSnp4d+T+WYdR8log 8V3ppQn3BK+CFi0yJGSWkO1fdQg3JF11M9qIxBzlve36BbKS4Zl0KRad8I811Boco53z 3bNjyKiONYJuq4lKFFhQGPFIjK9phnYhpo2WCcjv/WlXGQdsqcwR5+n8JkVXOYTJuIDS uEBaEQoeRLvE0I05+ldB/SPx9R4vxYXSVkkqWoq/2AckKlkahjXc0waIEy1GhXhtW7DL 5v9fYIehI0HLSTyvkEvsEGU/UDh5O2DPsfEu6B+DK78gFo8KWxPMM4LuvbwApOwDlvUP L3Ug== 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=BcRPcB8fziSNQsUwwqj/GIMvgSdFF8MenJnqme/+hiU=; b=tSgievjwBfzUMLLv3MG8KhWcAn+RgU/LHOWVyYe40+ZnEdpqM1XGnhweESzPhDu+AH YB1jJYEWigkLxOw+8FKZqrYhHVMMzSbK3SJO19XVX49r3Amom7l5M6yb/XztJ18msiBW Gswod8lTHHRHLHJqJKXFaLXWvV95BtLCbVa6xSKY8tOB01aMHrkA+MxwqMAazdzo+u+C nElkX7CnfPijRaJqBsrYrP7q484Rm5GZPIG90WAqAtek8mE1s/9ew0lekZs9AiuOasqQ gITZ6MELioWKGl3Wvgc8WRThrNYoguJouTIRBVpv3ZtX3VAmgKNWWDXdYpbjHfwirz83 w7PQ== X-Gm-Message-State: AIVw113VBc3PszBQOJprRwrW5a5FBfIsXQL5pHPBEnQKUoK6bnJtYO+B YiJ7458L63Qdz3fj45I= X-Received: by 10.55.74.13 with SMTP id x13mr6681076qka.254.1499719548312; Mon, 10 Jul 2017 13:45:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 10:45:20 -1000 Message-Id: <20170710204521.2058-8-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710204521.2058-1-rth@twiddle.net> References: <20170710204521.2058-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::241 Subject: [Qemu-devel] [PATCH v3 7/8] target/s390x: Allow to enable "idtes" feature for TCG 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: aurelien@aurel32.net, david@redhat.com 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" From: David Hildenbrand STFL bit 4 and 5 are just indications to the guest, which TLB entries an IDTE call will clear. These are performance indicators for the guest. STFL bit 4: INVALIDATE DAT TABLE ENTRY (IDTE) performs the invalidation-and-clearing operation by selectively clearing TLB segment-table entries when a segment-table entry or entries are invalidated. IDTE also performs the clearing-by- ASCE operation. Unless bit 4 is one, IDTE simply purges all TLBs. Bit 3 is one if bit 4 is one. We can simply set STFL bit 4 ("idtes") and still purge the complete TLB. Purging more than advertised is never bad. E.g. Linux doesn't even care about this bit. We can optimized this later. This is helpful, as the z9 base model contains this facility. STFL bit 5 (clearing TLB region-table-entries) was never implemented on real HW, therefore we can simply ignore it for now. Signed-off-by: David Hildenbrand Message-Id: <20170627161032.5014-1-david@redhat.com> Signed-off-by: Richard Henderson --- target/s390x/cpu_models.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index a4afdd9..998bb96 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -728,6 +728,7 @@ static void add_qemu_cpu_model_features(S390FeatBitmap = fbm) { static const int feats[] =3D { S390_FEAT_DAT_ENH, + S390_FEAT_IDTE_SEGMENT, S390_FEAT_STFLE, S390_FEAT_EXTENDED_IMMEDIATE, S390_FEAT_EXTENDED_TRANSLATION_2, --=20 2.9.4 From nobody Fri May 17 11:29:13 2024 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.zohomail.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 1499719921485892.1371275237188; Mon, 10 Jul 2017 13:52:01 -0700 (PDT) Received: from localhost ([::1]:43010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfey-00075R-CT for importer@patchew.org; Mon, 10 Jul 2017 16:52:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUfa2-0002nP-B1 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUfZz-0005BE-7o for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:54 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:36719) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUfZz-0005B8-3E for qemu-devel@nongnu.org; Mon, 10 Jul 2017 16:46:51 -0400 Received: by mail-qk0-f195.google.com with SMTP id v143so14389601qkb.3 for ; Mon, 10 Jul 2017 13:46:50 -0700 (PDT) Received: from bigtime.twiddle.net.com (rrcs-173-197-98-123.west.biz.rr.com. [173.197.98.123]) by smtp.gmail.com with ESMTPSA id v47sm9961143qtb.11.2017.07.10.13.45.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 13:45:49 -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=/ZuI6AVHpN5j3uPZTTsBMuTiSrHbQuJe1P1pFaW3Da8=; b=Db9Vrljs6TUYYZElb2w9IyZ5+98c4zNKuvCkNxvuMIB2xudFONkvjPcTXFm1GKYMKn YTJcfn+vfX0vybcQ8XipnicBHY9j73Ly13VYhu1PDO2JRVC3WwgSriFkwY6qjbJ0MAsr aIDVYYJnPhCaeIravTNwFCSW1x3L6jqGaTQx12oVMAgCUNLNU2F+gvu3k9Zj/yuUjdIs I6rS5KIEW39KNVh3F4YGDjeVGI7Wf4WtKnoMlo5O/ITBDBBqRtJn2mDE8dKEievBZqTl UDsT4V0aaYX6jEO8JSIvrzgX1LpZmqE+4rIUYe7zhxrHw9KteKkAV5xIGNTDPgLuO05F K/pw== 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=/ZuI6AVHpN5j3uPZTTsBMuTiSrHbQuJe1P1pFaW3Da8=; b=Pzwx0zmmxPUfnFq0pPYYNjGmS2UIPmZwEJJL1lxFFA1laJKXq9S8MAM8xLkGADxgOb xcTC0cxn+1cIIXWn4w+yN2YkVNZbWAw+Jv9mv0dYdaPWSKqp6BvxqqKQ98TMk/oDNgVL u1iWsQcv00hWO+ZMwTr4l32qJh3eQ33+B8wbPTQ51ZrjMg2tB/Z88nmfF3lG69zoO01Q SO4HTJXrx8Eda0tVDJNzNbHNX0FAKz4EbYhYg+mjyJlo2Ka4GYzm++cTyxSQN8dwyzcT RV4hlqcnFqZxA5z643B9na3cwMJRm1X/hU2L19aQSAI42cFzFZ64ujDeoKy8KQ8avU6h 1eXA== X-Gm-Message-State: AIVw1109yjSVBdbKlr7oOyUwVkSOzx9h0fgF+VoQ6y5i/kdIjNdy1M6A WtzXdlyjPRoXPvGBx70= X-Received: by 10.55.142.67 with SMTP id q64mr6100610qkd.99.1499719550147; Mon, 10 Jul 2017 13:45:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 10:45:21 -1000 Message-Id: <20170710204521.2058-9-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170710204521.2058-1-rth@twiddle.net> References: <20170710204521.2058-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.220.195 Subject: [Qemu-devel] [PATCH v3 8/8] target/s390x: Fix risbg handling 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: aurelien@aurel32.net, david@redhat.com 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" The rotation is to the left, but extract shifts to the right. The computation of the extract parameters needs adjusting. For the entry condition, simplify 64 - rot + len <=3D 64 -rot + len <=3D 0 len <=3D rot Reviewed-by: Aurelien Jarno Reported-by: David Hildenbrand Suggested-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index f94ba7c..0c609bd 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3471,8 +3471,8 @@ static ExitStatus op_risbg(DisasContext *s, DisasOps = *o) } =20 /* In some cases we can implement this with extract. */ - if (imask =3D=3D 0 && pos =3D=3D 0 && len > 0 && rot + len <=3D 64) { - tcg_gen_extract_i64(o->out, o->in2, rot, len); + if (imask =3D=3D 0 && pos =3D=3D 0 && len > 0 && len <=3D rot) { + tcg_gen_extract_i64(o->out, o->in2, 64 - rot, len); return NO_EXIT; } =20 --=20 2.9.4