ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/s390x: Use unwind data for helper_clcle 

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:30:39 -07:00
parent 453e4c077d
commit 4546137957
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/s390x/mem_helper.c
View File

@ -595,12 +595,12 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2,
uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2,
uint32_t r3) uint32_t r3)
{ {
uintptr_t ra = GETPC();
uint64_t destlen = env->regs[r1 + 1]; uint64_t destlen = env->regs[r1 + 1];
uint64_t dest = get_address_31fix(env, r1); uint64_t dest = get_address_31fix(env, r1);
uint64_t srclen = env->regs[r3 + 1]; uint64_t srclen = env->regs[r3 + 1];
uint64_t src = get_address_31fix(env, r3); uint64_t src = get_address_31fix(env, r3);
uint8_t pad = a2 & 0xff; uint8_t pad = a2 & 0xff;
uint8_t v1 = 0, v2 = 0;
uint32_t cc = 0; uint32_t cc = 0;
if (!(destlen || srclen)) { if (!(destlen || srclen)) {
@ -612,8 +612,8 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2,
} }
for (; destlen || srclen; src++, dest++, destlen--, srclen--) { for (; destlen || srclen; src++, dest++, destlen--, srclen--) {
v1 = srclen ? cpu_ldub_data(env, src) : pad; uint8_t v1 = srclen ? cpu_ldub_data_ra(env, src, ra) : pad;
v2 = destlen ? cpu_ldub_data(env, dest) : pad; uint8_t v2 = destlen ? cpu_ldub_data_ra(env, dest, ra) : pad;
if (v1 != v2) { if (v1 != v2) {
cc = (v1 < v2) ? 1 : 2; cc = (v1 < v2) ? 1 : 2;
break; break;

1
target/s390x/translate.c
View File

@ -1920,7 +1920,6 @@ static ExitStatus op_clcle(DisasContext *s, DisasOps *o)
{ {
TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1));
TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3));
potential_page_fault(s);
gen_helper_clcle(cc_op, cpu_env, r1, o->in2, r3); gen_helper_clcle(cc_op, cpu_env, r1, o->in2, r3);
tcg_temp_free_i32(r1); tcg_temp_free_i32(r1);
tcg_temp_free_i32(r3); tcg_temp_free_i32(r3);