system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-17 16:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/s390x: Use unwind data for helper_clc

Browse source 
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:06:23 -07:00
parent d3696812e3
commit e79f56f4d6
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
target/s390x/mem_helper.c
View file

@ -233,32 +233,37 @@ void HELPER(mvc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src)
} }
/* compare unsigned byte arrays */ /* compare unsigned byte arrays */
uint32_t HELPER(clc)(CPUS390XState *env, uint32_t l, uint64_t s1, uint64_t s2) static uint32_t do_helper_clc(CPUS390XState *env, uint32_t l, uint64_t s1,
uint64_t s2, uintptr_t ra)
{ {
int i; uint32_t i;
unsigned char x, y; uint32_t cc = 0;
uint32_t cc;
HELPER_LOG("%s l %d s1 %" PRIx64 " s2 %" PRIx64 "\n", HELPER_LOG("%s l %d s1 %" PRIx64 " s2 %" PRIx64 "\n",
__func__, l, s1, s2); __func__, l, s1, s2);
for (i = 0; i <= l; i++) { for (i = 0; i <= l; i++) {
x = cpu_ldub_data(env, s1 + i); uint8_t x = cpu_ldub_data_ra(env, s1 + i, ra);
y = cpu_ldub_data(env, s2 + i); uint8_t y = cpu_ldub_data_ra(env, s2 + i, ra);
HELPER_LOG("%02x (%c)/%02x (%c) ", x, x, y, y); HELPER_LOG("%02x (%c)/%02x (%c) ", x, x, y, y);
if (x < y) { if (x < y) {
cc = 1; cc = 1;
goto done; break;
} else if (x > y) { } else if (x > y) {
cc = 2; cc = 2;
goto done; break;
} }
} }
cc = 0;
done:
HELPER_LOG("\n"); HELPER_LOG("\n");
return cc; return cc;
} }
uint32_t HELPER(clc)(CPUS390XState *env, uint32_t l, uint64_t s1, uint64_t s2)
{
return do_helper_clc(env, l, s1, s2, GETPC());
}
/* compare logical under mask */ /* compare logical under mask */
uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, uint32_t mask, uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, uint32_t mask,
uint64_t addr) uint64_t addr)
@ -1237,8 +1242,8 @@ uint32_t HELPER(ex)(CPUS390XState *env, uint32_t cc, uint64_t v1,
get_address(env, 0, b2, d2), 0); get_address(env, 0, b2, d2), 0);
break; break;
case 0x500: case 0x500:
cc = helper_clc(env, l, get_address(env, 0, b1, d1), cc = do_helper_clc(env, l, get_address(env, 0, b1, d1),
get_address(env, 0, b2, d2)); get_address(env, 0, b2, d2), 0);
break; break;
case 0x600: case 0x600:
cc = do_helper_oc(env, l, get_address(env, 0, b1, d1), cc = do_helper_oc(env, l, get_address(env, 0, b1, d1),

1
target/s390x/translate.c
View file

@ -1906,7 +1906,6 @@ static ExitStatus op_clc(DisasContext *s, DisasOps *o)
tcg_gen_qemu_ld64(cc_dst, o->in2, get_mem_index(s)); tcg_gen_qemu_ld64(cc_dst, o->in2, get_mem_index(s));
break; break;
default: default:
potential_page_fault(s);
vl = tcg_const_i32(l); vl = tcg_const_i32(l);
gen_helper_clc(cc_op, cpu_env, vl, o->addr1, o->in2); gen_helper_clc(cc_op, cpu_env, vl, o->addr1, o->in2);
tcg_temp_free_i32(vl); tcg_temp_free_i32(vl);