[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/69] target/s390x: Use unwind data for helper_clcle
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 18/69] target/s390x: Use unwind data for helper_clcle |
Date: |
Sun, 4 Jun 2017 10:34:18 -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 | 6 +++---
target/s390x/translate.c | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 8a095ad..f5a3044 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -595,12 +595,12 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2,
uint32_t r3)
{
+ uintptr_t ra = GETPC();
uint64_t destlen = env->regs[r1 + 1];
uint64_t dest = get_address_31fix(env, r1);
uint64_t srclen = env->regs[r3 + 1];
uint64_t src = get_address_31fix(env, r3);
uint8_t pad = a2 & 0xff;
- uint8_t v1 = 0, v2 = 0;
uint32_t cc = 0;
if (!(destlen || srclen)) {
@@ -612,8 +612,8 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1,
uint64_t a2,
}
for (; destlen || srclen; src++, dest++, destlen--, srclen--) {
- v1 = srclen ? cpu_ldub_data(env, src) : pad;
- v2 = destlen ? cpu_ldub_data(env, dest) : pad;
+ uint8_t v1 = srclen ? cpu_ldub_data_ra(env, src, ra) : pad;
+ uint8_t v2 = destlen ? cpu_ldub_data_ra(env, dest, ra) : pad;
if (v1 != v2) {
cc = (v1 < v2) ? 1 : 2;
break;
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index b42acae..9270067 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -1915,7 +1915,6 @@ static ExitStatus op_clcle(DisasContext *s, DisasOps *o)
{
TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));
- potential_page_fault(s);
gen_helper_clcle(cc_op, cpu_env, r1, o->in2, r3);
tcg_temp_free_i32(r1);
tcg_temp_free_i32(r3);
--
2.9.4
- [Qemu-devel] [PULL 07/69] target/s390x: Use unwind data for helper_mvc, (continued)
- [Qemu-devel] [PULL 07/69] target/s390x: Use unwind data for helper_mvc, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 10/69] target/s390x: Use unwind data for helper_srst, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 08/69] target/s390x: Use unwind data for helper_clc, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 11/69] target/s390x: Use unwind data for helper_clst, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 12/69] target/s390x: Use unwind data for helper_mvpg, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 09/69] target/s390x: Use unwind data for helper_clm, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 13/69] target/s390x: Use unwind data for helper_mvst, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 15/69] target/s390x: Use unwind data for helper_stam, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 16/69] target/s390x: Use unwind data for helper_mvcl, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 14/69] target/s390x: Use unwind data for helper_lam, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 18/69] target/s390x: Use unwind data for helper_clcle,
Richard Henderson <=
- [Qemu-devel] [PULL 20/69] target/s390x: Use unwind data for helper_unpk, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 17/69] target/s390x: Use unwind data for helper_mvcle, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 19/69] target/s390x: Use unwind data for helper_cksm, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 21/69] target/s390x: Use unwind data for helper_tr, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 23/69] target/s390x: Use unwind data for helper_trt, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 25/69] target/s390x: Use unwind data for helper_lctl, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 22/69] target/s390x: Use unwind data for helper_tre, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 24/69] target/s390x: Use unwind data for helper_lctlg, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 26/69] target/s390x: Use unwind data for helper_stctl, Richard Henderson, 2017/06/04
- [Qemu-devel] [PULL 28/69] target/s390x: Use unwind data for helper_tprot, Richard Henderson, 2017/06/04