| Message ID | 20170523030312.6360-12-rth@twiddle.net |
|---|---|
| State | New |
| Headers | show |
On 23.05.2017 05:02, Richard Henderson wrote: > Signed-off-by: Richard Henderson <rth@twiddle.net> > --- > target/s390x/helper.h | 2 +- > target/s390x/mem_helper.c | 9 +++++---- > target/s390x/translate.c | 3 +-- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/target/s390x/helper.h b/target/s390x/helper.h > index d6cc513..2b4e7be 100644 > --- a/target/s390x/helper.h > +++ b/target/s390x/helper.h > @@ -12,7 +12,7 @@ DEF_HELPER_FLAGS_3(divs64, TCG_CALL_NO_WG, s64, env, s64, s64) > DEF_HELPER_FLAGS_4(divu64, TCG_CALL_NO_WG, i64, env, i64, i64, i64) > DEF_HELPER_4(srst, i64, env, i64, i64, i64) > DEF_HELPER_4(clst, i64, env, i64, i64, i64) > -DEF_HELPER_4(mvpg, void, env, i64, i64, i64) > +DEF_HELPER_FLAGS_4(mvpg, TCG_CALL_NO_WG, i32, env, i64, i64, i64) > DEF_HELPER_4(mvst, i64, env, i64, i64, i64) > DEF_HELPER_FLAGS_4(ex, TCG_CALL_NO_WG, void, env, i32, i64, i64) > DEF_HELPER_FLAGS_4(stam, TCG_CALL_NO_WG, void, env, i32, i64, i32) > diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c > index 7c9e7c7..9ef9f4a 100644 > --- a/target/s390x/mem_helper.c > +++ b/target/s390x/mem_helper.c > @@ -373,11 +373,12 @@ uint64_t HELPER(clst)(CPUS390XState *env, uint64_t c, uint64_t s1, uint64_t s2) > } > > /* move page */ > -void HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2) > +uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2) > { > - /* XXX missing r0 handling */ > - env->cc_op = 0; > - fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, 0); > + /* ??? missing r0 handling, which includes access keys, but more > + importantly optional suppression of the exception! */ > + fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, GETPC()); > + return 0; /* data moved */ > } > > /* string copy (c is string terminator) */ > diff --git a/target/s390x/translate.c b/target/s390x/translate.c > index 735aa82..a1edc79 100644 > --- a/target/s390x/translate.c > +++ b/target/s390x/translate.c > @@ -2921,8 +2921,7 @@ static ExitStatus op_mvcs(DisasContext *s, DisasOps *o) > > static ExitStatus op_mvpg(DisasContext *s, DisasOps *o) > { > - potential_page_fault(s); > - gen_helper_mvpg(cpu_env, regs[0], o->in1, o->in2); > + gen_helper_mvpg(cc_op, cpu_env, regs[0], o->in1, o->in2); > set_cc_static(s); > return NO_EXIT; > } Reviewed-by: Thomas Huth <thuth@redhat.com> (but I'd maybe move this patch right after the helper_mvc patch in your series, since it uses fast_memmove, too, so it's easier to review this patch here in the right context)
On 2017-05-22 20:02, Richard Henderson wrote: > Signed-off-by: Richard Henderson <rth@twiddle.net> > --- > target/s390x/helper.h | 2 +- > target/s390x/mem_helper.c | 9 +++++---- > target/s390x/translate.c | 3 +-- > 3 files changed, 7 insertions(+), 7 deletions(-) Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
diff --git a/target/s390x/helper.h b/target/s390x/helper.h index d6cc513..2b4e7be 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -12,7 +12,7 @@ DEF_HELPER_FLAGS_3(divs64, TCG_CALL_NO_WG, s64, env, s64, s64) DEF_HELPER_FLAGS_4(divu64, TCG_CALL_NO_WG, i64, env, i64, i64, i64) DEF_HELPER_4(srst, i64, env, i64, i64, i64) DEF_HELPER_4(clst, i64, env, i64, i64, i64) -DEF_HELPER_4(mvpg, void, env, i64, i64, i64) +DEF_HELPER_FLAGS_4(mvpg, TCG_CALL_NO_WG, i32, env, i64, i64, i64) DEF_HELPER_4(mvst, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_4(ex, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(stam, TCG_CALL_NO_WG, void, env, i32, i64, i32) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 7c9e7c7..9ef9f4a 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -373,11 +373,12 @@ uint64_t HELPER(clst)(CPUS390XState *env, uint64_t c, uint64_t s1, uint64_t s2) } /* move page */ -void HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2) +uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2) { - /* XXX missing r0 handling */ - env->cc_op = 0; - fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, 0); + /* ??? missing r0 handling, which includes access keys, but more + importantly optional suppression of the exception! */ + fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, GETPC()); + return 0; /* data moved */ } /* string copy (c is string terminator) */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 735aa82..a1edc79 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2921,8 +2921,7 @@ static ExitStatus op_mvcs(DisasContext *s, DisasOps *o) static ExitStatus op_mvpg(DisasContext *s, DisasOps *o) { - potential_page_fault(s); - gen_helper_mvpg(cpu_env, regs[0], o->in1, o->in2); + gen_helper_mvpg(cc_op, cpu_env, regs[0], o->in1, o->in2); set_cc_static(s); return NO_EXIT; }
Signed-off-by: Richard Henderson <rth@twiddle.net> --- target/s390x/helper.h | 2 +- target/s390x/mem_helper.c | 9 +++++---- target/s390x/translate.c | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-)