diff --git a/tests/fpu/fpu.c b/tests/fpu/fpu.c
index 79ba7fa..c13110f 100644
--- a/tests/fpu/fpu.c
+++ b/tests/fpu/fpu.c
@@ -1496,34 +1496,105 @@ struct fmavals {
 	unsigned long nfma;
 	unsigned long nfms;
 } fmavals[] = {
+	/* +0 * +0 +- +0 -> +0, +0, -0, -0 */
 	{ 0x0000000000000000, 0x0000000000000000, 0x0000000000000000,
 	  0x0000000000000000, 0x0000000000000000, 0x8000000000000000, 0x8000000000000000 },
+	/* +0 * NaNC +- +0 -> NaNC, NaNC, NaNC, NaNC */
 	{ 0x0000000000000000, 0x7ffc000000000000, 0x0000000000000000,
 	  0x7ffc000000000000, 0x7ffc000000000000, 0x7ffc000000000000, 0x7ffc000000000000 },
+	/* +0 * NaNC +- NaNB -> NaNB, NaNB, NaNB, NaNB */
 	{ 0x0000000000000000, 0x7ffc000000000000, 0x7ffb000000000000,
 	  0x7ffb000000000000, 0x7ffb000000000000, 0x7ffb000000000000, 0x7ffb000000000000 },
+	/* NaNA * NaNC +- NaNB -> NaNA, NaNA, NaNA, NaNA */
 	{ 0x7ffa000000000000, 0x7ffc000000000000, 0x7ffb000000000000,
 	  0x7ffa000000000000, 0x7ffa000000000000, 0x7ffa000000000000, 0x7ffa000000000000 },
+	/* +1.0 * -0 +- +finite B -> +B, -B, -B, +B */
 	{ 0x3ff0000000000000, 0x8000000000000000, 0x678123456789abcd, 
 	  0x678123456789abcd, 0xe78123456789abcd, 0xe78123456789abcd, 0x678123456789abcd },
+	/* +1.0 * -1.0 +- (B = +3.818e+190) -> +B, -B, -B, +B */
 	{ 0x3ff0000000000000, 0xbff0000000000000, 0x678123456789abcd, 
 	  0x678123456789abcd, 0xe78123456789abcd, 0xe78123456789abcd, 0x678123456789abcd },
+	/* +inf * -1.0 +- +finite B -> -inf, -inf, +inf, +inf */
 	{ 0x7ff0000000000000, 0xbff0000000000000, 0x678123456789abcd, 
 	  0xfff0000000000000, 0xfff0000000000000, 0x7ff0000000000000, 0x7ff0000000000000 },
+	/* +inf * +0 +- +finite B -> NaNQ, NaNQ, NaNQ, NaNQ */
 	{ 0x7ff0000000000000, 0x0000000000000000, 0x678123456789abcd, 
 	  0x7ff8000000000000, 0x7ff8000000000000, 0x7ff8000000000000, 0x7ff8000000000000 },
+	/* +1.0 * +1.0 +- 1.00000012 -> +2.00000012, +1.2e-7, -2.00000012, -1.2e-7 */
 	{ 0x3ff0000000000000, 0x3ff0000000000000, 0x3ff0000020000000, 
 	  0x4000000010000000, 0xbe80000000000000, 0xc000000010000000, 0x3e80000000000000 },
+	/* +(1 + 2^-52) * +(1 + 2^-52) +- +1.0 -> +(2 + 2^-51), +2^-51, -(2 + 2^-51), -2^-51 */
 	{ 0x3ff0000000000001, 0x3ff0000000000001, 0x3ff0000000000000,
 	  0x4000000000000001, 0x3cc0000000000000, 0xc000000000000001, 0xbcc0000000000000 },
+	/* +(1 + 3*2^-52) * +(1 + 2^-51) +- +1.0 -> +(2 + 2^-50), +5 * 2^-52 + 2^-101, -, - */
 	{ 0x3ff0000000000003, 0x3ff0000000000002, 0x3ff0000000000000,
 	  0x4000000000000002, 0x3cd4000000000002, 0xc000000000000002, 0xbcd4000000000002 },
+	/* +2.443e-77 * 2.828 +- 6.909e-77 -> -1.402e-93, +1.382e-76, +1.402e-93, -1.382e-76 */
 	{ 0x3006a09e667f3bcc, 0x4006a09e667f3bcd, 0xb020000000000000,
 	  0xaca765753908cd20, 0x3030000000000000, 0x2ca765753908cd20, 0xb030000000000000 },
+	/* +2.443e-77 * 2.828 +- 6.909e-77 -> +9.446e-93, +1.382e-76, -9.446e-93, -1.382e-76 */
 	{ 0x3006a09e667f3bcd, 0x4006a09e667f3bcd, 0xb020000000000000,
 	  0x2cd3b3efbf5e2229, 0x3030000000000000, 0xacd3b3efbf5e2229, 0xb030000000000000 },
+	/* +2.443e-77 * 2.828 +- -1.1055e-75 -> -1.0364e-75, +1.1746e-75, +1.0364e-75, -1.1746e-75 */
 	{ 0x3006a09e667f3bcc, 0x4006a09e667f3bcd, 0xb060003450000000,
 	  0xb05e0068a0000000, 0x3061003450000000, 0x305e0068a0000000, 0xb061003450000000 },
+	/* +2 * +3 +- 3 -> +9, +3, -9, -3 */
+	{ 0x4000000000000000, 0x4008000000000000, 0x4008000000000000,
+	  0x4022000000000000, 0x4008000000000000, 0xc022000000000000, 0xc008000000000000 },
+	/* +2 * +3 +- 5 -> +11, +1, -11, -1 */
+	{ 0x4000000000000000, 0x4008000000000000, 0x4014000000000000,
+	  0x4026000000000000, 0x3ff0000000000000, 0xc026000000000000, 0xbff0000000000000 },
+	/* +2 * +3 +- 7 -> +13, -1, -13, +1 */
+	{ 0x4000000000000000, 0x4008000000000000, 0x401c000000000000,
+	  0x402a000000000000, 0xbff0000000000000, 0xc02a000000000000, 0x3ff0000000000000 },
+	/* +2 * +3 +- 9 -> +15, -3, -15, +3 */
+	{ 0x4000000000000000, 0x4008000000000000, 0x4022000000000000,
+	  0x402e000000000000, 0xc008000000000000, 0xc02e000000000000, 0x4008000000000000 },
+	/* +2 * +3 +- -3 -> +3, +9, -3, -9 */
+	{ 0x4000000000000000, 0x4008000000000000, 0xc008000000000000,
+	  0x4008000000000000, 0x4022000000000000, 0xc008000000000000, 0xc022000000000000 },
+	/* +2 * +3 +- -5 -> +1, +11, -1, -11 */
+	{ 0x4000000000000000, 0x4008000000000000, 0xc014000000000000,
+	  0x3ff0000000000000, 0x4026000000000000, 0xbff0000000000000, 0xc026000000000000 },
+	/* +2 * +3 +- -7 -> -1, +13, +1, -13 */
+	{ 0x4000000000000000, 0x4008000000000000, 0xc01c000000000000,
+	  0xbff0000000000000, 0x402a000000000000, 0x3ff0000000000000, 0xc02a000000000000 },
+	/* +2 * +3 +- -9 -> -3, +15, +3, -15 */
+	{ 0x4000000000000000, 0x4008000000000000, 0xc022000000000000,
+	  0xc008000000000000, 0x402e000000000000, 0x4008000000000000, 0xc02e000000000000 },
+	/* +2 * -3 +- 3 -> -3, -9, +3, +9 */
+	{ 0x4000000000000000, 0xc008000000000000, 0x4008000000000000,
+	  0xc008000000000000, 0xc022000000000000, 0x4008000000000000, 0x4022000000000000 },
+	/* +2 * -3 +- 5 -> -1, -11, +1, +11 */
+	{ 0x4000000000000000, 0xc008000000000000, 0x4014000000000000,
+	  0xbff0000000000000, 0xc026000000000000, 0x3ff0000000000000, 0x4026000000000000 },
+	/* +2 * -3 +- 7 -> +1, -13, -1, +13 */
+	{ 0x4000000000000000, 0xc008000000000000, 0x401c000000000000,
+	  0x3ff0000000000000, 0xc02a000000000000, 0xbff0000000000000, 0x402a000000000000 },
+	/* +2 * -3 +- 9 -> +3, -15, -3, +15 */
+	{ 0x4000000000000000, 0xc008000000000000, 0x4022000000000000,
+	  0x4008000000000000, 0xc02e000000000000, 0xc008000000000000, 0x402e000000000000 },
+	/* -2 * +3 +- -3 -> -9, -3, +9, +3 */
+	{ 0xc000000000000000, 0x4008000000000000, 0xc008000000000000,
+	  0xc022000000000000, 0xc008000000000000, 0x4022000000000000, 0x4008000000000000 },
+	/* -2 * +3 +- -5 -> -11, -1, +11, +1 */
+	{ 0xc000000000000000, 0x4008000000000000, 0xc014000000000000,
+	  0xc026000000000000, 0xbff0000000000000, 0x4026000000000000, 0x3ff0000000000000 },
+	/* -2 * +3 +- -7 -> -13, +1, +13, -1 */
+	{ 0xc000000000000000, 0x4008000000000000, 0xc01c000000000000,
+	  0xc02a000000000000, 0x3ff0000000000000, 0x402a000000000000, 0xbff0000000000000 },
+	/* -2 * +3 +- -9 -> -15, +3, +15, -3 */
+	{ 0xc000000000000000, 0x4008000000000000, 0xc022000000000000,
+	  0xc02e000000000000, 0x4008000000000000, 0x402e000000000000, 0xc008000000000000 },
+	/* -2 * +3 +- +0 -> -6, -6, +6, +6 */
+	{ 0xc000000000000000, 0x4008000000000000, 0x0000000000000000,
+	  0xc018000000000000, 0xc018000000000000, 0x4018000000000000, 0x4018000000000000 },
+	/* +2 * -3 +- -0 -> -6, -6, +6, +6 */
+	{ 0x4000000000000000, 0xc008000000000000, 0x8000000000000000,
+	  0xc018000000000000, 0xc018000000000000, 0x4018000000000000, 0x4018000000000000 },
+	/* 2^-1026 * (1.5 * 2^1023) +- -0 -> (1.5 * 2^-3), ditto, -ditto, -ditto */
+	{ 0x0001000000000000, 0x7fe8000000000000, 0x8000000000000000,
+	  0x3fc8000000000000, 0x3fc8000000000000, 0xbfc8000000000000, 0xbfc8000000000000 },
 };
 
 int test23(long arg)
diff --git a/tests/test_fpu.bin b/tests/test_fpu.bin
index cc6c1cc..24878af 100755
Binary files a/tests/test_fpu.bin and b/tests/test_fpu.bin differ