diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2015-06-03 23:09:54 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2015-06-05 01:37:59 +0200 |
| commit | c255ac601231e8c53007e10d640722ac58eb77cc (patch) | |
| tree | 6b2537c583b5c8c56d9892251c8e2e99b2e254c6 | |
| parent | 4decd76d71d6972a59bf0a16d0dea0c83490d001 (diff) | |
target-s390x: support non current ASC in s390_cpu_handle_mmu_fault
s390_cpu_handle_mmu_fault currently looks at the current ASC mode
defined in PSW mask instead of the MMU index. This prevent emulating
easily instructions using a specific ASC mode. Fix that by using the
MMU index converted back to ASC using the just added cpu_mmu_idx_to_asc
function.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | target-s390x/helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-s390x/helper.c b/target-s390x/helper.c index 6b47766494..90d273c098 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -112,7 +112,7 @@ int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr orig_vaddr, { S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = &cpu->env; - uint64_t asc = env->psw.mask & PSW_MASK_ASC; + uint64_t asc = cpu_mmu_idx_to_asc(mmu_idx); target_ulong vaddr, raddr; int prot; |