Message ID | 20171129202701.16117-17-david@redhat.com |
---|---|
State | New |
Headers | show |
Series | s390x/tcg: cleanup and fix program interrupts | expand |
On 29.11.2017 21:27, David Hildenbrand wrote: > Only one user left, get rid of it so we don't get any new users. > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/translate.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/target/s390x/translate.c b/target/s390x/translate.c > index 1ce1390699..26cf993405 100644 > --- a/target/s390x/translate.c > +++ b/target/s390x/translate.c > @@ -240,12 +240,6 @@ static void update_cc_op(DisasContext *s) > } > } > > -static void potential_page_fault(DisasContext *s) > -{ > - update_psw_addr(s); > - update_cc_op(s); > -} > - > static inline uint64_t ld_code2(CPUS390XState *env, uint64_t pc) > { > return (uint64_t)cpu_lduw_code(env, pc); > @@ -2939,7 +2933,8 @@ static ExitStatus op_lpd(DisasContext *s, DisasOps *o) > > /* In a parallel context, stop the world and single step. */ > if (tb_cflags(s->tb) & CF_PARALLEL) { > - potential_page_fault(s); > + update_psw_addr(s); > + update_cc_op(s); > gen_exception(EXCP_ATOMIC); > return EXIT_NORETURN; > } > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 1ce1390699..26cf993405 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -240,12 +240,6 @@ static void update_cc_op(DisasContext *s) } } -static void potential_page_fault(DisasContext *s) -{ - update_psw_addr(s); - update_cc_op(s); -} - static inline uint64_t ld_code2(CPUS390XState *env, uint64_t pc) { return (uint64_t)cpu_lduw_code(env, pc); @@ -2939,7 +2933,8 @@ static ExitStatus op_lpd(DisasContext *s, DisasOps *o) /* In a parallel context, stop the world and single step. */ if (tb_cflags(s->tb) & CF_PARALLEL) { - potential_page_fault(s); + update_psw_addr(s); + update_cc_op(s); gen_exception(EXCP_ATOMIC); return EXIT_NORETURN; }