david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target/s390x: Use unwind data for helper_mvcle

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:28:30 -07:00
parent 7390fb79fd
commit 453e4c077d
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

@ -544,6 +544,7 @@ uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2)
uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2,
uint32_t r3) uint32_t r3)
{ {
uintptr_t ra = GETPC();
uint64_t destlen = env->regs[r1 + 1]; uint64_t destlen = env->regs[r1 + 1];
uint64_t dest = env->regs[r1]; uint64_t dest = env->regs[r1];
uint64_t srclen = env->regs[r3 + 1]; uint64_t srclen = env->regs[r3 + 1];
@ -572,12 +573,12 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2,
} }
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

@ -2887,7 +2887,6 @@ static ExitStatus op_mvcle(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 r3 = tcg_const_i32(get_field(s->fields, r3)); TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));
potential_page_fault(s);
gen_helper_mvcle(cc_op, cpu_env, r1, o->in2, r3); gen_helper_mvcle(cc_op, cpu_env, r1, o->in2, r3);
tcg_temp_free_i32(r1); tcg_temp_free_i32(r1);
tcg_temp_free_i32(r3); tcg_temp_free_i32(r3);