[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/31] target/s390x: Use unwind data for helper_mvcl
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 15/31] target/s390x: Use unwind data for helper_mvcl |
Date: |
Mon, 22 May 2017 20:02:56 -0700 |
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 d6d5047..b764c48 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -482,6 +482,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;
@@ -503,12 +504,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 da7b5a6..ad2e632 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -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 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 07/31] target/s390x: Use unwind data for helper_clc, (continued)
- [Qemu-devel] [PATCH 12/31] target/s390x: Use unwind data for helper_mvst, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 13/31] target/s390x: Use unwind data for helper_lam, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 11/31] target/s390x: Use unwind data for helper_mvpg, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 15/31] target/s390x: Use unwind data for helper_mvcl,
Richard Henderson <=
- [Qemu-devel] [PATCH 14/31] target/s390x: Use unwind data for helper_stam, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 16/31] target/s390x: Use unwind data for helper_mvcle, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 17/31] target/s390x: Use unwind data for helper_clcle, Richard Henderson, 2017/05/22