| Message ID | 20220627141104.669152-7-matheus.ferst@eldorado.org.br |
|---|---|
| State | New |
| Headers | show |
| Series | Fix gen_*_exception error codes | expand |
On 6/27/22 11:11, Matheus Ferst wrote: > The 'error' argument of gen_inval_exception will be or-ed with > POWERPC_EXCP_INVAL, so it should always be a constant prefixed with > POWERPC_EXCP_INVAL_. No functional change is intended, > spr_write_excp_vector is only used by register_BookE_sprs, and > powerpc_excp_booke ignores the lower 4 bits of the error code on > POWERPC_EXCP_INVAL exceptions. > > Also, take the opportunity to replace printf with qemu_log_mask. > > Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br> > --- Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> > target/ppc/translate.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index 30dd524959..da11472877 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -907,9 +907,9 @@ void spr_write_excp_vector(DisasContext *ctx, int sprn, int gprn) > } else if (sprn >= SPR_BOOKE_IVOR38 && sprn <= SPR_BOOKE_IVOR42) { > sprn_offs = sprn - SPR_BOOKE_IVOR38 + 38; > } else { > - printf("Trying to write an unknown exception vector %d %03x\n", > - sprn, sprn); > - gen_inval_exception(ctx, POWERPC_EXCP_PRIV_REG); > + qemu_log_mask(LOG_GUEST_ERROR, "Trying to write an unknown exception" > + " vector 0x%03x\n", sprn); > + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); > return; > } >
diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 30dd524959..da11472877 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -907,9 +907,9 @@ void spr_write_excp_vector(DisasContext *ctx, int sprn, int gprn) } else if (sprn >= SPR_BOOKE_IVOR38 && sprn <= SPR_BOOKE_IVOR42) { sprn_offs = sprn - SPR_BOOKE_IVOR38 + 38; } else { - printf("Trying to write an unknown exception vector %d %03x\n", - sprn, sprn); - gen_inval_exception(ctx, POWERPC_EXCP_PRIV_REG); + qemu_log_mask(LOG_GUEST_ERROR, "Trying to write an unknown exception" + " vector 0x%03x\n", sprn); + gen_inval_exception(ctx, POWERPC_EXCP_INVAL_INVAL); return; }
The 'error' argument of gen_inval_exception will be or-ed with POWERPC_EXCP_INVAL, so it should always be a constant prefixed with POWERPC_EXCP_INVAL_. No functional change is intended, spr_write_excp_vector is only used by register_BookE_sprs, and powerpc_excp_booke ignores the lower 4 bits of the error code on POWERPC_EXCP_INVAL exceptions. Also, take the opportunity to replace printf with qemu_log_mask. Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br> --- target/ppc/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)