From patchwork Mon Apr 1 10:29:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161533 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp283557jan; Mon, 1 Apr 2019 03:36:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEkJH45zd5NHEWgrUeaa8lUGBVCTQqkk85tqS8pFMcZZgWZXIrlfqrcoHL/hD99UFwr+ks X-Received: by 2002:a0d:dd50:: with SMTP id g77mr50731824ywe.309.1554115016336; Mon, 01 Apr 2019 03:36:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554115016; cv=none; d=google.com; s=arc-20160816; b=nayBRUsFDeH0TkFSv9ck6wDfdjgAt6NoRfdYtGgdib7CwcnzemvoSm2HCymFVHyreI bZacQYZx6ATVF+hFmzFIt8y+NGUb/SqMYB6pjZxnIDLVhz/ZkhPlJkK6we6pjwpe/1Kw VkVnVMbr8isc6kPKBXOBsDwwGCkVRAW6hK41peu6drB5WYUjaIPdvDntRIt3gqEjan7p blw7o7mYrV5CQB4XGYkoEiK/BK9DQni5QkAvKyuWuwez8lgbJrkx4qug2evU1L32ohUN KiujeOg4bjOosoI7MB5M23fr+N5R/mUssL/ncPMMsq9pNSTf5WzQPggyeJVlXM/kVj8G axtw== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=9Mhum0qrevd5IF4CeetlRqrhth82koesUwWb3BUb1N0=; b=I4Y/uq/MMm2K7K4lL0dsqlXOH1pFq3GJPzg057ZFBuAR6tC3zWo7R/VOAEcNxOsuCY 0T0BgNsnr5SJby7dqJfkBtGVKEnr+Z25eaMH7Sg7rgv8flx6RMB9SvZW+UzydWOpQNnU XRbsEbEOMYCj1ZAus0LATJhFzwI0f9NtxHG2OctRlP1q7mLDcUpgnBJbT2p8cvJ1/FLa S8qIBITOw0q8xSfNngjBeCXcnb6xM260eOs7Y9f8Ca9Y/zRvTunuP0SJZzSy+K8nxtMY ebDkAjReDKyGxJIBGhfKvuVMJWHOrX4tSWQL5poH6T7GPn3KwpMgZnvN6IfM7BJVj/vY xbEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iEnRXyCe; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e65si546812ybb.222.2019.04.01.03.36.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 01 Apr 2019 03:36:56 -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; dkim=fail header.i=@linaro.org header.s=google header.b=iEnRXyCe; 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=linaro.org Received: from localhost ([127.0.0.1]:56945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAuJD-00018w-Re for patch@linaro.org; Mon, 01 Apr 2019 06:36:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAuC3-0003VN-PT for qemu-devel@nongnu.org; Mon, 01 Apr 2019 06:29:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAuC2-0005vn-1Y for qemu-devel@nongnu.org; Mon, 01 Apr 2019 06:29:31 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:46712) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hAuC1-0005vQ-LT for qemu-devel@nongnu.org; Mon, 01 Apr 2019 06:29:29 -0400 Received: by mail-pg1-x543.google.com with SMTP id q1so4527598pgv.13 for ; Mon, 01 Apr 2019 03:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9Mhum0qrevd5IF4CeetlRqrhth82koesUwWb3BUb1N0=; b=iEnRXyCeAEJYpg0l0EnXp1P93tdlKbL4hc9RF5jRi51Y4tmZa+L4OfyFazj/qwaZEt 36PV9kKeHFVQ5bixlkI/y5deDVHkq5ezIAgHaRk8WWCgUvFvkCZTS8WmDmdZrewmRzzd uuZQRfdg9fctHAdhvw/8LDnLoOY8tdlt5+fwt1nhRu0zUC8yPJ4e/QDqLcE9l9fo9fXV pwW9vwj1t7IpvSRsE33xutYMdmZ31ayr8WhMai8ZnWtylyoiX3QUPjdG0ZQ3oTLC2iOc agTsbnLbNLrEP2KP50S+X4Fy+E1Aq6hnooSlAmP82uB2IeN5i0HwwumOQc7ghLQPrj4h ayvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9Mhum0qrevd5IF4CeetlRqrhth82koesUwWb3BUb1N0=; b=BEEVfPzJp5m1yx+MVeGz/i2wqhkSJzWU4bkqCEvAJDQKAPcyheIsLPwq6yNHMAReVq rVWdI93tFRqIe2LCAJd98nMGJwN4X0IsIkEGmW+Cl0u+JR6k/GtmrrHMwbT5HvCCvDyA Vb8On0tZAjpa/VpWhjPQUNt/gl1alvLqYijxA4VXx0j9aqXTiRviw9q9UmEEONejUD5s YQi0HY4sRQuffUzy+K2M9sZRX6soYz8yHjCcKu7ZjSdJ0NUczNXpu/Azau5+0LHZMjw8 +ORXV9mqBPPU0srZumlmHNL3XxS0RbMWj4/76KMsFSGxFO9a9BmnEgAhL0UR2IM+5L0x 4djg== X-Gm-Message-State: APjAAAXDB9TrnFX7Mr04UXzmZcsB2VKvIBjxY8u1r+OXk685wrt/7Qg5 6PJVa20Qcs0RQkG4835uvLMZZVubOyLBWA== X-Received: by 2002:aa7:8d49:: with SMTP id s9mr60354426pfe.248.1554114568308; Mon, 01 Apr 2019 03:29:28 -0700 (PDT) Received: from cloudburst.imgcgcw.net ([147.50.13.10]) by smtp.gmail.com with ESMTPSA id c134sm20048203pfc.87.2019.04.01.03.29.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 03:29:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2019 17:29:09 +0700 Message-Id: <20190401102911.8685-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190401102911.8685-1-richard.henderson@linaro.org> References: <20190401102911.8685-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH for-4.1 4/6] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt 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: qemu-s390x@nongnu.org, cohuck@redhat.com, david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Since we begin the operation with an unwind, we have the proper value of ilen immediately available. Signed-off-by: Richard Henderson --- target/s390x/tcg_s390x.h | 4 ++-- target/s390x/excp_helper.c | 8 ++++---- target/s390x/interrupt.c | 2 +- target/s390x/tcg-stub.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) -- 2.17.1 diff --git a/target/s390x/tcg_s390x.h b/target/s390x/tcg_s390x.h index ab2c4ba703..931ca5196c 100644 --- a/target/s390x/tcg_s390x.h +++ b/target/s390x/tcg_s390x.h @@ -14,8 +14,8 @@ #define TCG_S390X_H void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque); -void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code, - int ilen, uintptr_t ra); +void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, + uint32_t code, uintptr_t ra); void QEMU_NORETURN tcg_s390_data_exception(CPUS390XState *env, uint32_t dxc, uintptr_t ra); diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index f84bfb1284..c30872ef4f 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -33,15 +33,15 @@ #include "hw/s390x/s390_flic.h" #endif -void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code, - int ilen, uintptr_t ra) +void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, + uint32_t code, uintptr_t ra) { CPUState *cs = CPU(s390_env_get_cpu(env)); cpu_restore_state(cs, ra, true); qemu_log_mask(CPU_LOG_INT, "program interrupt at %#" PRIx64 "\n", env->psw.addr); - trigger_pgm_exception(env, code, ilen); + trigger_pgm_exception(env, code, ILEN_UNWIND); cpu_loop_exit(cs); } @@ -59,7 +59,7 @@ void QEMU_NORETURN tcg_s390_data_exception(CPUS390XState *env, uint32_t dxc, if (env->cregs[0] & CR0_AFP) { env->fpc = deposit32(env->fpc, 8, 8, dxc); } - tcg_s390_program_interrupt(env, PGM_DATA, ILEN_AUTO, ra); + tcg_s390_program_interrupt(env, PGM_DATA, ra); } void HELPER(data_exception)(CPUS390XState *env, uint32_t dxc) diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index 901cd713de..e24a757368 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -41,7 +41,7 @@ void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen, if (kvm_enabled()) { kvm_s390_program_interrupt(cpu, code); } else if (tcg_enabled()) { - tcg_s390_program_interrupt(env, code, ilen, ra); + tcg_s390_program_interrupt(env, code, ra); } else { g_assert_not_reached(); } diff --git a/target/s390x/tcg-stub.c b/target/s390x/tcg-stub.c index 32adb7276a..d22c898802 100644 --- a/target/s390x/tcg-stub.c +++ b/target/s390x/tcg-stub.c @@ -18,8 +18,8 @@ void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque) { } -void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code, - int ilen, uintptr_t ra) +void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, + uint32_t code, uintptr_t ra) { g_assert_not_reached(); }