From patchwork Fri Sep 27 19:39: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: 174642 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3966265ill; Fri, 27 Sep 2019 12:40:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqxksIn7EUFKAaSrNSES0xV2AgU7NofZwJ0kL/s+HBAftBWbXbzdOtScGy0vBJ0z8WUTVxQE X-Received: by 2002:ac8:41ca:: with SMTP id o10mr11559181qtm.352.1569613219450; Fri, 27 Sep 2019 12:40:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569613219; cv=none; d=google.com; s=arc-20160816; b=lCe0gAr2qMwAW/eTJ4HdB4WjGUvglhEjEqfUSHfpmlUDAhWsYOMf6MQeylbDBSsGq9 D/VHiQuPmmcO5n1H9t6FVJ2alycwQyTzlQmZTAkVtUeum9uE6TLSlN76p8Cc/ScRu0A1 DKutyuBH6juFGrhrITOjq7leWDSk8bYGmOLt824k+/R2oMq2v1FCxEQ49qbg99N9BG24 xxl6t/1bkqRn6VIXHZO9N/p2rU5kv5os2NrgqouQtGrFFez9ZfZgUW4jZACPEZ8M4S7g 3DKg9xOaVnO6Y/qpbKMFHJ/QrEQLN2LlH6ftCpstXyjSbusUkaOINdwtkRPnmdFQakm6 uZMw== 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=mEJpPDOXw0D5Zksw9BQVNR7N9VOlOrM1zivyUmzXqRI=; b=cV97DdsBftaSEs6H93/mHpU78NTtTTOJEUBQQ9fAHkBPMhxbNeenNGEOgiEdyFco+T T1qSti0ogm8qeedH2/VdO6SMoIGWiZZ+AV63CvDyCRDKOXGLME4EeP7iNXY/qIYYQsEJ Y2SGRp55NC99f7RNPnaJQ4uuiZ1EiG0B1KHYC0el71mOgTHbphe+zFKZsyS/uopCHiNf w0jdcdqUDCzTPzxY001Lq+4i+IFG6H/lxNpPagt0QBq5FTSd1dC7Rx9keUGIyWntGIiw YSDzhQwTH+o2lolAbu5SV7Uj8Gxb0tj7ZREhLjuDNsMNgRsrib5vyMAefLo7Yc5fvZQ+ sehA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jsTR0IyC; 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 o47si5648687qvc.11.2019.09.27.12.40.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Sep 2019 12:40:19 -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=jsTR0IyC; 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 ([::1]:56540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDw6E-0003Ft-CT for patch@linaro.org; Fri, 27 Sep 2019 15:40:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46409) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDw5Y-0003A9-In for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:39:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDw5X-0006Co-1q for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:39:36 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:45292) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDw5W-0006Bp-Sj for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:39:34 -0400 Received: by mail-pf1-x434.google.com with SMTP id y72so2118151pfb.12 for ; Fri, 27 Sep 2019 12:39:34 -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=mEJpPDOXw0D5Zksw9BQVNR7N9VOlOrM1zivyUmzXqRI=; b=jsTR0IyCMuEVZx9Lx8RFssEvG/ohK4uRRxVYFjzEWqTlxb3UnWmDVNRTUCupuFxeP1 xWiTFh8WIjC9w3EhBfSsA8wVsL/AgY92ajqYoF2fJHsV9Rk83ow0T1B2HXIvFOfBPBoa DtoTQpFqf4WmE9DJPdc+0uztksJe2Bqy5BV7zpz6yFefhvsRXP798KSSaqvc/WZ+deKG dX86WiR1/4vt6t6/M6E+/itdLiToKLhMyy33zyoE2Ow+acOvczMMxr+brTe05AIISmg+ dYxKkmUF8wbtiWYWpOx87Vk6/a6F3qcququ+5LrDNnOiTM4JwkZ8Iyze/84b1czIpdFC +w8Q== 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=mEJpPDOXw0D5Zksw9BQVNR7N9VOlOrM1zivyUmzXqRI=; b=g2kOJV7U6VyHJ7qkDsIcuv5Hh2UusvY4tEdznuK/pZdzYma8E5wrTwx0s2Ng8JcBTM wqqP9AGLDz98LspkccVOSBc3HqXHp2fGiShRWjm1uSewN0vgeLniJxPyiyx0xDTvBXKW VXZKVj1ZD9CpawptrJHYqTRX8INsjlrxGucb/qtBRwxwGlgQQPN5qbK3Y+HaJvPcdu+V /FLAf8NHliOtKLU0wL9GXRCK9SH4UBT0AJzpdUE0Z0bdprjHQ9TkWPUm4FKrCAm5KSI6 PvsSHL+bASR4oP8IMRWq+rSfNRyKALNSM20FzjWHiZNIIeLcoYtqKv8WksUR+mSYfHZW EkGw== X-Gm-Message-State: APjAAAXLCFH6Le35xIRmCGodY/TetRq/4vOt33DBmDScFYBvEXWQwXSm QdtAZdJ2ZJd9YV5EcNN7NJ/Nbcy0OsQ= X-Received: by 2002:a63:1d02:: with SMTP id d2mr11106385pgd.190.1569613173324; Fri, 27 Sep 2019 12:39:33 -0700 (PDT) Received: from localhost.localdomain ([12.206.46.62]) by smtp.gmail.com with ESMTPSA id 192sm3676403pfb.110.2019.09.27.12.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 12:39:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 02/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt Date: Fri, 27 Sep 2019 12:39:09 -0700 Message-Id: <20190927193925.23567-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927193925.23567-1-richard.henderson@linaro.org> References: <20190927193925.23567-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::434 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, 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 | 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 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..681a9c59e1 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, 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(); }