targets (various): use softfloat-helpers.h where we can

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 <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Reviewed-by: David Hildenbrand <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Philippe Mathieu-Daudé <[email protected]>

diff --git a/target/alpha/helper.c b/target/alpha/helper.c
index 93b8e788b185f8b199b71256e5ff119afe41f2e5..c6998348df476da88ad4a271b9fea9bb2b873ae2 100644 (file)
--- 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 0bec54b2f8a6c6c6459ba477ebb6d175a1504d9c..9cfd7445e7da85abdf173ea7804eaae5f8e1417b 100644 (file)
--- 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 9466cd832d448163def5e6262e39352c2d7e31aa..3abe7e80fd0a067a95545c7c3b9bf25a4bc90ac3 100644 (file)
--- 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 816d6d7f311ad41f536588e783cf54c782205c18..d0a7707991fea3b79836a52e5c612a3515d5c6e3 100644 (file)
--- 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 a6803368506418f9e1ab2c79d6fa03614007592e..d5db7b2c03f46c8e684c63ae977aba6f5d619d89 100644 (file)
--- 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 802e2f1eba50ef7ef7e542de1b2ae86a24ee225e..b27fb9689ff2314ba0fc0969b71e16c344f26a0b 100644 (file)
--- 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)
 {