| Message ID | 20230321161609.716474-4-clg@kaod.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fixes for GCC13 | expand |
On 3/21/23 09:16, Cédric Le Goater wrote: > From: Cédric Le Goater<clg@redhat.com> > > GCC13 reports an error: > > ../target/ppc/excp_helper.c:2625:6: error: conflicting types for ‘helper_pminsn’ due to enum/integer mismatch; have ‘void(CPUPPCState *, powerpc_pm_insn_t)’ {aka ‘void(struct CPUArchState *, powerpc_pm_insn_t)’} [-Werror=enum-int-mismatch] > 2625 | void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) > | ^~~~~~~~~~~~~ > In file included from /home/legoater/work/qemu/qemu.git/include/qemu/osdep.h:49, > from ../target/ppc/excp_helper.c:19: > /home/legoater/work/qemu/qemu.git/include/exec/helper-head.h:23:27: note: previous declaration of ‘helper_pminsn’ with type ‘void(CPUArchState *, uint32_t)’ {aka ‘void(CPUArchState *, unsigned int)’} > 23 | #define HELPER(name) glue(helper_, name) > | ^~~~~~~ > > Cc: Daniel Henrique Barboza<danielhb413@gmail.com> > Fixes: 7778a575c7 ("ppc: Add P7/P8 Power Management instructions") > Signed-off-by: Cédric Le Goater<clg@redhat.com> > Reviewed-by: Daniel Henrique Barboza<danielhb413@gmail.com> > --- > target/ppc/excp_helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 21/03/2023 17.16, Cédric Le Goater wrote: > From: Cédric Le Goater <clg@redhat.com> > > GCC13 reports an error: > > ../target/ppc/excp_helper.c:2625:6: error: conflicting types for ‘helper_pminsn’ due to enum/integer mismatch; have ‘void(CPUPPCState *, powerpc_pm_insn_t)’ {aka ‘void(struct CPUArchState *, powerpc_pm_insn_t)’} [-Werror=enum-int-mismatch] > 2625 | void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) > | ^~~~~~~~~~~~~ > In file included from /home/legoater/work/qemu/qemu.git/include/qemu/osdep.h:49, > from ../target/ppc/excp_helper.c:19: > /home/legoater/work/qemu/qemu.git/include/exec/helper-head.h:23:27: note: previous declaration of ‘helper_pminsn’ with type ‘void(CPUArchState *, uint32_t)’ {aka ‘void(CPUArchState *, unsigned int)’} > 23 | #define HELPER(name) glue(helper_, name) > | ^~~~~~~ > > Cc: Daniel Henrique Barboza <danielhb413@gmail.com> > Fixes: 7778a575c7 ("ppc: Add P7/P8 Power Management instructions") > Signed-off-by: Cédric Le Goater <clg@redhat.com> > Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> > --- > target/ppc/excp_helper.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 287659c74d..199328f4b6 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -2622,7 +2622,7 @@ void helper_scv(CPUPPCState *env, uint32_t lev) > } > } > > -void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) > +void helper_pminsn(CPUPPCState *env, uint32_t insn) > { > CPUState *cs; > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 287659c74d..199328f4b6 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2622,7 +2622,7 @@ void helper_scv(CPUPPCState *env, uint32_t lev) } } -void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn) +void helper_pminsn(CPUPPCState *env, uint32_t insn) { CPUState *cs;