From nobody Mon Feb 9 08:55:25 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.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