Commit 1c7336c5 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

ppc: fix hrfid, tlbia and slbia privilege 



commit 74693da9 ('ppc: tlbie, tlbia and tlbisync are HV only')
introduced some extra checks on the instruction privilege. slbia was
changed wrongly and hrfid, tlbia were forgotten.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 1c953ba5

target-ppc/translate.c

+3 −3
Original line number Diff line number Diff line
@@ -4108,7 +4108,7 @@ static void gen_hrfid(DisasContext *ctx) 
    gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);

#else

    /* Restore CPU state */

    if (unlikely(!ctx->hv)) {

    if (unlikely(ctx->pr || !ctx->hv)) {

        gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);

        return;

    }
@@ -4845,7 +4845,7 @@ static void gen_tlbia(DisasContext *ctx) 
#if defined(CONFIG_USER_ONLY)

    gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);

#else

    if (unlikely(ctx->pr)) {

    if (unlikely(ctx->pr || !ctx->hv)) {

        gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);

        return;

    }
@@ -4913,7 +4913,7 @@ static void gen_slbia(DisasContext *ctx) 
#if defined(CONFIG_USER_ONLY)

    gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);

#else

    if (unlikely(ctx->pr || !ctx->hv)) {

    if (unlikely(ctx->pr)) {

        gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);

        return;

    }