From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: david@redhat.com
Subject: [PATCH v5 11/18] target/s390x: Remove fail variable from s390_cpu_tlb_fill
Date: Tue, 1 Oct 2019 10:16:07 -0700 [thread overview]
Message-ID: <20191001171614.8405-12-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191001171614.8405-1-richard.henderson@linaro.org>
Now that excp always contains a real exception number, we can
use that instead of a separate fail variable. This allows a
redundant test to be removed.
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/excp_helper.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index 6a0728b65f..98a1ee8317 100644
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -127,7 +127,7 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
CPUS390XState *env = &cpu->env;
target_ulong vaddr, raddr;
uint64_t asc, tec;
- int prot, fail, excp;
+ int prot, excp;
qemu_log_mask(CPU_LOG_MMU, "%s: addr 0x%" VADDR_PRIx " rw %d mmu_idx %d\n",
__func__, address, access_type, mmu_idx);
@@ -141,20 +141,18 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
vaddr &= 0x7fffffff;
}
excp = mmu_translate(env, vaddr, access_type, asc, &raddr, &prot, &tec);
- fail = excp;
} else if (mmu_idx == MMU_REAL_IDX) {
/* 31-Bit mode */
if (!(env->psw.mask & PSW_MASK_64)) {
vaddr &= 0x7fffffff;
}
excp = mmu_translate_real(env, vaddr, access_type, &raddr, &prot, &tec);
- fail = excp;
} else {
g_assert_not_reached();
}
/* check out of RAM access */
- if (!fail &&
+ if (!excp &&
!address_space_access_valid(&address_space_memory, raddr,
TARGET_PAGE_SIZE, access_type,
MEMTXATTRS_UNSPECIFIED)) {
@@ -163,10 +161,9 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
__func__, (uint64_t)raddr, (uint64_t)ram_size);
excp = PGM_ADDRESSING;
tec = 0; /* unused */
- fail = 1;
}
- if (!fail) {
+ if (!excp) {
qemu_log_mask(CPU_LOG_MMU,
"%s: set tlb %" PRIx64 " -> %" PRIx64 " (%x)\n",
__func__, (uint64_t)vaddr, (uint64_t)raddr, prot);
@@ -178,13 +175,11 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
return false;
}
- if (excp) {
- if (excp != PGM_ADDRESSING) {
- stq_phys(env_cpu(env)->as,
- env->psa + offsetof(LowCore, trans_exc_code), tec);
- }
- trigger_pgm_exception(env, excp, ILEN_AUTO);
+ if (excp != PGM_ADDRESSING) {
+ stq_phys(env_cpu(env)->as,
+ env->psa + offsetof(LowCore, trans_exc_code), tec);
}
+ trigger_pgm_exception(env, excp, ILEN_AUTO);
cpu_restore_state(cs, retaddr, true);
/*
--
2.17.1
next prev parent reply other threads:[~2019-10-01 17:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 17:15 [PATCH v5 00/18] target/s390: Use tcg unwinding for ilen Richard Henderson
2019-10-01 17:15 ` [PATCH v5 01/18] target/s390x: Add ilen to unwind data Richard Henderson
2019-10-01 17:15 ` [PATCH v5 02/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt Richard Henderson
2019-10-01 17:15 ` [PATCH v5 03/18] target/s390x: Remove ilen parameter from s390_program_interrupt Richard Henderson
2019-10-01 17:16 ` [PATCH v5 04/18] target/s390x: Use tcg_s390_program_interrupt in TCG helpers Richard Henderson
2019-10-01 17:16 ` [PATCH v5 05/18] target/s390x: Push trigger_pgm_exception lower in s390_cpu_tlb_fill Richard Henderson
2019-10-01 17:16 ` [PATCH v5 06/18] target/s390x: Handle tec " Richard Henderson
2019-10-01 17:16 ` [PATCH v5 07/18] target/s390x: Return exception from mmu_translate_real Richard Henderson
2019-10-01 17:16 ` [PATCH v5 08/18] target/s390x: Remove exc argument to mmu_translate_asce Richard Henderson
2019-10-01 17:16 ` [PATCH v5 09/18] target/s390x: Return exception from mmu_translate Richard Henderson
2019-10-01 17:16 ` [PATCH v5 10/18] target/s390x: Return exception from translate_pages Richard Henderson
2019-10-01 17:16 ` Richard Henderson [this message]
2019-10-01 17:16 ` [PATCH v5 12/18] target/s390x: Simplify helper_lra Richard Henderson
2019-10-01 17:16 ` [PATCH v5 13/18] target/s390x: Rely on unwinding in s390_cpu_tlb_fill Richard Henderson
2019-10-01 17:16 ` [PATCH v5 14/18] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw Richard Henderson
2019-10-01 17:16 ` [PATCH v5 15/18] target/s390x: Remove ILEN_AUTO Richard Henderson
2019-10-01 17:16 ` [PATCH v5 16/18] target/s390x: Remove ilen argument from trigger_access_exception Richard Henderson
2019-10-01 17:16 ` [PATCH v5 17/18] target/s390x: Remove ilen argument from trigger_pgm_exception Richard Henderson
2019-10-01 17:16 ` [PATCH v5 18/18] target/s390x: Remove ILEN_UNWIND Richard Henderson
2019-10-09 12:46 ` [PATCH v5 00/18] target/s390: Use tcg unwinding for ilen David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191001171614.8405-12-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).