[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 10/70] target/s390x: Use unwind data for helper_sr
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL v2 10/70] target/s390x: Use unwind data for helper_srst |
Date: |
Tue, 6 Jun 2017 17:30:19 -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 | 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 3e75cae..33d83e5 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -327,6 +327,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;
@@ -344,7 +345,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 d4c5fa3..9fc5b31 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] [PULL v2 00/70] target/s390x tcg patches, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 01/70] target/s390x: Add support for the TEST BLOCK instruction, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 02/70] target/s390x: Use cpu_loop_exit_restore for tlb_fill, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 03/70] target/s390x: Move helper_ex to end of file, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 04/70] target/s390x: Use unwind data for helper_nc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 05/70] target/s390x: Use unwind data for helper_oc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 06/70] target/s390x: Use unwind data for helper_xc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 08/70] target/s390x: Use unwind data for helper_clc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 07/70] target/s390x: Use unwind data for helper_mvc, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 09/70] target/s390x: Use unwind data for helper_clm, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 10/70] target/s390x: Use unwind data for helper_srst,
Richard Henderson <=
- [Qemu-devel] [PULL v2 11/70] target/s390x: Use unwind data for helper_clst, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 12/70] target/s390x: Use unwind data for helper_mvpg, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 13/70] target/s390x: Use unwind data for helper_mvst, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 14/70] target/s390x: Use unwind data for helper_lam, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 15/70] target/s390x: Use unwind data for helper_stam, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 16/70] target/s390x: Use unwind data for helper_mvcl, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 17/70] target/s390x: Use unwind data for helper_mvcle, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 19/70] target/s390x: Use unwind data for helper_cksm, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 18/70] target/s390x: Use unwind data for helper_clcle, Richard Henderson, 2017/06/06
- [Qemu-devel] [PULL v2 20/70] target/s390x: Use unwind data for helper_unpk, Richard Henderson, 2017/06/06