From patchwork Thu Sep 26 16:26:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174501 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2330261ill; Thu, 26 Sep 2019 10:09:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqzCjk8f28ZAMl5kZIWl6GEbNEpieXOo+OKzjd9c0nxJCdL7VQuFmY5im3H6KkW9+ntyu8Xg X-Received: by 2002:ac8:1af3:: with SMTP id h48mr4953484qtk.270.1569517765190; Thu, 26 Sep 2019 10:09:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569517765; cv=none; d=google.com; s=arc-20160816; b=dfNmv95vQPjvxbcdOlP72eYfy0+KQvThGtRxek0gXwly33Tx4OPL2xou7JJlBLBZtB wAZefnxWmB866kEbvQKHF94XZ5Lr1xbnOHxwW1zL7GGRuGbyYUJE9Unuvutql5HZwhin pKndcN51xTNXS/kTfb3Az5XQ1xmhEvg/Aif4jjA4U71neT2s6kJ9QMVsHCBzDvSQp5+H 9iWYMvbJZTT5wAk+SiT6ttcnz8SIDcDdN6Y+zmO9vJwWWWNnGxQgC71qOxURLaK8CDaX NS0iiSPoB0a7veNp9TN+VPqfwUgobSL5ZpbKkGQnf/s2TfyC0UhRjYHjRvNsQCAdrfxS 0aAw== 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=UQnfTCEnnIKKltvdbz7D/30XUobqe+yYKsVnosX+zfQ=; b=vTwL380LAAqMhBNIkFsOarZGLe/fYhzJOkN2ykXBCqspS9p56I9yvi1CVZddFWaseH OTg5g5ib5Iugih3mBW0URFdgNNdyfqZdZBp2l0Nuy0rTBmuydfLEoRcBGMzZUZ3tJapO AYj9unrUZqgpdHvhxPq7bgAgTXbCD3OxTKNC1Ehmo4yPSAwnY3GuGP0W9VzXCwpJya6w y06ni0IPHqkUgK1vXOm9p1FZPGLBhvy9Hz0u6fJjBl5FXhX9ynZFC1XqFotfNXGr+jK0 r6DP146lssqhrA6z9U13MsYFHPCPEuV1fXz9Z43AH677puFiLDPNE6dqk/aFv/i7wo5y grwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PWIXiiPB; 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 125si2182592qkn.156.2019.09.26.10.09.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Sep 2019 10:09:25 -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=PWIXiiPB; 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]:41298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDXGe-0003aD-Hk for patch@linaro.org; Thu, 26 Sep 2019 13:09:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41543) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDWcL-0002pj-Vt for qemu-devel@nongnu.org; Thu, 26 Sep 2019 12:27:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDWcK-0004u3-CB for qemu-devel@nongnu.org; Thu, 26 Sep 2019 12:27:45 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:43246) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDWcK-0004tc-79 for qemu-devel@nongnu.org; Thu, 26 Sep 2019 12:27:44 -0400 Received: by mail-pg1-f194.google.com with SMTP id v27so1820847pgk.10 for ; Thu, 26 Sep 2019 09:27:44 -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=UQnfTCEnnIKKltvdbz7D/30XUobqe+yYKsVnosX+zfQ=; b=PWIXiiPBIOpJcCFllmzuD0SDAl9KlayLjCziHUGt+QVFFoDwoxV5h6wPGQHKi/5PRH InM8sMI+d7VTXQ/krwu5I8oU4WiNEHzZ4WrNLeAE5GfvB/fzsTEW3ajNY28rzYzazIW9 QyIpRWIJf7VGsBFwgqo1SDJlRys8swruRNCtS2pm8yYLZh3UTxAkDC4g9MK+/9Mc/v6Q ASu2/YWHu45VdyvY+9dnr1GY6j0PaNLjEh3Gc8Rg5UrJp13ZJ2Rk85H9jvsH3MINWS02 eaFirR9oVneG9mb767BB5+VgfNpoxy+0ZyZkFpQESneeAbSUieJMLOnRwg/pbUNl0t2i eFZw== 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=UQnfTCEnnIKKltvdbz7D/30XUobqe+yYKsVnosX+zfQ=; b=TqAmjlx/t/xMacGMfwLYtjcoIIJr9k21zqttoeZZIdTQkXb9DSeogugltvoYe0s/YQ ILVpcMniTfH7+NUgVY5jxsL7ixvcxumJw0EqK7ojsM5QnCTj0ric3UlqsFCurPC5A328 qu2LV0U1KSJvtLAYf8ItGk4U/8gzWXA0VNUncMzC3CiNXupYnAEg+amh/lUMq4qcPY3u eVisK7rMyDSWP3a2M0ZsByaGrWRx661xk1vlVkE/DRhAPFus+VZqQzydpWQNc3eoCXm9 6lwbHxxk1VKAVWuyHT+joj/isYMQwf8t8Bi1PGMsAEIEgQE8sz2sKweS3HdEULFF0+C5 JwpA== X-Gm-Message-State: APjAAAUNNBn0zho80za0m2/wX0hqFXJe6FlMaq9LCYKDPJpoBNmfpt+0 3lUWMtdVBskomcWVQ5rT9Z5YMpMmGpQ= X-Received: by 2002:a17:90a:310:: with SMTP id 16mr4580718pje.100.1569515202853; Thu, 26 Sep 2019 09:26:42 -0700 (PDT) Received: from localhost.localdomain ([12.157.10.114]) by smtp.gmail.com with ESMTPSA id 64sm4453169pfx.31.2019.09.26.09.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2019 09:26:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 18/18] target/s390x: Remove ilen argument from trigger_pgm_exception Date: Thu, 26 Sep 2019 09:26:15 -0700 Message-Id: <20190926162615.31168-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190926162615.31168-1-richard.henderson@linaro.org> References: <20190926162615.31168-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.215.194 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" All but one caller passes ILEN_UNWIND, which is not stored. For the one use case in s390_cpu_tlb_fill, set int_pgm_ilen directly, simply to avoid the assert within do_program_interrupt. Signed-off-by: Richard Henderson --- target/s390x/internal.h | 2 +- target/s390x/excp_helper.c | 7 ++++--- target/s390x/interrupt.c | 7 ++----- target/s390x/mmu_helper.c | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) -- 2.17.1 Reviewed-by: David Hildenbrand diff --git a/target/s390x/internal.h b/target/s390x/internal.h index c993c3ef40..d37816104d 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -317,7 +317,7 @@ void cpu_unmap_lowcore(LowCore *lowcore); /* interrupt.c */ -void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen); +void trigger_pgm_exception(CPUS390XState *env, uint32_t code); void cpu_inject_clock_comparator(S390CPU *cpu); void cpu_inject_cpu_timer(S390CPU *cpu); void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr); diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index c252e9a7d8..e70c20d363 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -42,7 +42,7 @@ void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *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_UNWIND); + trigger_pgm_exception(env, code); cpu_loop_exit(cs); } @@ -96,7 +96,7 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size, { S390CPU *cpu = S390_CPU(cs); - trigger_pgm_exception(&cpu->env, PGM_ADDRESSING, ILEN_UNWIND); + trigger_pgm_exception(&cpu->env, PGM_ADDRESSING); /* On real machines this value is dropped into LowMem. Since this is userland, simply put this someplace that cpu_loop can find it. */ cpu->env.__excp_addr = address; @@ -186,7 +186,8 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size, * and so unwinding will not occur. However, ILEN is also undefined * for that case -- we choose to set ILEN = 2. */ - trigger_pgm_exception(env, excp, 2); + env->int_pgm_ilen = 2; + trigger_pgm_exception(env, excp); cpu_loop_exit_restore(cs, retaddr); } diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index 2b71e03914..4cdbbc8849 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -22,16 +22,13 @@ #endif /* Ensure to exit the TB after this call! */ -void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen) +void trigger_pgm_exception(CPUS390XState *env, uint32_t code) { CPUState *cs = env_cpu(env); cs->exception_index = EXCP_PGM; env->int_pgm_code = code; - /* If ILEN_UNWIND, int_pgm_ilen already has the correct value. */ - if (ilen != ILEN_UNWIND) { - env->int_pgm_ilen = ilen; - } + /* env->int_pgm_ilen is already set, or will be set during unwinding */ } void s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t ra) diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index e6c3139c57..ba02d33e86 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -44,7 +44,7 @@ static void trigger_access_exception(CPUS390XState *env, uint32_t type, if (type != PGM_ADDRESSING) { stq_phys(cs->as, env->psa + offsetof(LowCore, trans_exc_code), tec); } - trigger_pgm_exception(env, type, ILEN_UNWIND); + trigger_pgm_exception(env, type); } }