[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/33] target/s390x: Use unwind data for helper_m
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 15/33] target/s390x: Use unwind data for helper_mvcl |
Date: |
Wed, 24 May 2017 12:22:28 -0700 |
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Aurelien Jarno <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 7 ++++---
target/s390x/translate.c | 1 -
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 2acc984..49cfc9b 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -501,6 +501,7 @@ void HELPER(stam)(CPUS390XState *env, uint32_t r1, uint64_t
a2, uint32_t r3)
/* move long */
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 dest = get_address_31fix(env, r1);
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--) {
- v = cpu_ldub_data(env, src);
- cpu_stb_data(env, dest, v);
+ v = cpu_ldub_data_ra(env, src, ra);
+ cpu_stb_data_ra(env, dest, v, ra);
}
for (; destlen; dest++, destlen--) {
- cpu_stb_data(env, dest, pad);
+ cpu_stb_data_ra(env, dest, pad, ra);
}
env->regs[r1 + 1] = destlen;
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 7af2a0b..fb2d6ff 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -2871,7 +2871,6 @@ static ExitStatus op_mvcl(DisasContext *s, DisasOps *o)
{
TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
TCGv_i32 r2 = tcg_const_i32(get_field(s->fields, r2));
- potential_page_fault(s);
gen_helper_mvcl(cc_op, cpu_env, r1, r2);
tcg_temp_free_i32(r1);
tcg_temp_free_i32(r2);
--
2.9.4
- Re: [Qemu-devel] [PATCH v2 06/33] target/s390x: Use unwind data for helper_mvc, (continued)
- [Qemu-devel] [PATCH v2 07/33] target/s390x: Use unwind data for helper_clc, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 08/33] target/s390x: Use unwind data for helper_clm, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 09/33] target/s390x: Use unwind data for helper_srst, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 10/33] target/s390x: Use unwind data for helper_clst, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 11/33] target/s390x: Use unwind data for helper_mvpg, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 12/33] target/s390x: Use unwind data for helper_mvst, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 13/33] target/s390x: Use unwind data for helper_lam, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 14/33] target/s390x: Use unwind data for helper_stam, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 15/33] target/s390x: Use unwind data for helper_mvcl,
Richard Henderson <=
- [Qemu-devel] [PATCH v2 16/33] target/s390x: Use unwind data for helper_mvcle, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 19/33] target/s390x: Use unwind data for helper_unpk, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 17/33] target/s390x: Use unwind data for helper_clcle, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 18/33] target/s390x: Use unwind data for helper_cksm, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 20/33] target/s390x: Use unwind data for helper_tr, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 21/33] target/s390x: Use unwind data for helper_tre, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 22/33] target/s390x: Use unwind data for helper_trt, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 23/33] target/s390x: Use unwind data for helper_lctlg, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 24/33] target/s390x: Use unwind data for helper_lctl, Richard Henderson, 2017/05/24