[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 21/33] target/s390x: Use unwind data for helper_t
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 21/33] target/s390x: Use unwind data for helper_tre |
Date: |
Wed, 24 May 2017 12:22:34 -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 | 15 ++++++++-------
target/s390x/translate.c | 1 -
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index b37a963..fd6dbf7 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -744,9 +744,11 @@ void HELPER(tr)(CPUS390XState *env, uint32_t len, uint64_t
array,
uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array,
uint64_t len, uint64_t trans)
{
+ uintptr_t ra = GETPC();
uint8_t end = env->regs[0] & 0xff;
uint64_t l = len;
uint64_t i;
+ uint32_t cc = 0;
if (!(env->psw.mask & PSW_MASK_64)) {
array &= 0x7fffffff;
@@ -757,25 +759,24 @@ uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array,
amount of work we're willing to do. For now, let's cap at 8k. */
if (l > 0x2000) {
l = 0x2000;
- env->cc_op = 3;
- } else {
- env->cc_op = 0;
+ cc = 3;
}
for (i = 0; i < l; i++) {
uint8_t byte, new_byte;
- byte = cpu_ldub_data(env, array + i);
+ byte = cpu_ldub_data_ra(env, array + i, ra);
if (byte == end) {
- env->cc_op = 1;
+ cc = 1;
break;
}
- new_byte = cpu_ldub_data(env, trans + byte);
- cpu_stb_data(env, array + i, new_byte);
+ new_byte = cpu_ldub_data_ra(env, trans + byte, ra);
+ cpu_stb_data_ra(env, array + i, new_byte, ra);
}
+ env->cc_op = cc;
env->retxl = len - i;
return array + i;
}
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 1842cc3..447ba07 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -4073,7 +4073,6 @@ static ExitStatus op_tr(DisasContext *s, DisasOps *o)
static ExitStatus op_tre(DisasContext *s, DisasOps *o)
{
- potential_page_fault(s);
gen_helper_tre(o->out, cpu_env, o->out, o->out2, o->in2);
return_low128(o->out2);
set_cc_static(s);
--
2.9.4
- [Qemu-devel] [PATCH v2 12/33] target/s390x: Use unwind data for helper_mvst, (continued)
- [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, 2017/05/24
- [Qemu-devel] [PATCH v2 21/33] target/s390x: Use unwind data for helper_tre,
Richard Henderson <=
- [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
- [Qemu-devel] [PATCH v2 31/33] target/s390x: Fix EXECUTE with R1==0, Richard Henderson, 2017/05/24