target/s390x: Use a single return for helper_divs32/u32
Pack the quotient and remainder into a single uint64_t. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- v2: Fix operand ordering; use tcg_extr32_i64.
This commit is contained in:
parent
82f6584c9b
commit
6d28ff406c
@ -10,7 +10,7 @@ DEF_HELPER_FLAGS_4(clc, TCG_CALL_NO_WG, i32, env, i32, i64, i64)
|
||||
DEF_HELPER_3(mvcl, i32, env, i32, i32)
|
||||
DEF_HELPER_3(clcl, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_4(clm, TCG_CALL_NO_WG, i32, env, i32, i32, i64)
|
||||
DEF_HELPER_FLAGS_3(divs32, TCG_CALL_NO_WG, s64, env, s64, s64)
|
||||
DEF_HELPER_FLAGS_3(divs32, TCG_CALL_NO_WG, i64, env, s64, s64)
|
||||
DEF_HELPER_FLAGS_3(divu32, TCG_CALL_NO_WG, i64, env, i64, i64)
|
||||
DEF_HELPER_FLAGS_3(divs64, TCG_CALL_NO_WG, s64, env, s64, s64)
|
||||
DEF_HELPER_FLAGS_4(divu64, TCG_CALL_NO_WG, i64, env, i64, i64, i64)
|
||||
|
@ -34,45 +34,45 @@
|
||||
#endif
|
||||
|
||||
/* 64/32 -> 32 signed division */
|
||||
int64_t HELPER(divs32)(CPUS390XState *env, int64_t a, int64_t b64)
|
||||
uint64_t HELPER(divs32)(CPUS390XState *env, int64_t a, int64_t b64)
|
||||
{
|
||||
int32_t ret, b = b64;
|
||||
int64_t q;
|
||||
int32_t b = b64;
|
||||
int64_t q, r;
|
||||
|
||||
if (b == 0) {
|
||||
tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());
|
||||
}
|
||||
|
||||
ret = q = a / b;
|
||||
env->retxl = a % b;
|
||||
q = a / b;
|
||||
r = a % b;
|
||||
|
||||
/* Catch non-representable quotient. */
|
||||
if (ret != q) {
|
||||
if (q != (int32_t)q) {
|
||||
tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());
|
||||
}
|
||||
|
||||
return ret;
|
||||
return deposit64(q, 32, 32, r);
|
||||
}
|
||||
|
||||
/* 64/32 -> 32 unsigned division */
|
||||
uint64_t HELPER(divu32)(CPUS390XState *env, uint64_t a, uint64_t b64)
|
||||
{
|
||||
uint32_t ret, b = b64;
|
||||
uint64_t q;
|
||||
uint32_t b = b64;
|
||||
uint64_t q, r;
|
||||
|
||||
if (b == 0) {
|
||||
tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());
|
||||
}
|
||||
|
||||
ret = q = a / b;
|
||||
env->retxl = a % b;
|
||||
q = a / b;
|
||||
r = a % b;
|
||||
|
||||
/* Catch non-representable quotient. */
|
||||
if (ret != q) {
|
||||
if (q != (uint32_t)q) {
|
||||
tcg_s390_program_interrupt(env, PGM_FIXPT_DIVIDE, GETPC());
|
||||
}
|
||||
|
||||
return ret;
|
||||
return deposit64(q, 32, 32, r);
|
||||
}
|
||||
|
||||
/* 64/64 -> 64 signed division */
|
||||
|
@ -2395,15 +2395,15 @@ static DisasJumpType op_diag(DisasContext *s, DisasOps *o)
|
||||
|
||||
static DisasJumpType op_divs32(DisasContext *s, DisasOps *o)
|
||||
{
|
||||
gen_helper_divs32(o->out2, cpu_env, o->in1, o->in2);
|
||||
return_low128(o->out);
|
||||
gen_helper_divs32(o->out, cpu_env, o->in1, o->in2);
|
||||
tcg_gen_extr32_i64(o->out2, o->out, o->out);
|
||||
return DISAS_NEXT;
|
||||
}
|
||||
|
||||
static DisasJumpType op_divu32(DisasContext *s, DisasOps *o)
|
||||
{
|
||||
gen_helper_divu32(o->out2, cpu_env, o->in1, o->in2);
|
||||
return_low128(o->out);
|
||||
gen_helper_divu32(o->out, cpu_env, o->in1, o->in2);
|
||||
tcg_gen_extr32_i64(o->out2, o->out, o->out);
|
||||
return DISAS_NEXT;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user