> #endif /* CONFIG_USER_ONLY */
> +
> +bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
> + MMUAccessType access_type, int mmu_idx,
> + bool probe, uintptr_t retaddr)
> +{
> + S390CPU *cpu = S390_CPU(cs);
> +
> +#ifndef CONFIG_USER_ONLY
> + CPUS390XState *env = &cpu->env;
> + target_ulong vaddr, raddr;
> + uint64_t asc;
> + int prot, fail;
> +
> + qemu_log_mask(CPU_LOG_MMU, "%s: addr 0x%" VADDR_PRIx " rw %d mmu_idx
> %d\n",
> + __func__, address, access_type, mmu_idx);
> +
> + vaddr = address;
> +
> + if (mmu_idx < MMU_REAL_IDX) {
> + asc = cpu_mmu_idx_to_asc(mmu_idx);
> + /* 31-Bit mode */
> + if (!(env->psw.mask & PSW_MASK_64)) {
> + vaddr &= 0x7fffffff;
> + }
> + fail = mmu_translate(env, vaddr, access_type, asc, &raddr, &prot,
> true);
> + } else if (mmu_idx == MMU_REAL_IDX) {
> + /* 31-Bit mode */
> + if (!(env->psw.mask & PSW_MASK_64)) {
> + vaddr &= 0x7fffffff;
> + }
> + fail = mmu_translate_real(env, vaddr, access_type, &raddr, &prot);
> + } else {
> + g_assert_not_reached();
> + }
> +
> + /* check out of RAM access */
> + if (!fail &&
> + !address_space_access_valid(&address_space_memory, raddr,
> + TARGET_PAGE_SIZE, access_type,
> + MEMTXATTRS_UNSPECIFIED)) {
> + qemu_log_mask(CPU_LOG_MMU,
> + "%s: raddr %" PRIx64 " > ram_size %" PRIx64 "\n",
> + __func__, (uint64_t)raddr, (uint64_t)ram_size);
> + trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_AUTO);
> + fail = 1;
> + }
> +
> + if (!fail) {
> + qemu_log_mask(CPU_LOG_MMU,
> + "%s: set tlb %" PRIx64 " -> %" PRIx64 " (%x)\n",
> + __func__, (uint64_t)vaddr, (uint64_t)raddr, prot);
> + tlb_set_page(cs, address & TARGET_PAGE_MASK, raddr, prot,
> + mmu_idx, TARGET_PAGE_SIZE);
> + return true;
> + }
> + if (probe) {
> + return false;
> + }
> +#else
> + trigger_pgm_exception(&cpu->env, PGM_ADDRESSING, ILEN_AUTO);
> + /*
> + * 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;
> +#endif
> +
> + cpu_restore_state(cs, retaddr, true);
> +
> + /*
> + * Note that handle_mmu_fault sets ilen to either 2 (for code)
This comment no longer matches.
> + * or AUTO (for data). We can resolve AUTO now, as if it was
> + * set to UNWIND -- that will have been done via assignment
> + * in cpu_restore_state. Otherwise re-examine access_type.
> + */
> + if (access_type == MMU_INST_FETCH) {
> + CPUS390XState *env = cs->env_ptr;
> + env->int_pgm_ilen = 2;
> + }
> +
> + cpu_loop_exit(cs);
> +}
> +
Apart from that, looks good to me.
--
Thanks,
David / dhildenb
