Skip to content

Commit

Permalink
MIPS: math-emu: Eleminate duplicate definitions of identical macros.
Browse files Browse the repository at this point in the history
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed May 23, 2014
1 parent 3e160aa commit b3a7ad2
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 63 deletions.
1 change: 1 addition & 0 deletions arch/mips/math-emu/dp_fsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/


#include "ieee754sp.h"
#include "ieee754dp.h"

union ieee754dp ieee754dp_fsp(union ieee754sp x)
Expand Down
8 changes: 0 additions & 8 deletions arch/mips/math-emu/ieee754.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@
#include "ieee754sp.h"
#include "ieee754dp.h"

#define DP_EBIAS 1023
#define DP_EMIN (-1022)
#define DP_EMAX 1023

#define SP_EBIAS 127
#define SP_EMIN (-126)
#define SP_EMAX 127

/* special constants
*/

Expand Down
30 changes: 2 additions & 28 deletions arch/mips/math-emu/ieee754d.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,34 +28,8 @@
#include <linux/types.h>
#include <linux/printk.h>
#include "ieee754.h"

#define DP_EBIAS 1023
#define DP_EMIN (-1022)
#define DP_EMAX 1023
#define DP_FBITS 52

#define SP_EBIAS 127
#define SP_EMIN (-126)
#define SP_EMAX 127
#define SP_FBITS 23

#define DP_MBIT(x) ((u64)1 << (x))
#define DP_HIDDEN_BIT DP_MBIT(DP_FBITS)
#define DP_SIGN_BIT DP_MBIT(63)


#define SP_MBIT(x) ((u32)1 << (x))
#define SP_HIDDEN_BIT SP_MBIT(SP_FBITS)
#define SP_SIGN_BIT SP_MBIT(31)


#define SPSIGN(sp) (sp.parts.sign)
#define SPBEXP(sp) (sp.parts.bexp)
#define SPMANT(sp) (sp.parts.mant)

#define DPSIGN(dp) (dp.parts.sign)
#define DPBEXP(dp) (dp.parts.bexp)
#define DPMANT(dp) (dp.parts.mant)
#include "ieee754sp.h"
#include "ieee754dp.h"

union ieee754dp ieee754dp_dump(char *m, union ieee754dp x)
{
Expand Down
14 changes: 14 additions & 0 deletions arch/mips/math-emu/ieee754dp.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,20 @@

#define assert(expr) ((void)0)

#define DP_EBIAS 1023
#define DP_EMIN (-1022)
#define DP_EMAX 1023
#define DP_FBITS 52
#define DP_MBITS 52

#define DP_MBIT(x) ((u64)1 << (x))
#define DP_HIDDEN_BIT DP_MBIT(DP_FBITS)
#define DP_SIGN_BIT DP_MBIT(63)

#define DPSIGN(dp) (dp.parts.sign)
#define DPBEXP(dp) (dp.parts.bexp)
#define DPMANT(dp) (dp.parts.mant)

/* 3bit extended double precision sticky right shift */
#define XDPSRS(v,rs) \
((rs > (DP_FBITS+3))?1:((v) >> (rs)) | ((v) << (64-(rs)) != 0))
Expand Down
27 changes: 0 additions & 27 deletions arch/mips/math-emu/ieee754int.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,6 @@

#include "ieee754.h"

#define DP_EBIAS 1023
#define DP_EMIN (-1022)
#define DP_EMAX 1023
#define DP_FBITS 52

#define SP_EBIAS 127
#define SP_EMIN (-126)
#define SP_EMAX 127
#define SP_FBITS 23

#define DP_MBIT(x) ((u64)1 << (x))
#define DP_HIDDEN_BIT DP_MBIT(DP_FBITS)
#define DP_SIGN_BIT DP_MBIT(63)

#define SP_MBIT(x) ((u32)1 << (x))
#define SP_HIDDEN_BIT SP_MBIT(SP_FBITS)
#define SP_SIGN_BIT SP_MBIT(31)


#define SPSIGN(sp) (sp.parts.sign)
#define SPBEXP(sp) (sp.parts.bexp)
#define SPMANT(sp) (sp.parts.mant)

#define DPSIGN(dp) (dp.parts.sign)
#define DPBEXP(dp) (dp.parts.bexp)
#define DPMANT(dp) (dp.parts.mant)

#define CLPAIR(x, y) ((x)*6+(y))

static inline void ieee754_clearcx(void)
Expand Down
14 changes: 14 additions & 0 deletions arch/mips/math-emu/ieee754sp.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,20 @@

#define assert(expr) ((void)0)

#define SP_EBIAS 127
#define SP_EMIN (-126)
#define SP_EMAX 127
#define SP_FBITS 23
#define SP_MBITS 23

#define SP_MBIT(x) ((u32)1 << (x))
#define SP_HIDDEN_BIT SP_MBIT(SP_FBITS)
#define SP_SIGN_BIT SP_MBIT(31)

#define SPSIGN(sp) (sp.parts.sign)
#define SPBEXP(sp) (sp.parts.bexp)
#define SPMANT(sp) (sp.parts.mant)

/* 3bit extended single precision sticky right shift */
#define SPXSRSXn(rs) \
(xe += rs, \
Expand Down
1 change: 1 addition & 0 deletions arch/mips/math-emu/sp_fdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@


#include "ieee754sp.h"
#include "ieee754dp.h"

union ieee754sp ieee754sp_fdp(union ieee754dp x)
{
Expand Down
1 change: 1 addition & 0 deletions arch/mips/math-emu/sp_tlong.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@


#include "ieee754sp.h"
#include "ieee754dp.h"

s64 ieee754sp_tlong(union ieee754sp x)
{
Expand Down

0 comments on commit b3a7ad2

Please sign in to comment.