| Message ID | 20190514155301.16123-10-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | semihosting cleanup and re-factor | expand |
On 5/14/19 5:52 PM, Alex Bennée wrote: > The is_uhi gates all semihosting calls and always returns false for > CONFIG_USER_ONLY builds. There is no reason to build and link > mips-semi for these builds so lets fix that. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > target/mips/Makefile.objs | 3 ++- > target/mips/helper.h | 2 ++ > target/mips/translate.c | 8 ++++++++ > 3 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs > index 651f36f5176..3448ad5e193 100644 > --- a/target/mips/Makefile.objs > +++ b/target/mips/Makefile.objs > @@ -1,4 +1,5 @@ > obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o > -obj-y += gdbstub.o msa_helper.o mips-semi.o > +obj-y += gdbstub.o msa_helper.o > +obj-$(CONFIG_SOFTMMU) += mips-semi.o > obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o > obj-$(CONFIG_KVM) += kvm.o > diff --git a/target/mips/helper.h b/target/mips/helper.h > index a6d687e3405..90ab03b76e3 100644 > --- a/target/mips/helper.h > +++ b/target/mips/helper.h > @@ -2,7 +2,9 @@ DEF_HELPER_3(raise_exception_err, noreturn, env, i32, int) > DEF_HELPER_2(raise_exception, noreturn, env, i32) > DEF_HELPER_1(raise_exception_debug, noreturn, env) > > +#ifndef CONFIG_USER_ONLY > DEF_HELPER_1(do_semihosting, void, env) > +#endif > > #ifdef TARGET_MIPS64 > DEF_HELPER_4(sdl, void, env, tl, tl, int) > diff --git a/target/mips/translate.c b/target/mips/translate.c > index 3cd5b11b16b..fb905c88b57 100644 > --- a/target/mips/translate.c > +++ b/target/mips/translate.c > @@ -13726,6 +13726,14 @@ static inline bool is_uhi(int sdbbp_code) > #endif > } > > +#ifdef CONFIG_USER_ONLY > +/* The above should dead-code away any calls to this..*/ > +static inline void gen_helper_do_semihosting(void *env) > +{ > + g_assert_not_reached(); > +} > +#endif > + > static int decode_mips16_opc (CPUMIPSState *env, DisasContext *ctx) > { > int rx, ry; >
On May 14, 2019 6:04 PM, "Alex Bennée" <alex.bennee@linaro.org> wrote: > > The is_uhi gates all semihosting calls and always returns false for > CONFIG_USER_ONLY builds. There is no reason to build and link > mips-semi for these builds so lets fix that. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > target/mips/Makefile.objs | 3 ++- > target/mips/helper.h | 2 ++ > target/mips/translate.c | 8 ++++++++ > 3 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs > index 651f36f5176..3448ad5e193 100644 > --- a/target/mips/Makefile.objs > +++ b/target/mips/Makefile.objs > @@ -1,4 +1,5 @@ > obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o > -obj-y += gdbstub.o msa_helper.o mips-semi.o > +obj-y += gdbstub.o msa_helper.o > +obj-$(CONFIG_SOFTMMU) += mips-semi.o > obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o > obj-$(CONFIG_KVM) += kvm.o > diff --git a/target/mips/helper.h b/target/mips/helper.h > index a6d687e3405..90ab03b76e3 100644 > --- a/target/mips/helper.h > +++ b/target/mips/helper.h > @@ -2,7 +2,9 @@ DEF_HELPER_3(raise_exception_err, noreturn, env, i32, int) > DEF_HELPER_2(raise_exception, noreturn, env, i32) > DEF_HELPER_1(raise_exception_debug, noreturn, env) > > +#ifndef CONFIG_USER_ONLY > DEF_HELPER_1(do_semihosting, void, env) > +#endif > > #ifdef TARGET_MIPS64 > DEF_HELPER_4(sdl, void, env, tl, tl, int) > diff --git a/target/mips/translate.c b/target/mips/translate.c > index 3cd5b11b16b..fb905c88b57 100644 > --- a/target/mips/translate.c > +++ b/target/mips/translate.c > @@ -13726,6 +13726,14 @@ static inline bool is_uhi(int sdbbp_code) > #endif > } > > +#ifdef CONFIG_USER_ONLY > +/* The above should dead-code away any calls to this..*/ > +static inline void gen_helper_do_semihosting(void *env) > +{ > + g_assert_not_reached(); > +} > +#endif > + > static int decode_mips16_opc (CPUMIPSState *env, DisasContext *ctx) > { > int rx, ry; > -- > 2.20.1 > >
diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs index 651f36f5176..3448ad5e193 100644 --- a/target/mips/Makefile.objs +++ b/target/mips/Makefile.objs @@ -1,4 +1,5 @@ obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o -obj-y += gdbstub.o msa_helper.o mips-semi.o +obj-y += gdbstub.o msa_helper.o +obj-$(CONFIG_SOFTMMU) += mips-semi.o obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o obj-$(CONFIG_KVM) += kvm.o diff --git a/target/mips/helper.h b/target/mips/helper.h index a6d687e3405..90ab03b76e3 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -2,7 +2,9 @@ DEF_HELPER_3(raise_exception_err, noreturn, env, i32, int) DEF_HELPER_2(raise_exception, noreturn, env, i32) DEF_HELPER_1(raise_exception_debug, noreturn, env) +#ifndef CONFIG_USER_ONLY DEF_HELPER_1(do_semihosting, void, env) +#endif #ifdef TARGET_MIPS64 DEF_HELPER_4(sdl, void, env, tl, tl, int) diff --git a/target/mips/translate.c b/target/mips/translate.c index 3cd5b11b16b..fb905c88b57 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -13726,6 +13726,14 @@ static inline bool is_uhi(int sdbbp_code) #endif } +#ifdef CONFIG_USER_ONLY +/* The above should dead-code away any calls to this..*/ +static inline void gen_helper_do_semihosting(void *env) +{ + g_assert_not_reached(); +} +#endif + static int decode_mips16_opc (CPUMIPSState *env, DisasContext *ctx) { int rx, ry;
The is_uhi gates all semihosting calls and always returns false for CONFIG_USER_ONLY builds. There is no reason to build and link mips-semi for these builds so lets fix that. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- target/mips/Makefile.objs | 3 ++- target/mips/helper.h | 2 ++ target/mips/translate.c | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) -- 2.20.1