From patchwork Thu Oct 10 11:33:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 175781 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2189275ill; Thu, 10 Oct 2019 05:05:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqzyiP1xD0TFI2PIJAFnmdT7Ci2hwEBM04oDMSjn/Ly+Gmfk1280ZiYtOSKURjd17inDggQq X-Received: by 2002:a37:2ec5:: with SMTP id u188mr9269690qkh.94.1570709141211; Thu, 10 Oct 2019 05:05:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570709141; cv=none; d=google.com; s=arc-20160816; b=syrVyw9v6vvL6qTwlYTlrXW+76YUT3qO5ecbp5Cw22w6V3NVcYaKf6TKj59fHr1oRV 0HyUBTLNgjYUnqcAPuZPnNOPoMOUJY86ZqOHUs2RiHfEKF0lHxz5qsXQpqviPg6heoui qs1BsFQZ8DWdc5UcNx7rwSQwUM8Cr9eEMhbxYfLtpmQWDydgyCMU5NUGXzGszhOK7fG5 XtdTuIx+9GOCW2NvJtR3TxrZsVl7OW0swHshYcdGCLkCzTfnYTDYQ3FkP9ICta3SgteB JYvTGFb89u4SOUPUC63LXPlsgKPYr2tJ0H7pfNcn+po8JoO5S40dpEgy6TBm6PxQbAU+ zC/g== 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=GK7x8RVqzGpKU35izZ5jflaUXwtmu0s8AmcDFU0CA2Q=; b=CQkpdbu+7j4xCQY/Cx+JEiP9nVDvQdxWij4pyx9sEnbeh46SAgGzCVzkYnXBnQT+dA GQdpkj/Prgrd7i4o/JvEjZQccVvz1RwaCHEFC72EpXQwIqVdGHvPQ/BlB8T1o+pixHsE fvIS2yq3N4Q4fZ3rHTaXAxdp8rA+G+i8g5wqzS7UJtQ95dVHTAdFvcbFJfbXpWub8PsG /Y+vE63yc5kMOLjslLL/tHx9HLOPhXjcYIb6+/w4NrfUnx9EtuwbKRve3NP8V22aUXe9 q91DI6+pHWEX4S9DVGqUq4w8KZtC6fq1o6/7rgskEM3AQcfTxhf9qaEyE+YbIurrYvNC 4FAA== 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 h11si5330410qtn.375.2019.10.10.05.05.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Oct 2019 05:05:41 -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]:36886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIXCO-0004H5-0C for patch@linaro.org; Thu, 10 Oct 2019 08:05:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50746) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIWkW-0006fU-0P for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIWkU-0006cS-QH for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40905) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIWkU-0006cC-Kt; Thu, 10 Oct 2019 07:36:50 -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 D934989AC7; Thu, 10 Oct 2019 11:36:49 +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 616BB5C1B5; Thu, 10 Oct 2019 11:36:48 +0000 (UTC) From: David Hildenbrand To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 27/31] target/s390x: Remove ILEN_AUTO Date: Thu, 10 Oct 2019 13:33:52 +0200 Message-Id: <20191010113356.5017-28-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.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 10 Oct 2019 11:36:49 +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 This setting is no longer used. Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson Message-Id: <20191001171614.8405-16-richard.henderson@linaro.org> Signed-off-by: David Hildenbrand --- target/s390x/cpu.h | 2 -- target/s390x/excp_helper.c | 3 --- 2 files changed, 5 deletions(-) -- 2.21.0 diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 18e7091763..e7a9a58e0f 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -806,8 +806,6 @@ void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr, uint32_t io_int_parm, uint32_t io_int_word); /* instruction length set by unwind info */ #define ILEN_UNWIND 0 -/* automatically detect the instruction length */ -#define ILEN_AUTO 0xff #define RA_IGNORED 0 void s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t ra); /* service interrupts are floating therefore we must not pass an cpustate */ diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index 8ce992e639..c252e9a7d8 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -196,9 +196,6 @@ static void do_program_interrupt(CPUS390XState *env) LowCore *lowcore; int ilen = env->int_pgm_ilen; - if (ilen == ILEN_AUTO) { - ilen = get_ilen(cpu_ldub_code(env, env->psw.addr)); - } assert(ilen == 2 || ilen == 4 || ilen == 6); switch (env->int_pgm_code) {