Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31cbea60 authored by Manuel Lauss's avatar Manuel Lauss Committed by Greg Kroah-Hartman
Browse files

MIPS: math-emu: do not use bools for arithmetic 



[ Upstream commit 8535f2ba0a9b971df62a5890699b9dfe2e0d5580 ]

GCC-7 complains about a boolean value being used with an arithmetic
AND:

arch/mips/math-emu/cp1emu.c: In function 'cop1Emulate':
arch/mips/math-emu/cp1emu.c:838:14: warning: '~' on a boolean expression [-Wbool-operation]
  fpr = (x) & ~(cop1_64bit(xcp) == 0);    \
              ^
arch/mips/math-emu/cp1emu.c:1068:3: note: in expansion of macro 'DITOREG'
   DITOREG(dval, MIPSInst_RT(ir));
   ^~~~~~~
arch/mips/math-emu/cp1emu.c:838:14: note: did you mean to use logical not?
  fpr = (x) & ~(cop1_64bit(xcp) == 0);    \

Since cop1_64bit() returns and int, just flip the LSB.

Suggested-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Reviewed-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17058/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 32b21348

arch/mips/math-emu/cp1emu.c

+2 −2
Original line number Diff line number Diff line
@@ -828,12 +828,12 @@ do { \ 
} while (0)



#define DIFROMREG(di, x)						\

	((di) = get_fpr64(&ctx->fpr[(x) & ~(cop1_64bit(xcp) == 0)], 0))

	((di) = get_fpr64(&ctx->fpr[(x) & ~(cop1_64bit(xcp) ^ 1)], 0))



#define DITOREG(di, x)							\

do {									\

	unsigned fpr, i;						\

	fpr = (x) & ~(cop1_64bit(xcp) == 0);				\

	fpr = (x) & ~(cop1_64bit(xcp) ^ 1);				\

	set_fpr64(&ctx->fpr[fpr], 0, di);				\

	for (i = 1; i < ARRAY_SIZE(ctx->fpr[x].val64); i++)		\

		set_fpr64(&ctx->fpr[fpr], i, 0);			\