bswap.h: Remove unused float-access functions

The float-access functions stfl_*, stfq*, ldfl* and ldfq* are now
unused; remove them.  (Accesses to float64 and float32 types can be
made with the ldl/stl/ldq/stq functions, as float64 and float32 are
guaranteed to be typedefs for normal integer types.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210208113428.7181-6-peter.maydell@linaro.org>
Message-Id: <20210211122750.22645-15-alex.bennee@linaro.org>
This commit is contained in:
Peter Maydell 2021-02-11 12:27:49 +00:00 committed by Alex Bennée
parent b81cff9cd9
commit f930224fff
3 changed files with 5 additions and 77 deletions

View File

@ -24,16 +24,12 @@ potentially unaligned pointer values.
Function names follow the pattern: Function names follow the pattern:
load: ``ld{type}{sign}{size}_{endian}_p(ptr)`` load: ``ld{sign}{size}_{endian}_p(ptr)``
store: ``st{type}{size}_{endian}_p(ptr, val)`` store: ``st{size}_{endian}_p(ptr, val)``
``type``
- (empty) : integer access
- ``f`` : float access
``sign`` ``sign``
- (empty) : for 32 or 64 bit sizes (including floats and doubles) - (empty) : for 32 or 64 bit sizes
- ``u`` : unsigned - ``u`` : unsigned
- ``s`` : signed - ``s`` : signed
@ -67,8 +63,8 @@ of size ``sz`` bytes.
Regexes for git grep Regexes for git grep
- ``\<ldf\?[us]\?[bwlq]\(_[hbl]e\)\?_p\>`` - ``\<ld[us]\?[bwlq]\(_[hbl]e\)\?_p\>``
- ``\<stf\?[bwlq]\(_[hbl]e\)\?_p\>`` - ``\<st[bwlq]\(_[hbl]e\)\?_p\>``
- ``\<ldn_\([hbl]e\)?_p\>`` - ``\<ldn_\([hbl]e\)?_p\>``
- ``\<stn_\([hbl]e\)?_p\>`` - ``\<stn_\([hbl]e\)?_p\>``

View File

@ -125,13 +125,9 @@ static inline void tswap64s(uint64_t *s)
#define ldsw_p(p) ldsw_be_p(p) #define ldsw_p(p) ldsw_be_p(p)
#define ldl_p(p) ldl_be_p(p) #define ldl_p(p) ldl_be_p(p)
#define ldq_p(p) ldq_be_p(p) #define ldq_p(p) ldq_be_p(p)
#define ldfl_p(p) ldfl_be_p(p)
#define ldfq_p(p) ldfq_be_p(p)
#define stw_p(p, v) stw_be_p(p, v) #define stw_p(p, v) stw_be_p(p, v)
#define stl_p(p, v) stl_be_p(p, v) #define stl_p(p, v) stl_be_p(p, v)
#define stq_p(p, v) stq_be_p(p, v) #define stq_p(p, v) stq_be_p(p, v)
#define stfl_p(p, v) stfl_be_p(p, v)
#define stfq_p(p, v) stfq_be_p(p, v)
#define ldn_p(p, sz) ldn_be_p(p, sz) #define ldn_p(p, sz) ldn_be_p(p, sz)
#define stn_p(p, sz, v) stn_be_p(p, sz, v) #define stn_p(p, sz, v) stn_be_p(p, sz, v)
#else #else
@ -139,13 +135,9 @@ static inline void tswap64s(uint64_t *s)
#define ldsw_p(p) ldsw_le_p(p) #define ldsw_p(p) ldsw_le_p(p)
#define ldl_p(p) ldl_le_p(p) #define ldl_p(p) ldl_le_p(p)
#define ldq_p(p) ldq_le_p(p) #define ldq_p(p) ldq_le_p(p)
#define ldfl_p(p) ldfl_le_p(p)
#define ldfq_p(p) ldfq_le_p(p)
#define stw_p(p, v) stw_le_p(p, v) #define stw_p(p, v) stw_le_p(p, v)
#define stl_p(p, v) stl_le_p(p, v) #define stl_p(p, v) stl_le_p(p, v)
#define stq_p(p, v) stq_le_p(p, v) #define stq_p(p, v) stq_le_p(p, v)
#define stfl_p(p, v) stfl_le_p(p, v)
#define stfq_p(p, v) stfq_le_p(p, v)
#define ldn_p(p, sz) ldn_le_p(p, sz) #define ldn_p(p, sz) ldn_le_p(p, sz)
#define stn_p(p, sz, v) stn_le_p(p, sz, v) #define stn_p(p, sz, v) stn_le_p(p, sz, v)
#endif #endif

View File

@ -400,36 +400,6 @@ static inline void stq_le_p(void *ptr, uint64_t v)
stq_he_p(ptr, le_bswap(v, 64)); stq_he_p(ptr, le_bswap(v, 64));
} }
/* float access */
static inline float32 ldfl_le_p(const void *ptr)
{
CPU_FloatU u;
u.l = ldl_le_p(ptr);
return u.f;
}
static inline void stfl_le_p(void *ptr, float32 v)
{
CPU_FloatU u;
u.f = v;
stl_le_p(ptr, u.l);
}
static inline float64 ldfq_le_p(const void *ptr)
{
CPU_DoubleU u;
u.ll = ldq_le_p(ptr);
return u.d;
}
static inline void stfq_le_p(void *ptr, float64 v)
{
CPU_DoubleU u;
u.d = v;
stq_le_p(ptr, u.ll);
}
static inline int lduw_be_p(const void *ptr) static inline int lduw_be_p(const void *ptr)
{ {
return (uint16_t)be_bswap(lduw_he_p(ptr), 16); return (uint16_t)be_bswap(lduw_he_p(ptr), 16);
@ -465,36 +435,6 @@ static inline void stq_be_p(void *ptr, uint64_t v)
stq_he_p(ptr, be_bswap(v, 64)); stq_he_p(ptr, be_bswap(v, 64));
} }
/* float access */
static inline float32 ldfl_be_p(const void *ptr)
{
CPU_FloatU u;
u.l = ldl_be_p(ptr);
return u.f;
}
static inline void stfl_be_p(void *ptr, float32 v)
{
CPU_FloatU u;
u.f = v;
stl_be_p(ptr, u.l);
}
static inline float64 ldfq_be_p(const void *ptr)
{
CPU_DoubleU u;
u.ll = ldq_be_p(ptr);
return u.d;
}
static inline void stfq_be_p(void *ptr, float64 v)
{
CPU_DoubleU u;
u.d = v;
stq_be_p(ptr, u.ll);
}
static inline unsigned long leul_to_cpu(unsigned long v) static inline unsigned long leul_to_cpu(unsigned long v)
{ {
#if HOST_LONG_BITS == 32 #if HOST_LONG_BITS == 32