target/*/cpu.h: remove softfloat.h

As cpu.h is another typically widely included file which doesn't need
full access to the softfloat API we can remove the includes from here
as well. Where they do need types it's typically for float_status and
the rounding modes so we move that to softfloat-types.h as well.

As a result of not having softfloat in every cpu.h call we now need to
add it to various helpers that do need the full softfloat.h
definitions.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
[For PPC parts]
Acked-by: David Gibson <david@gibson.dropbear.id.au>

diff --git a/include/fpu/softfloat-types.h b/include/fpu/softfloat-types.h
index 8210a94ea1aca1656793d7b1856c8f8781282229..4e378cb61237f9c8c56db3367693eae280f0d731 100644 (file)
--- a/include/fpu/softfloat-types.h
+++ b/include/fpu/softfloat-types.h
@@ -80,6 +80,12 @@ this code that are retained.
 #ifndef SOFTFLOAT_TYPES_H
 #define SOFTFLOAT_TYPES_H
 
+/* This 'flag' type must be able to hold at least 0 and 1. It should
+ * probably be replaced with 'bool' but the uses would need to be audited
+ * to check that they weren't accidentally relying on it being a larger type.
+ */
+typedef uint8_t flag;
+
 /*
  * Software IEC/IEEE floating-point types.
  */
@@ -112,4 +118,62 @@ typedef struct {
 #define make_float128(high_, low_) ((float128) { .high = high_, .low = low_ })
 #define make_float128_init(high_, low_) { .high = high_, .low = low_ }
 
+/*
+ * Software IEC/IEEE floating-point underflow tininess-detection mode.
+ */
+
+enum {
+    float_tininess_after_rounding  = 0,
+    float_tininess_before_rounding = 1
+};
+
+/*
+ *Software IEC/IEEE floating-point rounding mode.
+ */
+
+enum {
+    float_round_nearest_even = 0,
+    float_round_down         = 1,
+    float_round_up           = 2,
+    float_round_to_zero      = 3,
+    float_round_ties_away    = 4,
+    /* Not an IEEE rounding mode: round to the closest odd mantissa value */
+    float_round_to_odd       = 5,
+};
+
+/*
+ * Software IEC/IEEE floating-point exception flags.
+ */
+
+enum {
+    float_flag_invalid   =  1,
+    float_flag_divbyzero =  4,
+    float_flag_overflow  =  8,
+    float_flag_underflow = 16,
+    float_flag_inexact   = 32,
+    float_flag_input_denormal = 64,
+    float_flag_output_denormal = 128
+};
+
+
+/*
+ * Floating Point Status. Individual architectures may maintain
+ * several versions of float_status for different functions. The
+ * correct status for the operation is then passed by reference to
+ * most of the softfloat functions.
+ */
+
+typedef struct float_status {
+    signed char float_detect_tininess;
+    signed char float_rounding_mode;
+    uint8_t     float_exception_flags;
+    signed char floatx80_rounding_precision;
+    /* should denormalised results go to zero and set the inexact flag? */
+    flag flush_to_zero;
+    /* should denormalised inputs go to zero and set the input_denormal flag? */
+    flag flush_inputs_to_zero;
+    flag default_nan_mode;
+    flag snan_bit_is_one;
+} float_status;
+
 #endif /* SOFTFLOAT_TYPES_H */

diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h
index 4e16e22e58ea3ec2734cf176a8cdefb0dd340ddd..f3b9008f78689ec6829446bf8908710f8ad0efab 100644 (file)
--- a/include/fpu/softfloat.h
+++ b/include/fpu/softfloat.h
@@ -82,12 +82,6 @@ this code that are retained.
 #ifndef SOFTFLOAT_H
 #define SOFTFLOAT_H
 
-/* This 'flag' type must be able to hold at least 0 and 1. It should
- * probably be replaced with 'bool' but the uses would need to be audited
- * to check that they weren't accidentally relying on it being a larger type.
- */
-typedef uint8_t flag;
-
 #define LIT64( a ) a##LL
 
 /*----------------------------------------------------------------------------
@@ -102,53 +96,6 @@ enum {
 
 #include "fpu/softfloat-types.h"
 
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point underflow tininess-detection mode.
-*----------------------------------------------------------------------------*/
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point rounding mode.
-*----------------------------------------------------------------------------*/
-enum {
-    float_round_nearest_even = 0,
-    float_round_down         = 1,
-    float_round_up           = 2,
-    float_round_to_zero      = 3,
-    float_round_ties_away    = 4,
-    /* Not an IEEE rounding mode: round to the closest odd mantissa value */
-    float_round_to_odd       = 5,
-};
-
-/*----------------------------------------------------------------------------
-| Software IEC/IEEE floating-point exception flags.
-*----------------------------------------------------------------------------*/
-enum {
-    float_flag_invalid   =  1,
-    float_flag_divbyzero =  4,
-    float_flag_overflow  =  8,
-    float_flag_underflow = 16,
-    float_flag_inexact   = 32,
-    float_flag_input_denormal = 64,
-    float_flag_output_denormal = 128
-};
-
-typedef struct float_status {
-    signed char float_detect_tininess;
-    signed char float_rounding_mode;
-    uint8_t     float_exception_flags;
-    signed char floatx80_rounding_precision;
-    /* should denormalised results go to zero and set the inexact flag? */
-    flag flush_to_zero;
-    /* should denormalised inputs go to zero and set the input_denormal flag? */
-    flag flush_inputs_to_zero;
-    flag default_nan_mode;
-    flag snan_bit_is_one;
-} float_status;
-
 static inline void set_float_detect_tininess(int val, float_status *status)
 {
     status->float_detect_tininess = val;

diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h
index 09720c2f3b1779b21d6f53df7597d79b0a1d35bc..a79fc2e780a6b0314f3dac583a0c178a03490a48 100644 (file)
--- a/target/alpha/cpu.h
+++ b/target/alpha/cpu.h
@@ -33,8 +33,6 @@
 
 #include "exec/cpu-defs.h"
 
-#include "fpu/softfloat.h"
-
 #define ICACHE_LINE_SIZE 32
 #define DCACHE_LINE_SIZE 32
 

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index d796085be92a8402f4bf95a3fcf2a8bde1af8a3e..1b3ae62db636143b1b9869a42f741274b79a5cdf 100644 (file)
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -34,6 +34,7 @@
 #include "sysemu/hw_accel.h"
 #include "kvm_arm.h"
 #include "disas/capstone.h"
+#include "fpu/softfloat.h"
 
 static void arm_cpu_set_pc(CPUState *cs, vaddr value)
 {

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index de62df091ced4d477d6bf8bd6c91faada038eaf5..8c839faa8f0808386d4340864b8eb43c29423a2a 100644 (file)
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -39,8 +39,6 @@
 #include "cpu-qom.h"
 #include "exec/cpu-defs.h"
 
-#include "fpu/softfloat.h"
-
 #define EXCP_UDEF            1   /* undefined instruction */
 #define EXCP_SWI             2   /* software interrupt */
 #define EXCP_PREFETCH_ABORT  3

diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c
index 06fd321faeb673c51cd29e89698f6170d18c8e05..10e08bdc1f180e1de550d38ba76d9a9b855a31a3 100644 (file)
--- a/target/arm/helper-a64.c
+++ b/target/arm/helper-a64.c
@@ -31,6 +31,7 @@
 #include "exec/cpu_ldst.h"
 #include "qemu/int128.h"
 #include "tcg.h"
+#include "fpu/softfloat.h"
 #include <zlib.h> /* For crc32 */
 
 /* C2.4.7 Multiply and divide */

diff --git a/target/arm/helper.c b/target/arm/helper.c
index e7586fcf6c23128549e79233e1736c7085072f29..32e4fd47327c375bcfda6e2a5d641e6112352a3f 100644 (file)
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -15,6 +15,7 @@
 #include <zlib.h> /* For crc32 */
 #include "exec/semihost.h"
 #include "sysemu/kvm.h"
+#include "fpu/softfloat.h"
 
 #define ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */
 

diff --git a/target/arm/neon_helper.c b/target/arm/neon_helper.c
index 689491cad325f4c1501d5e4c7660f237a6588f4f..a1ec6537eb7b9ed23c2fd2ffffa57f480d0ba9e5 100644 (file)
--- a/target/arm/neon_helper.c
+++ b/target/arm/neon_helper.c
@@ -11,6 +11,7 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
+#include "fpu/softfloat.h"
 
 #define SIGNBIT (uint32_t)0x80000000
 #define SIGNBIT64 ((uint64_t)1 << 63)

diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
index 7b635cc4ac29f933d3a83dd5c7492f1f8f8875d7..969f628f0a02148383b612adf9843075f7adb51b 100644 (file)
--- a/target/hppa/cpu.c
+++ b/target/hppa/cpu.c
@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "qemu-common.h"
 #include "exec/exec-all.h"
+#include "fpu/softfloat.h"
 
 
 static void hppa_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index 7640c81221ccdc8254ad99e951f9b49e9eb51560..c88d844938a8dfe990096eac6166daf1d32bab87 100644 (file)
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -51,7 +51,6 @@
 #define CPUArchState struct CPUHPPAState
 
 #include "exec/cpu-defs.h"
-#include "fpu/softfloat.h"
 
 #define TARGET_PAGE_BITS 12
 

diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c
index 4ee936bf86a591bd956637c3dcc6cac77b51e5d7..a3af62daf71a5cdb3920a4ddfcdc903c6eb8c5d4 100644 (file)
--- a/target/hppa/op_helper.c
+++ b/target/hppa/op_helper.c
@@ -24,7 +24,7 @@
 #include "exec/cpu_ldst.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"
-
+#include "fpu/softfloat.h"
 
 void QEMU_NORETURN HELPER(excp)(CPUHPPAState *env, int excp)
 {

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index f91e37d25deaeb90d31fc1bfa15bc64195a39b58..faf39ec1ce77b2d5d42f58177424d3ec37df0efa 100644 (file)
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -52,10 +52,6 @@
 
 #define CPUArchState struct CPUX86State
 
-#ifdef CONFIG_TCG
-#include "fpu/softfloat.h"
-#endif
-
 enum {
     R_EAX = 0,
     R_ECX = 1,

diff --git a/target/i386/fpu_helper.c b/target/i386/fpu_helper.c
index 9014b6f88afd52e435108d7d24a54964823a2e35..ea5a0c4861b3bd8c0764678109646b9d96127e0d 100644 (file)
--- a/target/i386/fpu_helper.c
+++ b/target/i386/fpu_helper.c
@@ -24,6 +24,7 @@
 #include "qemu/host-utils.h"
 #include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
+#include "fpu/softfloat.h"
 
 #define FPU_RC_MASK         0xc00
 #define FPU_RC_NEAR         0x000

diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
index 30267144714d9aef92e1de9e6bf08239f29dc1e6..a4ed8770aaca362e797189b62f0faea40f51e1ac 100644 (file)
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -24,7 +24,7 @@
 #include "qemu-common.h"
 #include "migration/vmstate.h"
 #include "exec/exec-all.h"
-
+#include "fpu/softfloat.h"
 
 static void m68k_cpu_set_pc(CPUState *cs, vaddr value)
 {

diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 1d79885222db89d679c0d0381e86354e4136d1b6..65f4fb95cb1a052ec8be0e6d19d6aab9c9013789 100644 (file)
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -28,7 +28,6 @@
 #include "qemu-common.h"
 #include "exec/cpu-defs.h"
 #include "cpu-qom.h"
-#include "fpu/softfloat.h"
 
 #define OS_BYTE     0
 #define OS_WORD     1

diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c
index 665e7609af80b7ffd30f722e0f76ced905340bd0..3c5a82aaa0ca575ded1b0deeda5f6b740d29d268 100644 (file)
--- a/target/m68k/fpu_helper.c
+++ b/target/m68k/fpu_helper.c
@@ -23,6 +23,7 @@
 #include "exec/helper-proto.h"
 #include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
+#include "fpu/softfloat.h"
 
 /* Undefined offsets may be different on various FPU.
  * On 68040 they return 0.0 (floatx80_zero)

diff --git a/target/m68k/helper.c b/target/m68k/helper.c
index 20155c7801842f8036d5aeb9b0000794e7193b65..917d46efcc3389b8f7cc8a9e6ff9afcf9bd923a0 100644 (file)
--- a/target/m68k/helper.c
+++ b/target/m68k/helper.c
@@ -24,6 +24,7 @@
 #include "exec/gdbstub.h"
 
 #include "exec/helper-proto.h"
+#include "fpu/softfloat.h"
 
 #define SIGNBIT (1u << 31)
 

diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index 70c7583621dd53c39d95c19198922e9a854ad1ff..93cd38950ed5989d91c5b82141a871cf05b9d03d 100644 (file)
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -32,6 +32,8 @@
 
 #include "trace-tcg.h"
 #include "exec/log.h"
+#include "fpu/softfloat.h"
+
 
 //#define DEBUG_DISPATCH 1
 

diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c
index d8df2fb07eb113811e1b38b572512e9f575831f6..4dc140480001788a42798a26055be49df2ba0d96 100644 (file)
--- a/target/microblaze/cpu.c
+++ b/target/microblaze/cpu.c
@@ -28,6 +28,7 @@
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "exec/exec-all.h"
+#include "fpu/softfloat.h"
 
 static const struct {
     const char *name;

diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h
index f3e7405a62c988a216a5f610b54845304ab9397a..1fe21c8539586d57f052eee3069cb44dd7e6d20d 100644 (file)
--- a/target/microblaze/cpu.h
+++ b/target/microblaze/cpu.h
@@ -28,7 +28,7 @@
 #define CPUArchState struct CPUMBState
 
 #include "exec/cpu-defs.h"
-#include "fpu/softfloat.h"
+#include "fpu/softfloat-types.h"
 struct CPUMBState;
 typedef struct CPUMBState CPUMBState;
 #if !defined(CONFIG_USER_ONLY)

diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c
index 869072a2d13b9cea366b199c1a411c187480b3d0..1b4fe796e739b83af7802636bfc7b3eb86630da0 100644 (file)
--- a/target/microblaze/op_helper.c
+++ b/target/microblaze/op_helper.c
@@ -24,6 +24,7 @@
 #include "qemu/host-utils.h"
 #include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
+#include "fpu/softfloat.h"
 
 #define D(x)
 

diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h
index a01f480821a82eef9d103a96dbfd8199b47de232..d85e1fc061aaf8f6c7f6b0efd522c50895461a9b 100644 (file)
--- a/target/moxie/cpu.h
+++ b/target/moxie/cpu.h
@@ -34,7 +34,6 @@
 #define MOXIE_EX_BREAK      16
 
 #include "exec/cpu-defs.h"
-#include "fpu/softfloat.h"
 
 #define TARGET_PAGE_BITS 12     /* 4k */
 

diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h
index 204b39add73aaae13e5db68c6156b3dd31c9cb75..cd4e40d1b45e1cc545a6e1c02e030083ec3c8004 100644 (file)
--- a/target/nios2/cpu.h
+++ b/target/nios2/cpu.h
@@ -27,7 +27,6 @@
 #define CPUArchState struct CPUNios2State
 
 #include "exec/cpu-defs.h"
-#include "fpu/softfloat.h"
 #include "qom/cpu.h"
 struct CPUNios2State;
 typedef struct CPUNios2State CPUNios2State;

diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h
index fb46cc99862d08b6650d6c97af89d7c70bf4b50e..5050b1135c09a2932ad20cd77ab756dbf83b23c8 100644 (file)
--- a/target/openrisc/cpu.h
+++ b/target/openrisc/cpu.h
@@ -29,7 +29,6 @@ struct OpenRISCCPU;
 
 #include "qemu-common.h"
 #include "exec/cpu-defs.h"
-#include "fpu/softfloat.h"
 #include "qom/cpu.h"
 
 #define TYPE_OPENRISC_CPU "or1k-cpu"

diff --git a/target/openrisc/fpu_helper.c b/target/openrisc/fpu_helper.c
index 1375cea9480b83538e2fd027aade69942f937190..977a1e8e55a15c4a73d293da1d90fc3afd52dc88 100644 (file)
--- a/target/openrisc/fpu_helper.c
+++ b/target/openrisc/fpu_helper.c
@@ -22,6 +22,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exception.h"
+#include "fpu/softfloat.h"
 
 static inline uint32_t ieee_ex_to_openrisc(OpenRISCCPU *cpu, int fexcp)
 {

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 9f8cbbe7aa4d08b68b02cd201bcfd2711123a9aa..7bde1884a142e1091acdc6ebbd021830e8720adf 100644 (file)
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -79,7 +79,6 @@
 
 #include "exec/cpu-defs.h"
 #include "cpu-qom.h"
-#include "fpu/softfloat.h"
 
 #if defined (TARGET_PPC64)
 #define PPC_ELF_MACHINE     EM_PPC64

diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c
index c4dab159e4c8dcc40ae9e37a1471193c53d79ecb..9ae418a5771174197f83577495a03e390b2c7c37 100644 (file)
--- a/target/ppc/fpu_helper.c
+++ b/target/ppc/fpu_helper.c
@@ -21,6 +21,7 @@
 #include "exec/helper-proto.h"
 #include "exec/exec-all.h"
 #include "internal.h"
+#include "fpu/softfloat.h"
 
 static inline float128 float128_snan_to_qnan(float128 x)
 {

diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c
index 3a50f1e1b72c5c2e6e55c5beb4692dab3cd5f755..35bdf0977371665abfbabf5a3f3dddcce48e5012 100644 (file)
--- a/target/ppc/int_helper.c
+++ b/target/ppc/int_helper.c
@@ -23,6 +23,7 @@
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 #include "crypto/aes.h"
+#include "fpu/softfloat.h"
 
 #include "helper_regs.h"
 /*****************************************************************************/

diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index cbaa343e040d56460a0580eab3523482fc790cd5..17a87df654dbada19a7822c250702e41ecd0ee00 100644 (file)
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -38,6 +38,7 @@
 #include "sysemu/qtest.h"
 #include "qemu/cutils.h"
 #include "disas/capstone.h"
+#include "fpu/softfloat.h"
 
 //#define PPC_DUMP_CPU
 //#define PPC_DEBUG_SPR

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index da7cb9c278f4cc17c085f3caf75695fa56b3a404..a665b9e60eb920975cef5ae01bf6edcc2fbaa6c8 100644 (file)
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -42,6 +42,7 @@
 #include "sysemu/arch_init.h"
 #include "sysemu/sysemu.h"
 #endif
+#include "fpu/softfloat.h"
 
 #define CR0_RESET       0xE0UL
 #define CR14_RESET      0xC2000000UL;

diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 21ce40d5b69840c91fe0bb4ea288163eda23cc19..96df2fe5c9ac75abc82feaecf884c29f473249a2 100644 (file)
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -41,8 +41,6 @@
 
 #include "exec/cpu-all.h"
 
-#include "fpu/softfloat.h"
-
 #define NB_MMU_MODES 4
 #define TARGET_INSN_START_EXTRA_WORDS 1
 

diff --git a/target/s390x/fpu_helper.c b/target/s390x/fpu_helper.c
index 334159119f73c1fe013c719976300686cd10115c..43f8bf1c94493c5abbab5610a6fb76d95b80b80c 100644 (file)
--- a/target/s390x/fpu_helper.c
+++ b/target/s390x/fpu_helper.c
@@ -24,6 +24,7 @@
 #include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/helper-proto.h"
+#include "fpu/softfloat.h"
 
 /* #define DEBUG_HELPER */
 #ifdef DEBUG_HELPER

diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
index e37c187ca2e9c8bbe94891741357c08e4bcc62c2..6302cfda3a3a9d9f1736a4b5e277a7ae5283eb06 100644 (file)
--- a/target/sh4/cpu.c
+++ b/target/sh4/cpu.c
@@ -25,6 +25,7 @@
 #include "qemu-common.h"
 #include "migration/vmstate.h"
 #include "exec/exec-all.h"
+#include "fpu/softfloat.h"
 
 
 static void superh_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h
index 52a4568dd57957d9764d4587b4c7538a1a235665..a649b68d7876b9f90b1f17ee904ee2913e2225f1 100644 (file)
--- a/target/sh4/cpu.h
+++ b/target/sh4/cpu.h
@@ -40,8 +40,6 @@
 
 #include "exec/cpu-defs.h"
 
-#include "fpu/softfloat.h"
-
 #define TARGET_PAGE_BITS 12    /* 4k XXXXX */
 
 #define TARGET_PHYS_ADDR_SPACE_BITS 32

diff --git a/target/sh4/op_helper.c b/target/sh4/op_helper.c
index 4b8bbf63b4fdc458c4a5c33ce4c7853c102cce21..4f825bae5a0ac20e26392b93bf3ad8a761886fc1 100644 (file)
--- a/target/sh4/op_helper.c
+++ b/target/sh4/op_helper.c
@@ -21,6 +21,7 @@
 #include "exec/helper-proto.h"
 #include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
+#include "fpu/softfloat.h"
 
 #ifndef CONFIG_USER_ONLY
 

diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index 3eaffb354e4b87cc56f4bbbf8be1507759fdbda9..9724134a5b7671ae2637697d1ef121ca2282cf5e 100644 (file)
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -29,8 +29,6 @@
 
 #include "exec/cpu-defs.h"
 
-#include "fpu/softfloat.h"
-
 /*#define EXCP_INTERRUPT 0x100*/
 
 /* trap definitions */

diff --git a/target/sparc/fop_helper.c b/target/sparc/fop_helper.c
index c7fb176e4c5ef1dc9d6a9383e99f3ba209f2454f..b6642fd1d7e7113d1dfef6e36dd4e4dd6da78915 100644 (file)
--- a/target/sparc/fop_helper.c
+++ b/target/sparc/fop_helper.c
@@ -21,6 +21,7 @@
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"
+#include "fpu/softfloat.h"
 
 #define QT0 (env->qt0)
 #define QT1 (env->qt1)

diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
index f41d2ceb69fe2a45fa34c4274a27d548398623ef..e7dfe4bcc612c725201dd9f2814c04c067f49b2d 100644 (file)
--- a/target/tricore/cpu.h
+++ b/target/tricore/cpu.h
@@ -24,7 +24,6 @@
 #include "qemu-common.h"
 #include "cpu-qom.h"
 #include "exec/cpu-defs.h"
-#include "fpu/softfloat.h"
 
 #define CPUArchState struct CPUTriCoreState
 

diff --git a/target/tricore/fpu_helper.c b/target/tricore/fpu_helper.c
index 7979bb66920e09d92041d0e8b1c2565296bf9ccb..df162902d686fc8434d74c4ac42beaa45bdbe472 100644 (file)
--- a/target/tricore/fpu_helper.c
+++ b/target/tricore/fpu_helper.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "fpu/softfloat.h"
 
 #define QUIET_NAN 0x7fc00000
 #define ADD_NAN   0x7fc00001

diff --git a/target/tricore/helper.c b/target/tricore/helper.c
index 378c2a4a76c701888c55058d1254d6306b49409b..45276d378201cf1bdce2df92073e566c664eda24 100644 (file)
--- a/target/tricore/helper.c
+++ b/target/tricore/helper.c
@@ -19,6 +19,7 @@
 
 #include "cpu.h"
 #include "exec/exec-all.h"
+#include "fpu/softfloat.h"
 
 enum {
     TLBRET_DIRTY = -4,

diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c
index fb837aab4c4c6b7d606839615c174f358555c780..29d160a88d64bd42e4baff56843dabdf461637a2 100644 (file)
--- a/target/unicore32/cpu.c
+++ b/target/unicore32/cpu.c
@@ -18,6 +18,7 @@
 #include "qemu-common.h"
 #include "migration/vmstate.h"
 #include "exec/exec-all.h"
+#include "fpu/softfloat.h"
 
 static void uc32_cpu_set_pc(CPUState *cs, vaddr value)
 {

diff --git a/target/unicore32/cpu.h b/target/unicore32/cpu.h
index a3cc71416d5b44102b2acdaccd11deada6d84ae3..42e1d52478c83bcdd1b1da2c7e40c8965b0561f4 100644 (file)
--- a/target/unicore32/cpu.h
+++ b/target/unicore32/cpu.h
@@ -23,7 +23,6 @@
 #include "qemu-common.h"
 #include "cpu-qom.h"
 #include "exec/cpu-defs.h"
-#include "fpu/softfloat.h"
 
 #define NB_MMU_MODES            2
 

diff --git a/target/unicore32/ucf64_helper.c b/target/unicore32/ucf64_helper.c
index 6c919010c36fe003b2d7de66697047b30764209a..fad3fa66180f8d87f857150180c40ac0d622c193 100644 (file)
--- a/target/unicore32/ucf64_helper.c
+++ b/target/unicore32/ucf64_helper.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "fpu/softfloat.h"
 
 /*
  * The convention used for UniCore-F64 instructions:

diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index f300c02c07c8344d36ae65057ff199e548615045..49c2e3cf9a1b70a4079aa433e4590a681497fac7 100644 (file)
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -36,7 +36,6 @@
 #include "qemu-common.h"
 #include "cpu-qom.h"
 #include "exec/cpu-defs.h"
-#include "fpu/softfloat.h"
 #include "xtensa-isa.h"
 
 #define NB_MMU_MODES 4

diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c
index 43182b113ec9b803ef36d0ff6a6b206ef09fa22a..7486b9979935d7e9229371a8f02892a777680449 100644 (file)
--- a/target/xtensa/op_helper.c
+++ b/target/xtensa/op_helper.c
@@ -34,6 +34,7 @@
 #include "exec/cpu_ldst.h"
 #include "exec/address-spaces.h"
 #include "qemu/timer.h"
+#include "fpu/softfloat.h"
 
 void xtensa_cpu_do_unaligned_access(CPUState *cs,
         vaddr addr, MMUAccessType access_type,