[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/31] target/s390x: Use unwind data for helper_srst
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 09/31] target/s390x: Use unwind data for helper_srst |
Date: |
Mon, 22 May 2017 20:02:50 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/mem_helper.c | 3 ++-
target/s390x/translate.c | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 5f38ac3..3c28f3a 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -302,6 +302,7 @@ static inline uint64_t get_address_31fix(CPUS390XState
*env, int reg)
uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end,
uint64_t str)
{
+ uintptr_t ra = GETPC();
uint32_t len;
uint8_t v, c = r0;
@@ -319,7 +320,7 @@ uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0,
uint64_t end,
env->cc_op = 2;
return end;
}
- v = cpu_ldub_data(env, str + len);
+ v = cpu_ldub_data_ra(env, str + len, ra);
if (v == c) {
/* Character found. Set R1 to the location; R2 is unmodified. */
env->cc_op = 1;
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 84f09b1..ba7d0f9 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -3977,7 +3977,6 @@ static ExitStatus op_stmh(DisasContext *s, DisasOps *o)
static ExitStatus op_srst(DisasContext *s, DisasOps *o)
{
- potential_page_fault(s);
gen_helper_srst(o->in1, cpu_env, regs[0], o->in1, o->in2);
set_cc_static(s);
return_low128(o->in2);
--
2.9.4
- [Qemu-devel] [PATCH 04/31] target/s390x: Use unwind data for helper_xc, (continued)
- [Qemu-devel] [PATCH 04/31] target/s390x: Use unwind data for helper_xc, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 05/31] target/s390x: Use unwind data for helper_oc, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 06/31] target/s390x: Use unwind data for helper_mvc, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 09/31] target/s390x: Use unwind data for helper_srst,
Richard Henderson <=
- [Qemu-devel] [PATCH 08/31] target/s390x: Use unwind data for helper_clm, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 10/31] target/s390x: Use unwind data for helper_clst, Richard Henderson, 2017/05/22
- [Qemu-devel] [PATCH 07/31] target/s390x: Use unwind data for helper_clc, Richard Henderson, 2017/05/22