Skip to contentSkip to conversation

MIPS: math-emu: Do not export function `srl128`

PATCH In review Mathieu Malaterre 2 participants 7 messages Dec 26, 2017 – Dec 27, 2017 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 MIPS: math-emu: Do not export function `srl128`

Fix non-fatal warning:

arch/mips/math-emu/dp_maddf.c:19:6: warning: no previous prototype for ‘srl128’ [-Wmissing-prototypes]
void srl128(u64 *hptr, u64 *lptr, int count)

---
 arch/mips/math-emu/dp_maddf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/math-emu/dp_maddf.c +1 -1
index 7ad79ed411f5..0e2278a47f43 100644
@@ -16,7 +16,7 @@
 
 
 /* 128 bits shift right logical with rounding. */
-void srl128(u64 *hptr, u64 *lptr, int count)
+static void srl128(u64 *hptr, u64 *lptr, int count)
 {
 	u64 low;
 
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/2 MIPS: math-emu: Declare ys variable as possibly unused

Fix non-fatal warning:

arch/mips/math-emu/sp_fdp.c: In function ‘ieee754sp_fdp’:
arch/mips/math-emu/ieee754int.h:60:31: warning: variable ‘ys’ set but not used [-Wunused-but-set-variable]
unsigned int ym; int ye; int ys; int yc

                               ^

arch/mips/math-emu/sp_fdp.c:37:2: note: in expansion of macro ‘COMPYSP’
COMPYSP;
^~~~~~~

---
 arch/mips/math-emu/ieee754int.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/math-emu/ieee754int.h +1 -1
index 06ac0e2ac7ac..cb8f04cd24bf 100644
@@ -57,7 +57,7 @@ static inline int ieee754_class_nan(int xc)
 	unsigned int xm; int xe; int xs __maybe_unused; int xc
 
 #define COMPYSP \
-	unsigned int ym; int ye; int ys; int yc
+	unsigned int ym; int ye; int ys __maybe_unused; int yc
 
 #define COMPZSP \
 	unsigned int zm; int ze; int zs; int zc
Signature · 1 line
2.11.0
#2 lore raw

RE: [PATCH 2/2] MIPS: math-emu: Declare ys variable as possibly unused

Quoted 20 lines

Fix non-fatal warning:

arch/mips/math-emu/sp_fdp.c: In function ‘ieee754sp_fdp’:
arch/mips/math-emu/ieee754int.h:60:31: warning: variable ‘ys’ set but not used [-Wunused-but-set-variable]
unsigned int ym; int ye; int ys; int yc

                               ^

arch/mips/math-emu/sp_fdp.c:37:2: note: in expansion of macro ‘COMPYSP’
COMPYSP;
^~~~~~~

---
 arch/mips/math-emu/ieee754int.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/math-emu/ieee754int.h +0 -0
index 06ac0e2ac7ac..cb8f04cd24bf 100644

arch/mips/math-emu/ieee754int.h static inline int ieee754_class_nan(int xc) · line 63

Quoted 8 lines
arch/mips/math-emu/ieee754int.h +1 -1
@@ -57,7 +57,7 @@ static inline int ieee754_class_nan(int xc)
         unsigned int xm; int xe; int xs __maybe_unused; int xc
 
 #define COMPYSP \
-       unsigned int ym; int ye; int ys; int yc
+       unsigned int ym; int ye; int ys __maybe_unused; int yc
 
 #define COMPZSP \
         unsigned int zm; int ze; int zs; int zc

This will silence the warning, but will do it for all future cases of unused ys too - in other words, it may well silence even useful, valid warnings. Also, this introduces an inconsistency among COMPXSP, COMPYSP, and COMPZSP macros.

A better solution would be to reduce the scope of ys, so that it is always used, if declared. Instead of this code segment (in arch/mips/math-emu/sp_fdp.c):

union ieee754sp ieee754sp_fdp(union ieee754dp x)

{
	union ieee754sp y;
	u32 rm;

	COMPXDP;
	COMPYSP;

	EXPLODEXDP;

	ieee754_clearcx();

	FLUSHXDP;

	switch (xc) {
	case IEEE754_CLASS_SNAN:
		x = ieee754dp_nanxcpt(x);
		EXPLODEXDP;
		/* Fall through.  */
	case IEEE754_CLASS_QNAN:
		y = ieee754sp_nan_fdp(xs, xm);
		if (!ieee754_csr.nan2008) {
			EXPLODEYSP;
			if (!ieee754_class_nan(yc))
				y = ieee754sp_indef();
		}
		return y;

... should be the following: (COMPYSP is moved to a smaller code block)

union ieee754sp ieee754sp_fdp(union ieee754dp x)

{
	union ieee754sp y;
	u32 rm;

	COMPXDP;	

	EXPLODEXDP;

	ieee754_clearcx();

	FLUSHXDP;

	switch (xc) {
	case IEEE754_CLASS_SNAN:
		x = ieee754dp_nanxcpt(x);
		EXPLODEXDP;
		/* Fall through.  */
	case IEEE754_CLASS_QNAN:
		{
			COMPYSP;

			y = ieee754sp_nan_fdp(xs, xm);
			if (!ieee754_csr.nan2008) {
				EXPLODEYSP;
				if (!ieee754_class_nan(yc))
					y = ieee754sp_indef();
			}
			return y;
		}

Regards,
Aleksandar

#3 lore raw

Re: [PATCH 2/2] MIPS: math-emu: Declare ys variable as possibly unused

Aleksandar,

Quoted 90 lines · Aleksandar Markovic
Quoted 20 lines

Fix non-fatal warning:

arch/mips/math-emu/sp_fdp.c: In function ‘ieee754sp_fdp’:
arch/mips/math-emu/ieee754int.h:60:31: warning: variable ‘ys’ set but not used [-Wunused-but-set-variable]
unsigned int ym; int ye; int ys; int yc

                               ^

arch/mips/math-emu/sp_fdp.c:37:2: note: in expansion of macro ‘COMPYSP’
COMPYSP;
^~~~~~~

---
 arch/mips/math-emu/ieee754int.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/math-emu/ieee754int.h +0 -0
index 06ac0e2ac7ac..cb8f04cd24bf 100644

arch/mips/math-emu/ieee754int.h static inline int ieee754_class_nan(int xc) · line 63

Quoted 8 lines
arch/mips/math-emu/ieee754int.h +1 -1
@@ -57,7 +57,7 @@ static inline int ieee754_class_nan(int xc)
         unsigned int xm; int xe; int xs __maybe_unused; int xc
 
 #define COMPYSP \
-       unsigned int ym; int ye; int ys; int yc
+       unsigned int ym; int ye; int ys __maybe_unused; int yc
 
 #define COMPZSP \
         unsigned int zm; int ze; int zs; int zc

This will silence the warning, but will do it for all future cases of unused ys too - in other words, it may well silence even useful, valid warnings. Also, this introduces an inconsistency among COMPXSP, COMPYSP, and COMPZSP macros.

A better solution would be to reduce the scope of ys, so that it is always used, if declared. Instead of this code segment (in arch/mips/math-emu/sp_fdp.c):

union ieee754sp ieee754sp_fdp(union ieee754dp x)

{
        union ieee754sp y;
        u32 rm;

        COMPXDP;
        COMPYSP;

        EXPLODEXDP;

        ieee754_clearcx();

        FLUSHXDP;

        switch (xc) {
        case IEEE754_CLASS_SNAN:
                x = ieee754dp_nanxcpt(x);
                EXPLODEXDP;
                /* Fall through.  */
        case IEEE754_CLASS_QNAN:
                y = ieee754sp_nan_fdp(xs, xm);
                if (!ieee754_csr.nan2008) {
                        EXPLODEYSP;
                        if (!ieee754_class_nan(yc))
                                y = ieee754sp_indef();
                }
                return y;

... should be the following: (COMPYSP is moved to a smaller code block)

union ieee754sp ieee754sp_fdp(union ieee754dp x)

{
        union ieee754sp y;
        u32 rm;

        COMPXDP;

        EXPLODEXDP;

        ieee754_clearcx();

        FLUSHXDP;

        switch (xc) {
        case IEEE754_CLASS_SNAN:
                x = ieee754dp_nanxcpt(x);
                EXPLODEXDP;
                /* Fall through.  */
        case IEEE754_CLASS_QNAN:
                {
                        COMPYSP;
Quoted 9 lines
                        y = ieee754sp_nan_fdp(xs, xm);
                        if (!ieee754_csr.nan2008) {
                                EXPLODEYSP;
                                if (!ieee754_class_nan(yc))
                                        y = ieee754sp_indef();
                        }
                        return y;
                }

Thanks for the suggestion. However the sign bit is still not used, so the warning is still there. Just for clarity did you see that:

#define COMPXSP \
unsigned int xm; int xe; int xs __maybe_unused; int xc

I'll try to give it some more thoughts, and come up with something hopefully working.

-M

Acked-by on v1 1/2
#4 lore raw
In reply to Mathieu Malaterre
Quoted 25 lines

Fix non-fatal warning:

arch/mips/math-emu/dp_maddf.c:19:6: warning: no previous prototype for ‘srl128’ [-Wmissing-prototypes]
void srl128(u64 *hptr, u64 *lptr, int count)

---
 arch/mips/math-emu/dp_maddf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/math-emu/dp_maddf.c +1 -1
index 7ad79ed411f5..0e2278a47f43 100644
@@ -16,7 +16,7 @@
 
 
 /* 128 bits shift right logical with rounding. */
-void srl128(u64 *hptr, u64 *lptr, int count)
+static void srl128(u64 *hptr, u64 *lptr, int count)
 {
         u64 low;
 
Signature · 1 line
2.11.0
#5 lore raw
Quoted 23 lines
Quoted 23 lines

Fix non-fatal warning:

arch/mips/math-emu/dp_maddf.c:19:6: warning: no previous prototype for ‘srl128’ [-Wmissing-prototypes]
void srl128(u64 *hptr, u64 *lptr, int count)

---
 arch/mips/math-emu/dp_maddf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/math-emu/dp_maddf.c +1 -1
index 7ad79ed411f5..0e2278a47f43 100644
@@ -16,7 +16,7 @@
 
 
 /* 128 bits shift right logical with rounding. */
-void srl128(u64 *hptr, u64 *lptr, int count)
+static void srl128(u64 *hptr, u64 *lptr, int count)
 {
         u64 low;
 
Quoted 4 lines
Quoted 2 lines

--
2.11.0

However, there is an already submitted patch: (the code change is identical)

https://www.linux-mips.org/archives/linux-mips/2017-11/msg00044.html

Status of that patch on patchwork is "Accepted".

Regards,
Aleksandar

#6 lore raw
Quoted 28 lines · Aleksandar Markovic
Quoted 23 lines
Quoted 23 lines

Fix non-fatal warning:

arch/mips/math-emu/dp_maddf.c:19:6: warning: no previous prototype for ‘srl128’ [-Wmissing-prototypes]
void srl128(u64 *hptr, u64 *lptr, int count)

---
 arch/mips/math-emu/dp_maddf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/math-emu/dp_maddf.c +1 -1
index 7ad79ed411f5..0e2278a47f43 100644
@@ -16,7 +16,7 @@
 
 
 /* 128 bits shift right logical with rounding. */
-void srl128(u64 *hptr, u64 *lptr, int count)
+static void srl128(u64 *hptr, u64 *lptr, int count)
 {
         u64 low;
 
Quoted 4 lines
Quoted 2 lines

--
2.11.0

Quoted 5 lines

However, there is an already submitted patch: (the code change is identical)

https://www.linux-mips.org/archives/linux-mips/2017-11/msg00044.html

Status of that patch on patchwork is "Accepted".

Sorry did not realized you sent it already.

Thanks