david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ppc: fix hrfid, tlbia and slbia privilege

Browse Source 
commit 74693da98894 ('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: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Cédric Le Goater 2016-06-03 14:11:20 +02:00 committed by David Gibson
parent 1c953ba57a
commit 1c7336c5d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-ppc/translate.c
View File

@ -4108,7 +4108,7 @@ static void gen_hrfid(DisasContext *ctx)
gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);
#else #else
/* Restore CPU state */ /* Restore CPU state */
if (unlikely(!ctx->hv)) { if (unlikely(ctx->pr || !ctx->hv)) {
gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);
return; return;
} }
@ -4845,7 +4845,7 @@ static void gen_tlbia(DisasContext *ctx)
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);
#else #else
if (unlikely(ctx->pr)) { if (unlikely(ctx->pr || !ctx->hv)) {
gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);
return; return;
} }
@ -4913,7 +4913,7 @@ static void gen_slbia(DisasContext *ctx)
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);
#else #else
if (unlikely(ctx->pr || !ctx->hv)) { if (unlikely(ctx->pr)) {
gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);
return; return;
} }