Now that do_cond() uses sign overflow for some condition matches we need to roll our own version without sign overflow checks.
Signed-off-by: Sven Schnelle <sv...@stackframe.org> --- target/hppa/translate.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index bce8773b1a..d858fabd3a 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -1029,20 +1029,32 @@ static DisasCond do_log_cond(unsigned cf, TCGv_reg res) /* Similar, but for shift/extract/deposit conditions. */ -static DisasCond do_sed_cond(unsigned orig, TCGv_reg res) +static DisasCond do_sed_cond(unsigned c, TCGv_reg res) { - unsigned c, f; + DisasCond cond; + TCGv_reg tmp; - /* Convert the compressed condition codes to standard. - 0-2 are the same as logicals (nv,<,<=), while 3 is OD. - 4-7 are the reverse of 0-3. */ - c = orig & 3; - if (c == 3) { - c = 7; + switch(c & 3) { + case 0: /* never */ + cond = cond_make_f(); + break; + case 1: /* = all bits are zero */ + cond = cond_make_0(TCG_COND_EQ, res); + break; + case 2: /* < leftmost bit is 1 */ + cond = cond_make_0(TCG_COND_LT, res); + break; + case 3: /* OD rightmost bit is 1 */ + tmp = tcg_temp_new(); + tcg_gen_andi_reg(tmp, res, 1); + cond = cond_make_0(TCG_COND_NE, tmp); + tcg_temp_free(tmp); + break; } - f = (orig & 4) / 4; - - return do_log_cond(c * 2 + f, res); + if (c & 4) { + cond.c = tcg_invert_cond(cond.c); + } + return cond; } /* Similar, but for unit conditions. */ -- 2.20.1