Commit 502700d0 authored by Alex Bennée's avatar Alex Bennée
Browse files

target/mips: rationalise softfloat includes 



We should avoid including the whole of softfloat headers in cpu.h and
explicitly include it only where we will be calling softfloat
functions. We can use the -types.h in cpu.h for the few bits that are
global. We also move the restore_snan_bit_mode into internal.h and
include -helpers.h there.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
parent 00f43279

linux-user/mips/cpu_loop.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "qemu.h"

#include "cpu_loop-common.h"

#include "elf.h"

#include "internal.h"



# ifdef TARGET_ABI_MIPSO32

#  define MIPS_SYS(name, args) args,

target/mips/cpu.h

+1 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


#include "cpu-qom.h"

#include "exec/cpu-defs.h"

#include "fpu/softfloat.h"

#include "fpu/softfloat-types.h"

#include "mips-defs.h"



#define TCG_GUEST_DEFAULT_MO (0)
@@ -1195,12 +1195,6 @@ void itc_reconfigure(struct MIPSITUState *tag); 
/* helper.c */

target_ulong exception_resume_pc(CPUMIPSState *env);



static inline void restore_snan_bit_mode(CPUMIPSState *env)

{

    set_snan_bit_is_one((env->active_fpu.fcr31 & (1 << FCR31_NAN2008)) == 0,

                        &env->active_fpu.fp_status);

}



static inline void cpu_get_tb_cpu_state(CPUMIPSState *env, target_ulong *pc,

                                        target_ulong *cs_base, uint32_t *flags)

{

target/mips/internal.h

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#ifndef MIPS_INTERNAL_H

#define MIPS_INTERNAL_H



#include "fpu/softfloat-helpers.h"



/* MMU types, the first four entries have the same layout as the

   CP0C0_MT field.  */
@@ -226,6 +227,12 @@ static inline void restore_flush_mode(CPUMIPSState *env) 
                      &env->active_fpu.fp_status);

}



static inline void restore_snan_bit_mode(CPUMIPSState *env)

{

    set_snan_bit_is_one((env->active_fpu.fcr31 & (1 << FCR31_NAN2008)) == 0,

                        &env->active_fpu.fp_status);

}



static inline void restore_fp_status(CPUMIPSState *env)

{

    restore_rounding_mode(env);

target/mips/msa_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "internal.h"

#include "exec/exec-all.h"

#include "exec/helper-proto.h"

#include "fpu/softfloat.h"



/* Data format min and max values */

#define DF_BITS(df) (1 << ((df) + 3))

target/mips/op_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "exec/exec-all.h"

#include "exec/cpu_ldst.h"

#include "sysemu/kvm.h"

#include "fpu/softfloat.h"



/*****************************************************************************/

/* Exceptions processing helpers */