From nobody Mon Feb 9 11:29:38 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 1495654964179852.3237391073333; Wed, 24 May 2017 12:42:44 -0700 (PDT) Received: from localhost ([::1]:56537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDcB8-0003NT-QE for importer@patchew.org; Wed, 24 May 2017 15:42:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbsb-00029K-JT for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbsa-0001mD-KP for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:33 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbsa-0001m1-G3 for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:32 -0400 Received: by mail-qk0-x241.google.com with SMTP id y128so27718419qka.3 for ; Wed, 24 May 2017 12:23:32 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id b23sm3296240qkb.31.2017.05.24.12.23.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:31 -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=NeZHKaZwZC8OE9Fa/0Ke3yGKMwGnlcRG1JNrjiN0o9g=; b=lRf9FHBl68wyOmqTp0h6mXrZYM7BL6Z+Y58G7aORjAjw5VqyxGpC2O5h/JfPHmzKju 8qouQLUdRB3Irj28gqRR+xeAmkR8tZ5NMkR8zTsZlrteXDCS1CGkzv4AgiE35bA3CnFM AG2o9cdJ4Gu/jo+ktLyrJRuT5hZallf9XIkv5l9gzktk1zl6fce5vEh56d6ATIxMrjU7 Z7Mo6D/nQO5EX52LoNnLSWHx9w1LUUXPG2OLqxw/OeGwcJ7CX4QO9Un9hjpBkvdzqneC VEMiVd+ycYWLoO10JPfZRBOyzOmG+xyso5Pdfbsi6hu1V8Ncaj1LzKzdmm20qssgtWhd rq2A== 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=NeZHKaZwZC8OE9Fa/0Ke3yGKMwGnlcRG1JNrjiN0o9g=; b=DaHf3yHxhb6CPkKTdE/7LyMNPyzCdcenocSoBpK3efyE5SJSgi8AtXfABBpHNaZV6f 3cUm2aHabQ5jKMSmFZo0JBK0lSrCcQ9O7NUUG825oL5QsJ2fSmXgE/SKvjSQpchesf8S dNKa9aF/siMSpQujiZ42WXe5rpvksA72snjaNSyArdE0+scKjTVCN7lAl+jyvvkonihi l4MfKUEXkRRLa/LWzBHagPOPsbOFb1LLMpxrQxZK+8wWMXetUD2HKd/Xc5nNutl1n8YP oKNnogZ5g/iPo0ZPzRIBFHsIP02CmYEQDqbcYTHIY1HEz3Z8in2vKYUstDVMGw2O3k1l dgAw== X-Gm-Message-State: AODbwcAKVQCI+EB22/ZwWhFAqT4iSHqnzT4dSvFAOSyLosbjNRkoCId3 Tu2cHZs9eEMIDg== X-Received: by 10.55.16.41 with SMTP id a41mr32912477qkh.131.1495653812065; Wed, 24 May 2017 12:23:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:44 -0700 Message-Id: <20170524192246.15905-32-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170524192246.15905-1-rth@twiddle.net> References: <20170524192246.15905-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 v2 31/33] target/s390x: Fix EXECUTE with R1==0 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" The PoO specifies that when R1=3D=3D0, no ORing into the insn loaded from storage takes place. Load a zero for this case. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target/s390x/insn-data.def | 4 ++-- target/s390x/translate.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index cac0f51..3c3541c 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -327,9 +327,9 @@ C(0xeb57, XIY, SIY, LD, m1_8u, i2_8u, new, m1_8, xor, nz64) =20 /* EXECUTE */ - C(0x4400, EX, RX_a, Z, r1_o, a2, 0, 0, ex, 0) + C(0x4400, EX, RX_a, Z, 0, a2, 0, 0, ex, 0) /* EXECUTE RELATIVE LONG */ - C(0xc600, EXRL, RIL_b, EE, r1_o, ri2, 0, 0, ex, 0) + C(0xc600, EXRL, RIL_b, EE, 0, ri2, 0, 0, ex, 0) =20 /* EXTRACT ACCESS */ C(0xb24f, EAR, RRE, Z, 0, 0, new, r1_32, ear, 0) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 921a842..b7b4843 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2159,15 +2159,27 @@ static ExitStatus op_ex(DisasContext *s, DisasOps *= o) MVC inside of memcpy, which needs a helper call anyway. So perhaps this doesn't bear thinking about any further. */ =20 + int r1 =3D get_field(s->fields, r1); TCGv_i32 ilen; + TCGv_i64 v1; =20 update_psw_addr(s); gen_op_calc_cc(s); =20 + if (r1 =3D=3D 0) { + v1 =3D tcg_const_i64(0); + } else { + v1 =3D regs[r1]; + } + ilen =3D tcg_const_i32(s->next_pc - s->pc); - gen_helper_ex(cpu_env, ilen, o->in1, o->in2); + gen_helper_ex(cpu_env, ilen, v1, o->in2); tcg_temp_free_i32(ilen); =20 + if (r1 =3D=3D 0) { + tcg_temp_free_i64(v1); + } + return NO_EXIT; } =20 --=20 2.9.4