target-ppc: Fix invalid SPR read/write warnings
PATCH 1/2 target-ppc: Fix invalid SPR read/write warnings
Invalid and privileged SPR warnings currently print the wrong address. While fixing that, also make it clear that we are printing both the decimal and hexadecimal SPR number.
Before:
Trying to read invalid spr 896 380 at 0000000000000714
After:
Trying to read invalid spr 896 (0x380) at 0000000000000710
---
target-ppc/translate.c +16 -16
@@ -4005,19 +4005,19 @@ static inline void gen_op_mfspr(DisasCon* allowing userland application to read the PVR */ if (sprn !=SPR_PVR ) { -qemu_log ("Trying to read privileged spr %d %03x at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip); -printf ("Trying to read privileged spr %d %03x at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip); +qemu_log ("Trying to read privileged spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); +printf ("Trying to read privileged spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); }gen_inval_exception (ctx,POWERPC_EXCP_PRIV_REG ); } }else {/* Not defined */ -qemu_log ("Trying to read invalid spr %d %03x at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip); -printf ("Trying to read invalid spr %d %03x at " TARGET_FMT_lx"\n" , - sprn, sprn, ctx->nip); +qemu_log ("Trying to read invalid spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); +printf ("Trying to read invalid spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 );gen_inval_exception (ctx,POWERPC_EXCP_INVAL_SPR ); } }
@@ -4150,18 +4150,18 @@ static void gen_mtspr(DisasContext *ctx) (*write_cb)(ctx, sprn,rS (ctx->opcode)); }else {/* Privilege exception */ -qemu_log ("Trying to write privileged spr %d %03x at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip); -printf ("Trying to write privileged spr %d %03x at " TARGET_FMT_lx -"\n" , sprn, sprn, ctx->nip); +qemu_log ("Trying to write privileged spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); +printf ("Trying to write privileged spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 );gen_inval_exception (ctx,POWERPC_EXCP_PRIV_REG ); } }else {/* Not defined */ -qemu_log ("Trying to write invalid spr %d %03x at " - TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip); -printf ("Trying to write invalid spr %d %03x at " TARGET_FMT_lx"\n" , - sprn, sprn, ctx->nip); +qemu_log ("Trying to write invalid spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 ); +printf ("Trying to write invalid spr %d (0x%03x) at " + TARGET_FMT_lx"\n" , sprn, sprn, ctx->nip -4 );gen_inval_exception (ctx,POWERPC_EXCP_INVAL_SPR ); } }
PATCH 2/2 target-ppc: Add read and write of PPR SPR
Recent Linux kernels save and restore the PPR across exceptions so we need to handle it.
---
target-ppc/translate_init.c +4 -0
@@ -7010,6 +7010,10 @@ static void init_proc_POWER7 (CPUPPCStat &spr_read_generic, &spr_write_generic, &spr_read_generic, &spr_write_generic, 0x00000000); +spr_register (env,SPR_PPR ,"PPR" , + &spr_read_generic, &spr_write_generic, + &spr_read_generic, &spr_write_generic, +0x00000000 );#if !defined(CONFIG_USER_ONLY ) env->slb_nr =32 ;#endif
Alexander Graf
AppliedQuoted 7 lines · Anton Blanchard
Invalid and privileged SPR warnings currently print the wrong address. While fixing that, also make it clear that we are printing both the decimal and hexadecimal SPR number.
Before:
Quoted 7 lines
Trying to read invalid spr 896 380 at 0000000000000714
After:
Trying to read invalid spr 896 (
0x380) at 0000000000000710Signed-off-by Anton Blanchard <[email protected]>
Thanks, applied both to ppc-next. Welcome to the wonderful world of QEMU ;).
Alex