motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-25 11:01:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/s390x: Use unwind data for helper_srst

Browse source 
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2017-05-19 10:13:22 -07:00
parent 868b5cbd91
commit 4663e82244
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
target/s390x/mem_helper.c
View file

@ -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 HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end,
uint64_t str) uint64_t str)
{ {
uintptr_t ra = GETPC();
uint32_t len; uint32_t len;
uint8_t v, c = r0; 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; env->cc_op = 2;
return end; return end;
} }
v = cpu_ldub_data(env, str + len); v = cpu_ldub_data_ra(env, str + len, ra);
if (v == c) { if (v == c) {
/* Character found. Set R1 to the location; R2 is unmodified. */ /* Character found. Set R1 to the location; R2 is unmodified. */
env->cc_op = 1; env->cc_op = 1;

1
target/s390x/translate.c
View file

@ -3977,7 +3977,6 @@ static ExitStatus op_stmh(DisasContext *s, DisasOps *o)
static ExitStatus op_srst(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); gen_helper_srst(o->in1, cpu_env, regs[0], o->in1, o->in2);
set_cc_static(s); set_cc_static(s);
return_low128(o->in2); return_low128(o->in2);