On 25.07.2017 04:36, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <r...@twiddle.net>
> ---
> target/s390x/misc_helper.c | 3 ++-
> target/s390x/translate.c | 1 -
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
> index 376dbd68c2..ab8551f605 100644
> --- a/target/s390x/misc_helper.c
> +++ b/target/s390x/misc_helper.c
> @@ -388,7 +388,8 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
> if ((r0 & STSI_LEVEL_MASK) <= STSI_LEVEL_3 &&
> ((r0 & STSI_R0_RESERVED_MASK) || (r1 & STSI_R1_RESERVED_MASK))) {
> /* valid function code, invalid reserved bits */
> - program_interrupt(env, PGM_SPECIFICATION, 2);
> + cpu_restore_state(ENV_GET_CPU(env), GETPC());
(I'd vote for a local variable ra)
> + program_interrupt(env, PGM_SPECIFICATION, ILEN_UNWIND);
> }
>
> sel1 = r0 & STSI_R0_SEL1_MASK;
> diff --git a/target/s390x/translate.c b/target/s390x/translate.c
> index 9b0c35efa2..57f09154be 100644
> --- a/target/s390x/translate.c
> +++ b/target/s390x/translate.c
> @@ -3988,7 +3988,6 @@ static ExitStatus op_stpt(DisasContext *s, DisasOps *o)
> static ExitStatus op_stsi(DisasContext *s, DisasOps *o)
> {
> check_privileged(s);
> - potential_page_fault(s);
> gen_helper_stsi(cc_op, cpu_env, o->in2, regs[0], regs[1]);
> set_cc_static(s);
> return NO_EXIT;
>
Reviewed-by: David Hildenbrand <da...@redhat.com>
--
Thanks,
David
