From patchwork Tue Oct 1 17:16:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174908 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp8853009ill; Tue, 1 Oct 2019 10:29:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqzQnLGyu4UU+uGwY949WgvazbW4ASBs5HU1g+VHrJKbv2/KmNVg1VLQ3Gu8XoGotaCQNy22 X-Received: by 2002:a50:af26:: with SMTP id g35mr27473790edd.129.1569950998812; Tue, 01 Oct 2019 10:29:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569950998; cv=none; d=google.com; s=arc-20160816; b=e1Xae0sM1jmfN0nMHiYm4fKuWC1mzjNtWn/aETTMyUlVrVX93cMZxjtKU8UAFtOVxu 5nH0S5Y4AABlv2ikst4UHO+KUobwQD7n61gI3G3osr+JXoUYd8dqbGVwiQheevKhPsWM 0AygsSHnkd0vlrMV9Bulg8d3T5e+AQ9VBEriR6UAv24kUId35HhJSd/a2Vz3Z04xZcbs MTk2ESh6HcDVfKvHsba195JKeyK9/qtsBt1gfrnlql+2yUja/bn90JN9q/BBni+bxSL2 HxUazuqGOMuTi9yJ+26fWSwBAtWhlui7O1LYTFl+8V17F8i8fxedmHA67sT6iJClIqpa dpJg== 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=zWndXgEDq38ZD9+tzMggT4V1IKonosDqt8xl6lDbLwc=; b=Yh1vcUr/ghIEEp7XfU2z+DaC+Hty098zsrkyeoDSCfgLrigYT3aG1PCmLMSdzVGZwG 62KdwI19rMzwXhYYHhJqUCGaZdq3G694vRC8LGVPQknjhDjBLsGWE6kuwl/HFpngUDkw //RkjINkrkJI3Xfn0ImN8NG8rRRr4cOuxXJPdUt53CPLyryW0+valOXBfEBMNiD8To9z +H7UckUJ+wq9FohQFm5ODMBWTWJuTB7u/Y7f/hRXEQCX/mG79apjQBjd9EZA1fXMSWHL 95es5cKURCN10fd3fiBGPp2NU4CtJgGJEWdK4QYAPPsLlnfwszDGhyfBOCFoVIssMI2h 7JUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rv6rqUR2; 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 oa24si9042058ejb.41.2019.10.01.10.29.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Oct 2019 10:29:58 -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=Rv6rqUR2; 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]:45766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFLyG-0005Qc-UI for patch@linaro.org; Tue, 01 Oct 2019 13:29:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32991) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFLlR-0001kT-Pt for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFLlQ-0005dg-F7 for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:41 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:41350) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFLlQ-0005d5-9i for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:40 -0400 Received: by mail-pg1-x543.google.com with SMTP id s1so10094319pgv.8 for ; Tue, 01 Oct 2019 10:16:39 -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=zWndXgEDq38ZD9+tzMggT4V1IKonosDqt8xl6lDbLwc=; b=Rv6rqUR2U5m+Q68C4U02FebkcUVqJvtdRBd3tY1NCPDSUBtvID3T7cs2mv4jwui7fF mpee7zecLtAy6SHSlEVqgJmEzNQiJmgvQ7XYn7qyKY+ze+BJ5gC+M3GLdE2JGPkPgu4O d4WNUAq/Ou7qj1gTZf8cnA9Gp6flf6wXM/XSAlFvjZfc/4G/LtEpsVfBp1xgUn9d044h rQV2nU4TSK7bTEo/4Guwh+Ih9Jtz5aMqiOaN+bZJn+VMl2VjzUXa6n/BtF0wFf+gKZTh UiwjqSd1fE0FKcuMPc87RaOiuG2fuSS/hAPioyXCmoaoWNoqjOBtqGtxbitovdIeqSFd LL0Q== 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=zWndXgEDq38ZD9+tzMggT4V1IKonosDqt8xl6lDbLwc=; b=LVexExqHcVQuoAS7zpd+g8PtH9MrUHkmlbQYmZ5jk+ZaMd6FcEtwfqOjrmQ7AB14ci QN0SB7zRKfGWRSlMzGnjoRSEGyB3onR+OqhBlHrFHH2RGQO+LdvrI2R09RLCvwEFOMVC 7M3KpPnTW4UuqOTElZ7USGHsVDkcpaO3vS0BtWTwFkxgL1OzjOBkflz8Onsb6v/YIrRR WRzWmsjhaVaNR45Fohb+E4KN5vQJrprN39cZOxjPlIoCQEhpWsEtIesV4V+mod03Wghl F6OuaOJNToS/jB5mMeWRZFuZcsfgyTWrCir7I8ncmMTfjnYyKu1kr+TJ16NfnH+yhnYq Tqtw== X-Gm-Message-State: APjAAAWCVqp1Blb3jiu8ODQ6fi3x3ASbHRGDQslJO4KC9rJRfwmNoJwn yZYrLLwumzBuvoTXQHnX2SAs3g2cItE= X-Received: by 2002:a65:6786:: with SMTP id e6mr31821960pgr.257.1569950198473; Tue, 01 Oct 2019 10:16:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 10:16:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 17/18] target/s390x: Remove ilen argument from trigger_pgm_exception Date: Tue, 1 Oct 2019 10:16:13 -0700 Message-Id: <20191001171614.8405-18-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::543 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" 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. Reviewed-by: David Hildenbrand 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 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 09c74f17dd..90b81335f9 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); } }