From patchwork Sun Jun 4 17:34:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9765167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D4A48602B6 for ; Sun, 4 Jun 2017 18:07:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9F2127F89 for ; Sun, 4 Jun 2017 18:07:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB937280B0; Sun, 4 Jun 2017 18:07:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3F75027F89 for ; Sun, 4 Jun 2017 18:07:50 +0000 (UTC) Received: from localhost ([::1]:57965 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZwK-0003FG-Nm for patchwork-qemu-devel@patchwork.kernel.org; Sun, 04 Jun 2017 14:07:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZRW-0007i6-QB for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZRV-0003Lt-Nh for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:58 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:33380) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZRV-0003Kv-Cc for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:57 -0400 Received: by mail-pf0-x244.google.com with SMTP id f27so18146308pfe.0 for ; Sun, 04 Jun 2017 10:35:57 -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=qX7fTHndfDouyGZEQqdYbgRpduneGpFNSPQS+IiE2M4=; b=jXCXILgoQsYlrJ99+nDvlryyQUGjpBhseLk1Z9+3RBwYRA397ZV6iXOvce5525eWoQ vMGk+nmYUOHC1Hv7a7UEaZonP3Qs3k1mNnDzqUJKvIJBlI6za1oDbA047PIYq+fdD7f1 5DdHhQzIppELMO2cw+WlUWIdiODzqyH8wxkyeJI8s4TIY50Lm2HUjPJwngHZhbNCDhDb yzvmXjAaOdfcn3Ivl7jlb1K3v2MCpFJh+C5rM7TSUw8wG8UmAKPvZvZ7W4QaztRByjQJ JnSitY6EpzcWAk1PYuTm5gefCHUZzvavLvMquGfTiOMZb7tMJN9WsUwAK12pvlpZFxpg i0PA== 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=qX7fTHndfDouyGZEQqdYbgRpduneGpFNSPQS+IiE2M4=; b=chWsqD9ujUSBV0XIJiYkyZu5W5QtGzYMu+Y6Zyvyt9SSwOuQuVrbtzAf6YZUTcxmH5 jTJ5Nh4pg6bsUj3O4YkxsF7NccN+sSH/FVULhvHk8KReUgQlu7wmDxHDS+yMle2cz32X RHcC3X1RR4uuK9o993fnRbwWGBlQQHkMt7htUqUwzTXr8s+zwolIG0mtOKc9GTvS4Dsm Lh+ybFuLcjnjRbB32w2x4p7Sn+dNPK8Gko9SIl4jL/XmgED98ia1e1gLif+V+yi11XLy 0RQTcJ/+QgLCBwpQr04P9dI9oZbSh2mMsjknH5IxtloM8U4OPB/d5NNkpFApWNBZr42D w7ug== X-Gm-Message-State: AODbwcDcJfgKdauptQ1exFi8rqwTWL+dBTEIxSn5JvZ6lHDUeCecpYi3 HdtJhfEdAUnvKXtSMWw= X-Received: by 10.84.230.129 with SMTP id e1mr10299224plk.88.1496597756367; Sun, 04 Jun 2017 10:35:56 -0700 (PDT) Received: from bigtime.ASUS (cpe-98-155-27-246.hawaii.res.rr.com. [98.155.27.246]) by smtp.gmail.com with ESMTPSA id j191sm52854419pgc.53.2017.06.04.10.35.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:32 -0700 Message-Id: <20170604173509.29684-33-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170604173509.29684-1-rth@twiddle.net> References: <20170604173509.29684-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PULL 32/69] 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: peter.maydell@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The PoO specifies that when R1==0, no ORing into the insn loaded from storage takes place. Load a zero for this case. Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- 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) /* 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) /* 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. */ + int r1 = get_field(s->fields, r1); TCGv_i32 ilen; + TCGv_i64 v1; update_psw_addr(s); gen_op_calc_cc(s); + if (r1 == 0) { + v1 = tcg_const_i64(0); + } else { + v1 = regs[r1]; + } + ilen = 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); + if (r1 == 0) { + tcg_temp_free_i64(v1); + } + return NO_EXIT; }