summaryrefslogtreecommitdiffstats
path: root/target/s390x/mem_helper.c
diff options
context:
space:
mode:
authorRichard Henderson2017-05-19 19:13:22 +0200
committerRichard Henderson2017-06-06 23:34:31 +0200
commit4663e82244c550c8eeaa605f8fb6556cdc2fcc8f (patch)
treef816e6a73c3623412a391d8f85d9cbdb73b4531c /target/s390x/mem_helper.c
parenttarget/s390x: Use unwind data for helper_clm (diff)
downloadqemu-4663e82244c550c8eeaa605f8fb6556cdc2fcc8f.tar.gz
qemu-4663e82244c550c8eeaa605f8fb6556cdc2fcc8f.tar.xz
qemu-4663e82244c550c8eeaa605f8fb6556cdc2fcc8f.zip
target/s390x: Use unwind data for helper_srst
Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'target/s390x/mem_helper.c')
-rw-r--r--target/s390x/mem_helper.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 3e75cae5af..33d83e52a5 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;