[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 20/33] target/s390x: Use unwind data for helper_t
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 20/33] target/s390x: Use unwind data for helper_tr |
Date: |
Wed, 24 May 2017 12:22:33 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 25 +++++++++++++++----------
target/s390x/translate.c | 1 -
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 0701e10..b37a963 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -723,19 +723,24 @@ void HELPER(unpk)(CPUS390XState *env, uint32_t len,
uint64_t dest,
}
}
-void HELPER(tr)(CPUS390XState *env, uint32_t len, uint64_t array,
- uint64_t trans)
+static void do_helper_tr(CPUS390XState *env, uint32_t len, uint64_t array,
+ uint64_t trans, uintptr_t ra)
{
- int i;
+ uint32_t i;
for (i = 0; i <= len; i++) {
- uint8_t byte = cpu_ldub_data(env, array + i);
- uint8_t new_byte = cpu_ldub_data(env, trans + byte);
-
- cpu_stb_data(env, array + i, new_byte);
+ uint8_t byte = cpu_ldub_data_ra(env, array + i, ra);
+ uint8_t new_byte = cpu_ldub_data_ra(env, trans + byte, ra);
+ cpu_stb_data_ra(env, array + i, new_byte, ra);
}
}
+void HELPER(tr)(CPUS390XState *env, uint32_t len, uint64_t array,
+ uint64_t trans)
+{
+ return do_helper_tr(env, len, array, trans, GETPC());
+}
+
uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array,
uint64_t len, uint64_t trans)
{
@@ -1265,9 +1270,9 @@ uint32_t HELPER(ex)(CPUS390XState *env, uint32_t cc,
uint64_t v1,
get_address(env, 0, b2, d2), 0);
break;
case 0xc00:
- helper_tr(env, l, get_address(env, 0, b1, d1),
- get_address(env, 0, b2, d2));
- break;
+ do_helper_tr(env, l, get_address(env, 0, b1, d1),
+ get_address(env, 0, b2, d2), 0);
+ return cc;
case 0xd00:
cc = helper_trt(env, l, get_address(env, 0, b1, d1),
get_address(env, 0, b2, d2));
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 4978f19..1842cc3 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -4065,7 +4065,6 @@ static ExitStatus op_tprot(DisasContext *s, DisasOps *o)
static ExitStatus op_tr(DisasContext *s, DisasOps *o)
{
TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1));
- potential_page_fault(s);
gen_helper_tr(cpu_env, l, o->addr1, o->in2);
tcg_temp_free_i32(l);
set_cc_static(s);
--
2.9.4
- [Qemu-devel] [PATCH v2 10/33] target/s390x: Use unwind data for helper_clst, (continued)
- [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, 2017/05/24
- [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 <=
- [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
- [Qemu-devel] [PATCH v2 26/33] target/s390x: Use unwind data for helper_testblock, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 27/33] target/s390x: Use unwind data for helper_tprot, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 25/33] target/s390x: Use unwind data for helper_stctl, Richard Henderson, 2017/05/24
- [Qemu-devel] [PATCH v2 28/33] target/s390x: Use unwind data for helper_lra, Richard Henderson, 2017/05/24