diff options
| author | Peter Maydell | 2016-02-19 17:49:49 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-02-19 17:49:49 +0100 |
| commit | 3ba32c100a51fcfd0ff367a5c40d4e84e206dd3a (patch) | |
| tree | 22fe10debc32a1085c575c59a04aea22d2512d8a /include | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-02-19' into... (diff) | |
| parent | MAINTAINERS: Add section for FPU emulation (diff) | |
| download | qemu-3ba32c100a51fcfd0ff367a5c40d4e84e206dd3a.tar.gz qemu-3ba32c100a51fcfd0ff367a5c40d4e84e206dd3a.tar.xz qemu-3ba32c100a51fcfd0ff367a5c40d4e84e206dd3a.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-softfloat-20160219' into staging
softfloat queue:
* update MAINTAINERS with a section for softfloat
* drop all the uses of int_fast*_t types
# gpg: Signature made Fri 19 Feb 2016 16:34:35 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
* remotes/pmaydell/tags/pull-softfloat-20160219:
MAINTAINERS: Add section for FPU emulation
osdep.h: Remove int_fast*_t Solaris compatibility code
fpu: Use plain 'int' rather than 'int_fast16_t' for exponents
fpu: Use plain 'int' rather than 'int_fast16_t' for shift counts
fpu: Remove use of int_fast16_t in conversions to int16
target-mips: Stop using uint_fast*_t types in r4k_tlb_t struct
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/fpu/softfloat.h | 16 | ||||
| -rw-r--r-- | include/qemu/osdep.h | 7 |
2 files changed, 8 insertions, 15 deletions
diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index 575a7398cf..624ed61661 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -362,10 +362,10 @@ extern const float16 float16_default_nan; /*---------------------------------------------------------------------------- | Software IEC/IEEE single-precision conversion routines. *----------------------------------------------------------------------------*/ -int_fast16_t float32_to_int16(float32, float_status *status); -uint_fast16_t float32_to_uint16(float32, float_status *status); -int_fast16_t float32_to_int16_round_to_zero(float32, float_status *status); -uint_fast16_t float32_to_uint16_round_to_zero(float32, float_status *status); +int16_t float32_to_int16(float32, float_status *status); +uint16_t float32_to_uint16(float32, float_status *status); +int16_t float32_to_int16_round_to_zero(float32, float_status *status); +uint16_t float32_to_uint16_round_to_zero(float32, float_status *status); int32_t float32_to_int32(float32, float_status *status); int32_t float32_to_int32_round_to_zero(float32, float_status *status); uint32_t float32_to_uint32(float32, float_status *status); @@ -474,10 +474,10 @@ extern const float32 float32_default_nan; /*---------------------------------------------------------------------------- | Software IEC/IEEE double-precision conversion routines. *----------------------------------------------------------------------------*/ -int_fast16_t float64_to_int16(float64, float_status *status); -uint_fast16_t float64_to_uint16(float64, float_status *status); -int_fast16_t float64_to_int16_round_to_zero(float64, float_status *status); -uint_fast16_t float64_to_uint16_round_to_zero(float64, float_status *status); +int16_t float64_to_int16(float64, float_status *status); +uint16_t float64_to_uint16(float64, float_status *status); +int16_t float64_to_int16_round_to_zero(float64, float_status *status); +uint16_t float64_to_uint16_round_to_zero(float64, float_status *status); int32_t float64_to_int32(float64, float_status *status); int32_t float64_to_int32_round_to_zero(float64, float_status *status); uint32_t float64_to_uint32(float64, float_status *status); diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index cc055c909e..431cf71364 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -84,13 +84,6 @@ extern int daemon(int, int); #include "qapi/error.h" -#if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10 -/* [u]int_fast*_t not in <sys/int_types.h> */ -typedef unsigned char uint_fast8_t; -typedef unsigned int uint_fast16_t; -typedef signed int int_fast16_t; -#endif - #ifndef O_LARGEFILE #define O_LARGEFILE 0 #endif |