From: Aurelien Jarno Date: Sun, 24 May 2015 23:47:22 +0000 (+0200) Subject: target-s390x: fix PSW value on dynamical exception from helpers X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9bebf9863bd16cc824231ad71959a338dc1819ac;p=qemu.git target-s390x: fix PSW value on dynamical exception from helpers runtime_exception computes the psw.addr value using the actual exception address and the instruction length computed by calling the get_ilen function. However as explained above the get_ilen code, it returns the actual instruction length, and not the ILC. Therefore there is no need to multiply the value by 2. Signed-off-by: Aurelien Jarno Signed-off-by: Alexander Graf --- diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 3ec7268b72..b375ab724b 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -61,7 +61,7 @@ void QEMU_NORETURN runtime_exception(CPUS390XState *env, int excp, /* Advance past the insn. */ t = cpu_ldub_code(env, env->psw.addr); env->int_pgm_ilen = t = get_ilen(t); - env->psw.addr += 2 * t; + env->psw.addr += t; cpu_loop_exit(cs); }