Message ID | 20171129202701.16117-15-david@redhat.com |
---|---|
State | New |
Headers | show |
Series | s390x/tcg: cleanup and fix program interrupts | expand |
On 29.11.2017 21:26, David Hildenbrand wrote: > STSI needs some more love, but let's do one step at a time. > We can now drop potential_page_fault(). > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/misc_helper.c | 2 +- > target/s390x/translate.c | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c > index a911bff706..6d766ce1e7 100644 > --- a/target/s390x/misc_helper.c > +++ b/target/s390x/misc_helper.c > @@ -184,7 +184,7 @@ 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, 4); > + s390_program_interrupt(env, PGM_SPECIFICATION, 4, GETPC()); > } > > sel1 = r0 & STSI_R0_SEL1_MASK; > diff --git a/target/s390x/translate.c b/target/s390x/translate.c > index f26fa64a78..1ce1390699 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: Thomas Huth <thuth@redhat.com>
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index a911bff706..6d766ce1e7 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -184,7 +184,7 @@ 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, 4); + s390_program_interrupt(env, PGM_SPECIFICATION, 4, GETPC()); } sel1 = r0 & STSI_R0_SEL1_MASK; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index f26fa64a78..1ce1390699 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;