[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/31] target/s390x: Use unwind data for helper_cksm
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 18/31] target/s390x: Use unwind data for helper_cksm |
Date: |
Mon, 22 May 2017 20:02:59 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 11 ++++++-----
target/s390x/translate.c | 1 -
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 6e85406..da81b38 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -614,6 +614,7 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1,
uint64_t src, uint64_t src_len)
{
+ uintptr_t ra = GETPC();
uint64_t max_len, len;
uint64_t cksm = (uint32_t)r1;
@@ -623,21 +624,21 @@ uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1,
/* Process full words as available. */
for (len = 0; len + 4 <= max_len; len += 4, src += 4) {
- cksm += (uint32_t)cpu_ldl_data(env, src);
+ cksm += (uint32_t)cpu_ldl_data_ra(env, src, ra);
}
switch (max_len - len) {
case 1:
- cksm += cpu_ldub_data(env, src) << 24;
+ cksm += cpu_ldub_data_ra(env, src, ra) << 24;
len += 1;
break;
case 2:
- cksm += cpu_lduw_data(env, src) << 16;
+ cksm += cpu_lduw_data_ra(env, src, ra) << 16;
len += 2;
break;
case 3:
- cksm += cpu_lduw_data(env, src) << 16;
- cksm += cpu_ldub_data(env, src + 2) << 8;
+ cksm += cpu_lduw_data_ra(env, src, ra) << 16;
+ cksm += cpu_ldub_data_ra(env, src + 2, ra) << 8;
len += 3;
break;
}
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index ad85a75..21c21a6 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -1868,7 +1868,6 @@ static ExitStatus op_cksm(DisasContext *s, DisasOps *o)
int r2 = get_field(s->fields, r2);
TCGv_i64 len = tcg_temp_new_i64();
- potential_page_fault(s);
gen_helper_cksm(len, cpu_env, o->in1, o->in2, regs[r2 + 1]);
set_cc_static(s);
return_low128(o->out);
--
2.9.4
- Re: [Qemu-devel] [PATCH 15/31] target/s390x: Use unwind data for helper_mvcl, (continued)
- [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
- [Qemu-devel] [PATCH 18/31] target/s390x: Use unwind data for helper_cksm,
Richard Henderson <=
- [Qemu-devel] [PATCH 19/31] target/s390x: Use unwind data for helper_unpk, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 20/31] target/s390x: Use unwind data for helper_tr, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 22/31] target/s390x: Use unwind data for helper_trt, Richard Henderson, 2017/05/22