From patchwork Tue Oct 1 17:15:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174898 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp8842115ill; Tue, 1 Oct 2019 10:19:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqys7Mk3+1vXxu6vb9ibDb7Kq5TWyOhHEu3JD2gTFFIFyMEeHYTtQx/yzC37Zh/FZqy0WDCg X-Received: by 2002:a0c:ffa7:: with SMTP id d7mr25681915qvv.12.1569950389838; Tue, 01 Oct 2019 10:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569950389; cv=none; d=google.com; s=arc-20160816; b=P/wsV7dojwniT0UQk1DvXnxQVTlufMdEyFnnl4yTNZegV898qs+Yub/BttmzHcekEG 4VdCiG5D5W6egoE+LTY7gCFyMBXnoCmU+Ghp4oJf++z1bBXDTcCmdf0iFZQ7/rHQ/N7m KualPVNUA33WCsQT3YVCcXCrMBp3Y2AlZtYA1DHpkaVVis9w+oDCc2Tw2uJaT8fV3iVD XTO8jWS2heYPGV87FdXpaM1laAeIeza5+exJyiSlx4QfhVe1zqUB6XoNwxVXmE9eSihK IXQVj9eYFs3ObFD3gk1pubw/BoZDza2UxFkW6o3j7ThKMzmE1Y56Rp3ZnbLXBQ5ETM2l 91pg== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=0KNz+iOsX4QMQJox/KvD2oB0+dKW6HscqmDu5dXQGFM=; b=cPXBT2dBxnovt5rqmeBer/SEXIgt7tgj0rT2JWlQW/YtaIGwvnGpT/MGvg3CVKZvTo jnJWu+OCstUbrZGsj1ULlTZJ6v48ummQdDTndn5IFEiu3DZN2A9wcMv668G1znQELZXU bOQNGAFLL86K8NuDUnzIV6P5y41hOBC/Y7sl/OcEyMcIbLIPvNg0byJdgWK40ZJniTTz Csr+XDsRsbeHgVea73mGi8K3rb6lAvWU5ldqotBxXUNnTK88qb3/KeQAdLlu8g+hHKQT ldXr2emdjXFeUMUad06IvU4H8DbySbwXOTxpUTbbB0zDcItfql8T6k5ZXTqEZEvDO6tv Yypg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CJYyCEow; 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=pass (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 x8si14994544qtq.112.2019.10.01.10.19.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Oct 2019 10:19:49 -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=pass header.i=@linaro.org header.s=google header.b=CJYyCEow; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFLoS-0004Kt-U1 for patch@linaro.org; Tue, 01 Oct 2019 13:19:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60984) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFLl7-0001Sn-Rd for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFLl6-0005SU-F0 for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:21 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:41179) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFLl6-0005SF-8w for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:20 -0400 Received: by mail-pg1-x531.google.com with SMTP id s1so10093615pgv.8 for ; Tue, 01 Oct 2019 10:16:20 -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=0KNz+iOsX4QMQJox/KvD2oB0+dKW6HscqmDu5dXQGFM=; b=CJYyCEowrNqjH7x/r/Kh1vtNcmPxjSfHto1N7UGklCZEX8u+RUaKXuKzCs+bpCmVr8 g4Jq1ljR+pr/QsT3gZ3aU7B1TH5Hr/3llud3KsamHfSpIyzEwWa/dmLt1Gvz9h0Ee5NU wU4/KsX+/ca3Gin3nrfNw0w7V1YHJ2LFjE5lPTX4rbSLR3TF/cFp43a0SpXOHZq/UyyW 8W/bHrjnphSFARMstxrMgxnibqcPJC/Ci9eXWtQuc00G27WOH1wgY/Tv/3hojs9aVG/4 dF/5omz4AYrlvcBNkY9S6zmPRiwcKZmsGn295/QWCwjQYD+/3ypEAZcUS2HQ/8FT+wyr bCqw== 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=0KNz+iOsX4QMQJox/KvD2oB0+dKW6HscqmDu5dXQGFM=; b=IEI2ULLuiVUKwlX3MBJzOf7G6rnWI8kwd6sCn3e9TVUOAXVdGKk3a/tGyqGjMymjCi e3ZriZu5Nx+3yKAsHvun6OpAkw9ug1oD2BHGruZyW30RixpA1ECKOB8UfmC0uiaLOoBt T4UDu7KD5xTidEBaOVwDM753q1LD6J/y072BOEfCVS+KAwYwxJFO5We57CSxoeKfmXka lmbYvKVHnVErsja7nPAy3TVAW90iTTE8a/pI7a60LHEmsSo5/bpV1GtytEEGkM354J8g y623szjGWrHRmrmbT2MutwSBA1wyNghvHLWaTryFz/dYyW2AsahjT8BHWGNjLxp8Oru/ hgnQ== X-Gm-Message-State: APjAAAUn3/PK2fbFZztbXOUpuIT+Vr+OiPFbI4Zh8eBYrfjddsePBPoc jsFGhHdaOytpdf1f0xPedJ+woO7JEZM= X-Received: by 2002:a62:d45a:: with SMTP id u26mr29175091pfl.137.1569950178828; Tue, 01 Oct 2019 10:16:18 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id w7sm2863568pjn.1.2019.10.01.10.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 10:16:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 02/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt Date: Tue, 1 Oct 2019 10:15:58 -0700 Message-Id: <20191001171614.8405-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191001171614.8405-1-richard.henderson@linaro.org> References: <20191001171614.8405-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::531 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: 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. Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson --- target/s390x/tcg_s390x.h | 4 ++-- target/s390x/excp_helper.c | 10 +++++----- target/s390x/interrupt.c | 2 +- target/s390x/tcg-stub.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) -- 2.17.1 diff --git a/target/s390x/tcg_s390x.h b/target/s390x/tcg_s390x.h index 2813f9d48e..2f54ccb027 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); void QEMU_NORETURN tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc, diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index 892f659d5a..eb55e5ef53 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -34,15 +34,15 @@ #include "hw/boards.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 = env_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); } @@ -60,7 +60,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 QEMU_NORETURN tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc, @@ -75,7 +75,7 @@ void QEMU_NORETURN tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc, /* Always store the VXC into the FPC, without AFP it is undefined */ env->fpc = deposit32(env->fpc, 8, 8, vxc); - tcg_s390_program_interrupt(env, PGM_VECTOR_PROCESSING, ILEN_AUTO, ra); + tcg_s390_program_interrupt(env, PGM_VECTOR_PROCESSING, ra); } void HELPER(data_exception)(CPUS390XState *env, uint32_t dxc) diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index 30a9fb8852..b798e2ecbe 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -40,7 +40,7 @@ void s390_program_interrupt(CPUS390XState *env, uint32_t code, int ilen, if (kvm_enabled()) { kvm_s390_program_interrupt(env_archcpu(env), 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(); }