diff options
| author | Richard Henderson <rth@twiddle.net> | 2017-05-22 13:59:02 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2017-06-06 14:34:31 -0700 |
| commit | b157fbe6a95384e910caccc63a79c3f73c64d8ac (patch) | |
| tree | 55e179c6b6c1ecb23bf0267bdf81cd8dee832ef9 | |
| parent | 1f3ca416656bf1ed0c33b35f2dbbdd50f9b0e17e (diff) | |
target/s390x: Use unwind data for helper_lra
Fix saving exception_index around mmu_translate; eliminate a dead store.
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | target/s390x/mem_helper.c | 6 | ||||
| -rw-r--r-- | target/s390x/translate.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index a8c85c926c..17d8257f71 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1208,17 +1208,17 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr) { CPUState *cs = CPU(s390_env_get_cpu(env)); uint32_t cc = 0; - int old_exc = cs->exception_index; uint64_t asc = env->psw.mask & PSW_MASK_ASC; uint64_t ret; - int flags; + int old_exc, flags; /* XXX incomplete - has more corner cases */ if (!(env->psw.mask & PSW_MASK_64) && (addr >> 32)) { + cpu_restore_state(cs, GETPC()); program_interrupt(env, PGM_SPECIAL_OP, 2); } - cs->exception_index = old_exc; + old_exc = cs->exception_index; if (mmu_translate(env, addr, 0, asc, &ret, &flags, true)) { cc = 3; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index cafcecba45..80b08b9ebd 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2565,7 +2565,6 @@ static ExitStatus op_lctlg(DisasContext *s, DisasOps *o) static ExitStatus op_lra(DisasContext *s, DisasOps *o) { check_privileged(s); - potential_page_fault(s); gen_helper_lra(o->out, cpu_env, o->in2); set_cc_static(s); return NO_EXIT; |