From: Max Filippov Date: Sun, 27 May 2012 23:18:33 +0000 (+0400) Subject: target-xtensa: fix CCOUNT for conditional branches X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~4024 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d865f307399441919d6646545b7735e57920da04;p=sdk%2Femulator%2Fqemu.git target-xtensa: fix CCOUNT for conditional branches Taken conditional branches fail to update CCOUNT register because accumulated ccount_delta is reset during translation of non-taken branch. To fix it only update CCOUNT once per conditional branch instruction translation. This fixes guest linux freeze on LTP waitpid06 test. Signed-off-by: Max Filippov Signed-off-by: Blue Swirl --- diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 521c0e6..a542a31 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -388,6 +388,7 @@ static bool gen_check_loop_end(DisasContext *dc, int slot) dc->next_pc == dc->lend) { int label = gen_new_label(); + gen_advance_ccount(dc); tcg_gen_brcondi_i32(TCG_COND_EQ, cpu_SR[LCOUNT], 0, label); tcg_gen_subi_i32(cpu_SR[LCOUNT], cpu_SR[LCOUNT], 1); gen_jumpi(dc, dc->lbeg, slot); @@ -410,6 +411,7 @@ static void gen_brcond(DisasContext *dc, TCGCond cond, { int label = gen_new_label(); + gen_advance_ccount(dc); tcg_gen_brcond_i32(cond, t0, t1, label); gen_jumpi_check_loop_end(dc, 0); gen_set_label(label);