diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-31 22:40:08 -0800 |
| commit | ea8b347dc5d375572d8d19770024ec8be5fd5017 (patch) | |
| tree | 56bb75b1f071a749b7e90218d0d6b0e9265657bb /src/arch/arm/insts | |
| parent | e88165a431a90cf7e33e205794caed898ca6fcb1 (diff) | |
| parent | 7d4f18770073d968c70cd3ffcdd117f50a6056a2 (diff) | |
| download | gem5-ea8b347dc5d375572d8d19770024ec8be5fd5017.tar.xz | |
Merge with head, hopefully the last time for this batch.
Diffstat (limited to 'src/arch/arm/insts')
| -rw-r--r-- | src/arch/arm/insts/static_inst.hh | 1 | ||||
| -rw-r--r-- | src/arch/arm/insts/vfp.hh | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/arch/arm/insts/static_inst.hh b/src/arch/arm/insts/static_inst.hh index d65555822..c36024ecd 100644 --- a/src/arch/arm/insts/static_inst.hh +++ b/src/arch/arm/insts/static_inst.hh @@ -46,6 +46,7 @@ #include "arch/arm/utility.hh" #include "base/trace.hh" #include "cpu/static_inst.hh" +#include "sim/byteswap.hh" #include "sim/full_system.hh" namespace ArmISA diff --git a/src/arch/arm/insts/vfp.hh b/src/arch/arm/insts/vfp.hh index 57b74d040..b3582a351 100644 --- a/src/arch/arm/insts/vfp.hh +++ b/src/arch/arm/insts/vfp.hh @@ -107,6 +107,9 @@ enum VfpRoundingMode VfpRoundZero = 3 }; +static inline float bitsToFp(uint64_t, float); +static inline uint32_t fpToBits(float); + template <class fpType> static inline bool flushToZero(fpType &op) |