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_trt 

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-22 11:59:43 -07:00
parent d46cd62ff8
commit 2c7e5f8c25
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
target/s390x/mem_helper.c
View File

@ -781,25 +781,29 @@ uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array,
return array + i; return array + i;
} }
uint32_t HELPER(trt)(CPUS390XState *env, uint32_t len, uint64_t array, static uint32_t do_helper_trt(CPUS390XState *env, uint32_t len, uint64_t array,
uint64_t trans) uint64_t trans, uintptr_t ra)
{ {
uint32_t cc = 0; uint32_t i;
int i;
for (i = 0; i <= len; i++) { for (i = 0; i <= len; i++) {
uint8_t byte = cpu_ldub_data(env, array + i); uint8_t byte = cpu_ldub_data_ra(env, array + i, ra);
uint8_t sbyte = cpu_ldub_data(env, trans + byte); uint8_t sbyte = cpu_ldub_data_ra(env, trans + byte, ra);
if (sbyte != 0) { if (sbyte != 0) {
env->regs[1] = array + i; env->regs[1] = array + i;
env->regs[2] = (env->regs[2] & ~0xff) | sbyte; env->regs[2] = deposit64(env->regs[2], 0, 8, sbyte);
cc = (i == len) ? 2 : 1; return (i == len) ? 2 : 1;
break;
} }
} }
return cc; return 0;
}
uint32_t HELPER(trt)(CPUS390XState *env, uint32_t len, uint64_t array,
uint64_t trans)
{
return do_helper_trt(env, len, array, trans, GETPC());
} }
void HELPER(cdsg)(CPUS390XState *env, uint64_t addr, void HELPER(cdsg)(CPUS390XState *env, uint64_t addr,
@ -1275,8 +1279,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);
return cc; return cc;
case 0xd00: case 0xd00:
cc = helper_trt(env, l, get_address(env, 0, b1, d1), cc = do_helper_trt(env, l, get_address(env, 0, b1, d1),
get_address(env, 0, b2, d2)); get_address(env, 0, b2, d2), 0);
break; break;
default: default:
goto abort; goto abort;

1
target/s390x/translate.c
View File

@ -4087,7 +4087,6 @@ static ExitStatus op_tre(DisasContext *s, DisasOps *o)
static ExitStatus op_trt(DisasContext *s, DisasOps *o) static ExitStatus op_trt(DisasContext *s, DisasOps *o)
{ {
TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1)); TCGv_i32 l = tcg_const_i32(get_field(s->fields, l1));
potential_page_fault(s);
gen_helper_trt(cc_op, cpu_env, l, o->addr1, o->in2); gen_helper_trt(cc_op, cpu_env, l, o->addr1, o->in2);
tcg_temp_free_i32(l); tcg_temp_free_i32(l);
set_cc_static(s); set_cc_static(s);