mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/s390x: Use unwind data for helper_mvst

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 11:17:50 -07:00
parent 7cf96fca4c
commit 08a4cb793f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/s390x/mem_helper.c
View File

@ -409,6 +409,7 @@ uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2)
/* string copy (c is string terminator) */ /* string copy (c is string terminator) */
uint64_t HELPER(mvst)(CPUS390XState *env, uint64_t c, uint64_t d, uint64_t s) uint64_t HELPER(mvst)(CPUS390XState *env, uint64_t c, uint64_t d, uint64_t s)
{ {
uintptr_t ra = GETPC();
uint32_t len; uint32_t len;
c = c & 0xff; c = c & 0xff;
@ -418,8 +419,8 @@ uint64_t HELPER(mvst)(CPUS390XState *env, uint64_t c, uint64_t d, uint64_t s)
/* Lest we fail to service interrupts in a timely manner, limit the /* Lest we fail to service interrupts in a timely manner, limit the
amount of work we're willing to do. For now, let's cap at 8k. */ amount of work we're willing to do. For now, let's cap at 8k. */
for (len = 0; len < 0x2000; ++len) { for (len = 0; len < 0x2000; ++len) {
uint8_t v = cpu_ldub_data(env, s + len); uint8_t v = cpu_ldub_data_ra(env, s + len, ra);
cpu_stb_data(env, d + len, v); cpu_stb_data_ra(env, d + len, v, ra);
if (v == c) { if (v == c) {
/* Complete. Set CC=1 and advance R1. */ /* Complete. Set CC=1 and advance R1. */
env->cc_op = 1; env->cc_op = 1;

1
target/s390x/translate.c
View File

@ -2928,7 +2928,6 @@ static ExitStatus op_mvpg(DisasContext *s, DisasOps *o)
static ExitStatus op_mvst(DisasContext *s, DisasOps *o) static ExitStatus op_mvst(DisasContext *s, DisasOps *o)
{ {
potential_page_fault(s);
gen_helper_mvst(o->in1, cpu_env, regs[0], o->in1, o->in2); gen_helper_mvst(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);