From: David Hildenbrand <david@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org
Subject: Re: [PATCH v3 12/18] target/s390x: Remove fail variable from s390_cpu_tlb_fill
Date: Fri, 27 Sep 2019 12:56:28 +0200 [thread overview]
Message-ID: <f203ed3c-993c-f797-d3e4-c2dcb7df4c1f@redhat.com> (raw)
In-Reply-To: <20190926162615.31168-13-richard.henderson@linaro.org>
On 26.09.19 18:26, Richard Henderson wrote:
> 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.
>
> 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);
>
> /*
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2019-09-27 12:57 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 16:25 [PATCH v3 00/18] target/s390: Use tcg unwinding for ilen Richard Henderson
2019-09-26 16:25 ` [PATCH v3 01/18] target/s390x: Truncate 32-bit psw_addr before creating TB Richard Henderson
2019-09-27 10:23 ` David Hildenbrand
2019-09-27 18:24 ` Richard Henderson
2019-09-26 16:25 ` [PATCH v3 02/18] target/s390x: Add ilen to unwind data Richard Henderson
2019-09-27 10:30 ` David Hildenbrand
2019-09-27 16:02 ` Richard Henderson
2019-09-30 7:55 ` David Hildenbrand
2019-09-30 15:03 ` Richard Henderson
2019-09-30 15:42 ` David Hildenbrand
2019-09-30 16:15 ` Richard Henderson
2019-09-30 17:13 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 03/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt Richard Henderson
2019-09-27 10:31 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 04/18] target/s390x: Remove ilen parameter from s390_program_interrupt Richard Henderson
2019-09-27 10:34 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 05/18] target/s390x: Use tcg_s390_program_interrupt in TCG helpers Richard Henderson
2019-09-27 10:40 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 06/18] target/s390x: Push trigger_pgm_exception lower in s390_cpu_tlb_fill Richard Henderson
2019-09-27 10:41 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 07/18] target/s390x: Handle tec " Richard Henderson
2019-09-27 10:42 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 08/18] target/s390: Return exception from mmu_translate_real Richard Henderson
2019-09-27 10:44 ` David Hildenbrand
2019-09-27 12:47 ` David Hildenbrand
2019-09-27 16:08 ` Richard Henderson
2019-09-26 16:26 ` [PATCH v3 09/18] target/s390x: Remove exc argument to mmu_translate_asce Richard Henderson
2019-09-27 10:45 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 10/18] target/s390: Return exception from mmu_translate Richard Henderson
2019-09-27 10:55 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 11/18] target/s390: Return exception from translate_pages Richard Henderson
2019-09-27 10:56 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 12/18] target/s390x: Remove fail variable from s390_cpu_tlb_fill Richard Henderson
2019-09-27 10:56 ` David Hildenbrand [this message]
2019-09-26 16:26 ` [PATCH v3 13/18] target/s390x: Simplify helper_lra Richard Henderson
2019-09-27 10:57 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 14/18] target/s390x: Rely on unwinding in s390_cpu_tlb_fill Richard Henderson
2019-09-27 11:02 ` David Hildenbrand
2019-09-27 16:16 ` Richard Henderson
2019-09-30 7:56 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 15/18] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw Richard Henderson
2019-09-27 11:04 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 16/18] target/s390x: Remove ILEN_AUTO Richard Henderson
2019-09-27 11:04 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 17/18] target/s390x: Remove ilen argument from trigger_access_exception Richard Henderson
2019-09-27 11:04 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 18/18] target/s390x: Remove ilen argument from trigger_pgm_exception Richard Henderson
2019-09-27 11:05 ` David Hildenbrand
2019-09-27 8:18 ` [PATCH v3 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=f203ed3c-993c-f797-d3e4-c2dcb7df4c1f@redhat.com \
--to=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.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).