target/s390x: Use Int128 for return from TRE
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
c91192245a
commit
ef45f5b998
@ -99,7 +99,7 @@ DEF_HELPER_FLAGS_4(unpka, TCG_CALL_NO_WG, i32, env, i64, i32, i64)
|
||||
DEF_HELPER_FLAGS_4(unpku, TCG_CALL_NO_WG, i32, env, i64, i32, i64)
|
||||
DEF_HELPER_FLAGS_3(tp, TCG_CALL_NO_WG, i32, env, i64, i32)
|
||||
DEF_HELPER_FLAGS_4(tr, TCG_CALL_NO_WG, void, env, i32, i64, i64)
|
||||
DEF_HELPER_4(tre, i64, env, i64, i64, i64)
|
||||
DEF_HELPER_4(tre, i128, env, i64, i64, i64)
|
||||
DEF_HELPER_4(trt, i32, env, i32, i64, i64)
|
||||
DEF_HELPER_4(trtr, i32, env, i32, i64, i64)
|
||||
DEF_HELPER_5(trXX, i32, env, i32, i32, i32, i32)
|
||||
|
@ -1632,8 +1632,8 @@ void HELPER(tr)(CPUS390XState *env, uint32_t len, uint64_t array,
|
||||
do_helper_tr(env, len, array, trans, GETPC());
|
||||
}
|
||||
|
||||
uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array,
|
||||
uint64_t len, uint64_t trans)
|
||||
Int128 HELPER(tre)(CPUS390XState *env, uint64_t array,
|
||||
uint64_t len, uint64_t trans)
|
||||
{
|
||||
uintptr_t ra = GETPC();
|
||||
uint8_t end = env->regs[0] & 0xff;
|
||||
@ -1668,8 +1668,7 @@ uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array,
|
||||
}
|
||||
|
||||
env->cc_op = cc;
|
||||
env->retxl = len - i;
|
||||
return array + i;
|
||||
return int128_make128(len - i, array + i);
|
||||
}
|
||||
|
||||
static inline uint32_t do_helper_trt(CPUS390XState *env, int len,
|
||||
|
@ -4905,8 +4905,11 @@ static DisasJumpType op_tr(DisasContext *s, DisasOps *o)
|
||||
|
||||
static DisasJumpType op_tre(DisasContext *s, DisasOps *o)
|
||||
{
|
||||
gen_helper_tre(o->out, cpu_env, o->out, o->out2, o->in2);
|
||||
return_low128(o->out2);
|
||||
TCGv_i128 pair = tcg_temp_new_i128();
|
||||
|
||||
gen_helper_tre(pair, cpu_env, o->out, o->out2, o->in2);
|
||||
tcg_gen_extr_i128_i64(o->out2, o->out, pair);
|
||||
tcg_temp_free_i128(pair);
|
||||
set_cc_static(s);
|
||||
return DISAS_NEXT;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user