From patchwork Fri Sep 27 19:39:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174659 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3993661ill; Fri, 27 Sep 2019 13:06:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqwA8KHhCP0dsD/s64t8QNm8UuKZGHlXyDiLtH+F6QPfL+NbK1Kg/el+ZpAlt1pSwsVzJA0U X-Received: by 2002:ac8:33c3:: with SMTP id d3mr12087416qtb.41.1569614785972; Fri, 27 Sep 2019 13:06:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569614785; cv=none; d=google.com; s=arc-20160816; b=JBwF+Doj3mhURsg23V5idrsY5cHUxr9rrSSTERlz106OlXHhOStOad0tXOA3LgnzlU zl7sKvtrEsclDO1se174hAKehgpV4U6bWC2Z90Xv5amMohBwOVcyN/spzQbZt5mKdbH+ h77kSxDyqxw03qu+f/h08kUKAX2kT9zetau5fmZYnkCamzAvizAsXNOGOUsqKcxqHDh/ v5TVDZBEucdjExEj9Ogg84QWurl6onnklVd5wEm5eoyELK0o1Tavba3pYmdb6m7Lli47 mvpAEc0tXLysrNaFqquFl8S8yJIm/sEVLoVeQoZhK2Va/tRZEbPqMQZy7n+r85/PFdX8 fUfw== 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=xyookMrLFMxgbzGDAo81NwXe/jFxyBCLMjB+5LZHPQQ=; b=IJVyPtwyhsCPgZGsPolN39qUVe+4dtFvTVWAMa/BkFt+jrjDNOYQUPSTsmxLpBgGjq PnVGfRCz5hJYyFBvxHCYXxLAtFwGhYAkdlG+R7+TUhqCEWB9huWXG7uBSPAxqeFw2OeO xRNHbryxiEGBQevzAAb+gi7pV7uQyAehQVMHzOnwC+d59u54wQEY+8u2yb5j/du0gO4I vu9ioYz4BNwYfGNj2wwx9YBgCMWiotR0de9YCyZVfyqAAQOG31IwH95FZTDyuUhW1kuH zfHnAB5xxz8lUQzcw7nHVXJaLgapepsVnF3i4plVCV9nVTBYfzLzs6f7k0aRww2S/k7v mv5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="KJBlU/UU"; 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 a130si3176888qkg.307.2019.09.27.13.06.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Sep 2019 13:06: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="KJBlU/UU"; 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]:57168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDwVV-0003PU-Eg for patch@linaro.org; Fri, 27 Sep 2019 16:06:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46839) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDw60-0003YS-Dl for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:40:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDw5x-0006ek-8B for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:40:04 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:43309) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDw5w-0006dS-K4 for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:40:00 -0400 Received: by mail-pl1-x642.google.com with SMTP id f21so1461288plj.10 for ; Fri, 27 Sep 2019 12:40:00 -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=xyookMrLFMxgbzGDAo81NwXe/jFxyBCLMjB+5LZHPQQ=; b=KJBlU/UUP8SBSi+VzPmvIkUkhGtVQB9awpc+UO+AKSGHNNuj15qlA8tVnlikOVONST s94QogqWLdewu/H/IGopK5ev6QIC0wecSlRloXr0kflk9Ve4oKMccf3hqan6g0/065I0 5OGuOr6Q33vV7XBDhmgEXs7htIjaC5cQM6YBBr79/xKN2czYtL5uTSGwkmMgHGs4H739 5XyarLaMOB3i6S3iRHpKtjFMY4cSGm0w7/nPjjBAyNIUgqBNpJDWIFH8PVtpBxkilko0 YNz0/jNebfol62RshkjJIPlWte4wmn2ycUJMk8WvKAT15VKMi+oU8sngkpRsRYUKX99K ZMmQ== 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=xyookMrLFMxgbzGDAo81NwXe/jFxyBCLMjB+5LZHPQQ=; b=ciOdE+PQ8d/3Vgt5VaKcooZKj6FQxAXegKuYHghGZDf/sOft8LS8duJLwV6Vvivvv3 7ofDmxj/qQP4rH53Ar4D/FCyUGFdrBaaj2BVNyRwTL0e8L62rwj76bUHd801hru1vPYX EnSjaGErgVpPPWfqWWwUFOCBX2jlMAy6VvoP1DoMzwhqTDW17aNaZZJTeIo5mvbaIYrv GEco46u7guO5jgmo511beD2k+CKJC5Byn0h91cOCfLmEPCLjZYL7S9HswIzZasqIVY6N tdURex02nDvgerCWS69mAIcJqSNjB8CrA4VWByUUfDZzhTWZaNB/4Nk5ZJEgU92ZXrhi 5tYQ== X-Gm-Message-State: APjAAAUKLG7xHXSfHQUld1CM132MEap1GcdN4HRTNZ7ea/q4ryowPn4h OwdpVFDE8D+UMctkkPbdfmhOGcs5OPU= X-Received: by 2002:a17:902:8bc8:: with SMTP id r8mr6388734plo.338.1569613198824; Fri, 27 Sep 2019 12:39:58 -0700 (PDT) Received: from localhost.localdomain ([12.206.46.62]) by smtp.gmail.com with ESMTPSA id 192sm3676403pfb.110.2019.09.27.12.39.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 12:39:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 17/18] target/s390x: Remove ilen argument from trigger_pgm_exception Date: Fri, 27 Sep 2019 12:39:24 -0700 Message-Id: <20190927193925.23567-18-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::642 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. 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 768f50a255..839b35fae9 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); } }