| Message ID | 20190813124946.25322-14-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | softfloat updates (include tweaks, rm LIT64) | expand |
On 8/13/19 2:49 PM, Alex Bennée wrote: > Generally the cpu and non-FP helper files just want to manipulate the > softfloat flags. For this they can just use the -helpers.h include > which brings in a minimal number of inline helpers. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Reviewed-by: David Hildenbrand <david@redhat.com> > --- > target/alpha/helper.c | 2 +- > target/microblaze/cpu.c | 2 +- > target/s390x/cpu.c | 2 +- > target/sh4/cpu.c | 3 +-- > target/tricore/helper.c | 2 +- > target/unicore32/cpu.c | 1 - > 6 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/target/alpha/helper.c b/target/alpha/helper.c > index 93b8e788b18..c6998348df4 100644 > --- a/target/alpha/helper.c > +++ b/target/alpha/helper.c > @@ -21,7 +21,7 @@ > > #include "cpu.h" > #include "exec/exec-all.h" > -#include "fpu/softfloat.h" > +#include "fpu/softfloat-types.h" > #include "exec/helper-proto.h" > #include "qemu/qemu-print.h" > > diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c > index 0bec54b2f8a..9cfd7445e7d 100644 > --- a/target/microblaze/cpu.c > +++ b/target/microblaze/cpu.c > @@ -28,7 +28,7 @@ > #include "hw/qdev-properties.h" > #include "migration/vmstate.h" > #include "exec/exec-all.h" > -#include "fpu/softfloat.h" > +#include "fpu/softfloat-helpers.h" > > static const struct { > const char *name; > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c > index 736a7903e22..5db016672bb 100644 > --- a/target/s390x/cpu.c > +++ b/target/s390x/cpu.c > @@ -42,7 +42,7 @@ > #include "sysemu/sysemu.h" > #include "sysemu/tcg.h" > #endif > -#include "fpu/softfloat.h" > +#include "fpu/softfloat-helpers.h" > > #define CR0_RESET 0xE0UL > #define CR14_RESET 0xC2000000UL; > diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c > index 816d6d7f311..d0a7707991f 100644 > --- a/target/sh4/cpu.c > +++ b/target/sh4/cpu.c > @@ -25,8 +25,7 @@ > #include "cpu.h" > #include "migration/vmstate.h" > #include "exec/exec-all.h" > -#include "fpu/softfloat.h" > - > +#include "fpu/softfloat-helpers.h" > > static void superh_cpu_set_pc(CPUState *cs, vaddr value) > { > diff --git a/target/tricore/helper.c b/target/tricore/helper.c > index a6803368506..d5db7b2c03f 100644 > --- a/target/tricore/helper.c > +++ b/target/tricore/helper.c > @@ -19,7 +19,7 @@ > > #include "cpu.h" > #include "exec/exec-all.h" > -#include "fpu/softfloat.h" > +#include "fpu/softfloat-helpers.h" > #include "qemu/qemu-print.h" > > enum { > diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c > index 802e2f1eba5..b27fb9689ff 100644 > --- a/target/unicore32/cpu.c > +++ b/target/unicore32/cpu.c > @@ -17,7 +17,6 @@ > #include "cpu.h" > #include "migration/vmstate.h" > #include "exec/exec-all.h" > -#include "fpu/softfloat.h" target/unicore32/cpu.h has to include "fpu/softfloat-types.h" (use of float_status). Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > static void uc32_cpu_set_pc(CPUState *cs, vaddr value) > { >
diff --git a/target/alpha/helper.c b/target/alpha/helper.c index 93b8e788b18..c6998348df4 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" +#include "fpu/softfloat-types.h" #include "exec/helper-proto.h" #include "qemu/qemu-print.h" diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 0bec54b2f8a..9cfd7445e7d 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -28,7 +28,7 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" +#include "fpu/softfloat-helpers.h" static const struct { const char *name; diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 736a7903e22..5db016672bb 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -42,7 +42,7 @@ #include "sysemu/sysemu.h" #include "sysemu/tcg.h" #endif -#include "fpu/softfloat.h" +#include "fpu/softfloat-helpers.h" #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 816d6d7f311..d0a7707991f 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -25,8 +25,7 @@ #include "cpu.h" #include "migration/vmstate.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" - +#include "fpu/softfloat-helpers.h" static void superh_cpu_set_pc(CPUState *cs, vaddr value) { diff --git a/target/tricore/helper.c b/target/tricore/helper.c index a6803368506..d5db7b2c03f 100644 --- a/target/tricore/helper.c +++ b/target/tricore/helper.c @@ -19,7 +19,7 @@ #include "cpu.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" +#include "fpu/softfloat-helpers.h" #include "qemu/qemu-print.h" enum { diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c index 802e2f1eba5..b27fb9689ff 100644 --- a/target/unicore32/cpu.c +++ b/target/unicore32/cpu.c @@ -17,7 +17,6 @@ #include "cpu.h" #include "migration/vmstate.h" #include "exec/exec-all.h" -#include "fpu/softfloat.h" static void uc32_cpu_set_pc(CPUState *cs, vaddr value) {