mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/s390x: Use unwind data for helper_mvcl

Browse Source 
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2017-05-19 11:26:27 -07:00
parent 44cf6c2e4b
commit 7390fb79fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/s390x/mem_helper.c
View File

@ -501,6 +501,7 @@ void HELPER(stam)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3)
/* move long */ /* move long */
uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2) uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2)
{ {
uintptr_t ra = GETPC();
uint64_t destlen = env->regs[r1 + 1] & 0xffffff; uint64_t destlen = env->regs[r1 + 1] & 0xffffff;
uint64_t dest = get_address_31fix(env, r1); uint64_t dest = get_address_31fix(env, r1);
uint64_t srclen = env->regs[r2 + 1] & 0xffffff; uint64_t srclen = env->regs[r2 + 1] & 0xffffff;
@ -522,12 +523,12 @@ uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2)
} }
for (; destlen && srclen; src++, dest++, destlen--, srclen--) { for (; destlen && srclen; src++, dest++, destlen--, srclen--) {
v = cpu_ldub_data(env, src); v = cpu_ldub_data_ra(env, src, ra);
cpu_stb_data(env, dest, v); cpu_stb_data_ra(env, dest, v, ra);
} }
for (; destlen; dest++, destlen--) { for (; destlen; dest++, destlen--) {
cpu_stb_data(env, dest, pad); cpu_stb_data_ra(env, dest, pad, ra);
} }
env->regs[r1 + 1] = destlen; env->regs[r1 + 1] = destlen;

1
target/s390x/translate.c
View File

@ -2876,7 +2876,6 @@ static ExitStatus op_mvcl(DisasContext *s, DisasOps *o)
{ {
TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
TCGv_i32 r2 = tcg_const_i32(get_field(s->fields, r2)); TCGv_i32 r2 = tcg_const_i32(get_field(s->fields, r2));
potential_page_fault(s);
gen_helper_mvcl(cc_op, cpu_env, r1, r2); gen_helper_mvcl(cc_op, cpu_env, r1, r2);
tcg_temp_free_i32(r1); tcg_temp_free_i32(r1);
tcg_temp_free_i32(r2); tcg_temp_free_i32(r2);