Commit a59d628f authored by Maria Klimushenkova's avatar Maria Klimushenkova Committed by David Gibson
Browse files

This patch fixes processing of rfi instructions in icount mode. 



In this mode writing to interrupt/peripheral state is controlled
by can_do_io flag. This flag must be set explicitly before helper
function invocation.

Signed-off-by: default avatarMaria Klimushenkova <maria.klimushenkova@ispras.ru>
Signed-off-by: default avatarPavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Tested-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 09a333ee

target/ppc/translate.c

+12 −0
Original line number Diff line number Diff line
@@ -3919,9 +3919,15 @@ static void gen_rfi(DisasContext *ctx) 
    }

    /* Restore CPU state */

    CHK_SV;

    if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {

        gen_io_start();

    }

    gen_update_cfar(ctx, ctx->base.pc_next - 4);

    gen_helper_rfi(cpu_env);

    gen_sync_exception(ctx);

    if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {

        gen_io_end();

    }

#endif

}
@@ -3933,9 +3939,15 @@ static void gen_rfid(DisasContext *ctx) 
#else

    /* Restore CPU state */

    CHK_SV;

    if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {

        gen_io_start();

    }

    gen_update_cfar(ctx, ctx->base.pc_next - 4);

    gen_helper_rfid(cpu_env);

    gen_sync_exception(ctx);

    if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {

        gen_io_end();

    }

#endif

}