From patchwork Thu Oct 10 11:33:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 175780 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2184272ill; Thu, 10 Oct 2019 05:02:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5AMDuzSh+wQeG7zzuDTmG4Z8YbgGN+bc44meO5h03HNO/eVxRCsqXB7zfbb9vBWnLnzLN X-Received: by 2002:a37:9442:: with SMTP id w63mr9102244qkd.138.1570708935889; Thu, 10 Oct 2019 05:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570708935; cv=none; d=google.com; s=arc-20160816; b=ZchKFfn7PQZ+Znftq1GJWe4Rz0T5f/G33L4RPVXbDDwfSL9jEL5mCiSAjV2k+zK5sd bYWylQLijCIiEaSqRXq+8koITqDyVgMScUfBeBcTxctXyxyx+5g+YGcgM9Rv+hgE2Rvk 0m5lmOGf8Bk5RJD/REs8o2UIz9fIKAhUScBCMrDCMWH4WI2CWK7EzZfP9ykBpfavm0Ug U2nZ9w/My45ACvi2JFuZQ+ag65KZANeq/Jal9IoRkrG3c8Tr9BUrHHXQgYqoDUVYpiSD rC/yhb0iDY0BEK9fdMWBdIUW00jPjD5Ac3srtKn8zyCmOFjK+l6znZ8LDjwo9iXcpjLl CdOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=J93CMqm5X6glyXXnNaHtkAEDMS41wxJLB0XPHlAOTBE=; b=j79T1Km+dGHeMA2XduwBRV0jRpmZU86LY8RhEO9nG44VqwKDBCKSZpPwb79iwvk1in qQAXAEIgX84F6UL2KBzG1Rsd+tb0vEQjb5hmN/9XsDkAgtM1JCWPybb+TpSz0nvGtl4U rVjhsLhcCspRr3IDh/CE9u1jMW5LcPvqMW7VLKFMM64H8D5iV1y9u2da6ZeYJvA/0mdS h4hptL58Qzymddubig3byn8KBaxPwBiN5cEDrAIa1D9MRU7jb9oRNVoqwX4l02ssrn9q +1reK1H3llsvvP2iEMHYnt/aw6+aGXWIz025HzPua8gMQr/EgH/tETr63RSrP4ySsnNs 4gTQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o24si5536788qve.23.2019.10.10.05.02.15 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Oct 2019 05:02:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIX94-0000Z5-JE for patch@linaro.org; Thu, 10 Oct 2019 08:02:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50671) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIWkE-0006AW-5p for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIWkD-0006YT-0v for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33724) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIWkC-0006Y6-R9; Thu, 10 Oct 2019 07:36:32 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03D9B88FFF7; Thu, 10 Oct 2019 11:36:32 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-138.ams2.redhat.com [10.36.117.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B0E65C1B5; Thu, 10 Oct 2019 11:36:21 +0000 (UTC) From: David Hildenbrand To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 24/31] target/s390x: Simplify helper_lra Date: Thu, 10 Oct 2019 13:33:49 +0200 Message-Id: <20191010113356.5017-25-david@redhat.com> In-Reply-To: <20191010113356.5017-1-david@redhat.com> References: <20191010113356.5017-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Thu, 10 Oct 2019 11:36:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, Cornelia Huck , Richard Henderson , Thomas Huth , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson We currently call trigger_pgm_exception to set cs->exception_index and env->int_pgm_code and then read the values back and then reset cs->exception_index so that the exception is not delivered. Instead, use the exception type that we already have directly without ever triggering an exception that must be suppressed. Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson Message-Id: <20191001171614.8405-13-richard.henderson@linaro.org> Signed-off-by: David Hildenbrand --- target/s390x/mem_helper.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) -- 2.21.0 diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index e15aa296dd..4254548935 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -2361,34 +2361,23 @@ void HELPER(sturg)(CPUS390XState *env, uint64_t addr, uint64_t v1) /* load real address */ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr) { - CPUState *cs = env_cpu(env); - uint32_t cc = 0; uint64_t asc = env->psw.mask & PSW_MASK_ASC; uint64_t ret, tec; - int old_exc, flags, exc; + int flags, exc, cc; /* XXX incomplete - has more corner cases */ if (!(env->psw.mask & PSW_MASK_64) && (addr >> 32)) { tcg_s390_program_interrupt(env, PGM_SPECIAL_OP, GETPC()); } - old_exc = cs->exception_index; exc = mmu_translate(env, addr, 0, asc, &ret, &flags, &tec); if (exc) { - /* - * We don't care about ILEN or TEC, as we're not going to - * deliver the exception -- thus resetting exception_index below. - * TODO: clean this up. - */ - trigger_pgm_exception(env, exc, ILEN_UNWIND); cc = 3; - } - if (cs->exception_index == EXCP_PGM) { - ret = env->int_pgm_code | 0x80000000; + ret = exc | 0x80000000; } else { + cc = 0; ret |= addr & ~TARGET_PAGE_MASK; } - cs->exception_index = old_exc; env->cc_op = cc; return ret;