[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 06/18] target/s390x: Handle tec in s390_cpu_tlb_fill
From: |
Richard Henderson |
Subject: |
[PATCH v5 06/18] target/s390x: Handle tec in s390_cpu_tlb_fill |
Date: |
Tue, 1 Oct 2019 10:16:02 -0700 |
As a step toward moving all excption handling out of mmu_translate,
copy handling of the LowCore tec value from trigger_access_exception
into s390_cpu_tlb_fill. So far this new plumbing isn't used.
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/excp_helper.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index 552098be5f..ab2ed47fef 100644
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -126,7 +126,7 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int
size,
S390CPU *cpu = S390_CPU(cs);
CPUS390XState *env = &cpu->env;
target_ulong vaddr, raddr;
- uint64_t asc;
+ uint64_t asc, tec;
int prot, fail, excp;
qemu_log_mask(CPU_LOG_MMU, "%s: addr 0x%" VADDR_PRIx " rw %d mmu_idx %d\n",
@@ -162,6 +162,7 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int
size,
"%s: raddr %" PRIx64 " > ram_size %" PRIx64 "\n",
__func__, (uint64_t)raddr, (uint64_t)ram_size);
excp = PGM_ADDRESSING;
+ tec = 0; /* unused */
fail = 1;
}
@@ -178,6 +179,10 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int
size,
}
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);
}
cpu_restore_state(cs, retaddr, true);
--
2.17.1
- [PATCH v5 00/18] target/s390: Use tcg unwinding for ilen, Richard Henderson, 2019/10/01
- [PATCH v5 01/18] target/s390x: Add ilen to unwind data, Richard Henderson, 2019/10/01
- [PATCH v5 02/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt, Richard Henderson, 2019/10/01
- [PATCH v5 05/18] target/s390x: Push trigger_pgm_exception lower in s390_cpu_tlb_fill, Richard Henderson, 2019/10/01
- [PATCH v5 06/18] target/s390x: Handle tec in s390_cpu_tlb_fill,
Richard Henderson <=
- [PATCH v5 03/18] target/s390x: Remove ilen parameter from s390_program_interrupt, Richard Henderson, 2019/10/01
- [PATCH v5 04/18] target/s390x: Use tcg_s390_program_interrupt in TCG helpers, Richard Henderson, 2019/10/01
- [PATCH v5 08/18] target/s390x: Remove exc argument to mmu_translate_asce, Richard Henderson, 2019/10/01
- [PATCH v5 07/18] target/s390x: Return exception from mmu_translate_real, Richard Henderson, 2019/10/01
- [PATCH v5 09/18] target/s390x: Return exception from mmu_translate, Richard Henderson, 2019/10/01
- [PATCH v5 11/18] target/s390x: Remove fail variable from s390_cpu_tlb_fill, Richard Henderson, 2019/10/01
- [PATCH v5 10/18] target/s390x: Return exception from translate_pages, Richard Henderson, 2019/10/01
- [PATCH v5 12/18] target/s390x: Simplify helper_lra, Richard Henderson, 2019/10/01
- [PATCH v5 13/18] target/s390x: Rely on unwinding in s390_cpu_tlb_fill, Richard Henderson, 2019/10/01
- [PATCH v5 14/18] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw, Richard Henderson, 2019/10/01