added tests for fcmp/dcmp

Author: ZERICO2005

test/floating_point/compare/src/cmp_test.s

@@ -2,6 +2,22 @@
 
 	.section	.text
 
+	.global	_crt_fcmp
+	.type	_crt_fcmp, @function
+_crt_fcmp:
+	ld	iy, 0
+	add	iy, sp
+	ld	hl, (iy + 3)
+	ld	e, (iy + 6)
+	ld	bc, (iy + 9)
+	ld	a, (iy + 12)
+	call	__fpcmp
+	push	af
+	pop	hl
+	ld	a, l
+	ret
+	.extern	__fpcmp
+
 	.global	_crt_fcmpo
 	.type	_crt_fcmpo, @function
 _crt_fcmpo:
@@ -34,6 +50,28 @@ _crt_fcmpu:
 	ret
 	.extern	__fpcmpu
 
+	.global	_crt_dcmp
+	.type	_crt_dcmp, @function
+_crt_dcmp:
+	ld	iy, 0
+	add	iy, sp
+	ld	hl, (iy + 18)
+	push	hl
+	ld	hl, (iy + 15)
+	push	hl
+	ld	hl, (iy + 12)
+	push	hl
+	ld	bc, (iy + 9)
+	ld	de, (iy + 6)
+	ld	hl, (iy + 3)
+	call	__dcmp
+	push	af
+	pop	hl
+	ld	a, l
+	ld	sp, iy
+	ret
+	.extern	__dcmp
+
 	.global	_crt_dcmpo
 	.type	_crt_dcmpo, @function
 _crt_dcmpo:

test/floating_point/compare/src/main.cpp

@@ -15,7 +15,7 @@
 //------------------------------------------------------------------------------
 
 // define to 0 or 1
-#define DEBUG_DIAGNOSTICS 0
+#define DEBUG_DIAGNOSTICS 1
 
 //------------------------------------------------------------------------------
 // Tables
@@ -176,12 +176,29 @@ static inline uint64_t f64_to_u64(long double x) {
 //------------------------------------------------------------------------------
 
 extern "C" {
+uint8_t crt_fcmp(uint32_t LHS, uint32_t RHS);
 uint8_t crt_fcmpo(uint32_t LHS, uint32_t RHS);
 uint8_t crt_fcmpu(uint32_t LHS, uint32_t RHS);
+uint8_t crt_dcmp(uint64_t LHS, uint64_t RHS);
 uint8_t crt_dcmpo(uint64_t LHS, uint64_t RHS);
 uint8_t crt_dcmpu(uint64_t LHS, uint64_t RHS);
 }
 
+static constexpr bool  EQ_O = true;
+static constexpr bool NEQ_U = false;
+
+static constexpr bool  LT_O = true;
+static constexpr bool NLT_U = false;
+
+static constexpr bool NGE_U = true;
+static constexpr bool  GE_O = false;
+
+static constexpr bool NLG_U = true;
+static constexpr bool  LG_O = false;
+
+static constexpr bool ORDER = true;
+static constexpr bool UNORD = false;
+
 static bool test_fcmp(
     uint32_t LHS, uint32_t RHS,
     bool truth_o_zero,
@@ -190,25 +207,41 @@ static bool test_fcmp(
     bool truth_u_zero,
     bool truth_u_carry
 ) {
+    uint8_t cmpc = crt_fcmp(LHS, RHS);
     uint8_t cmpo = crt_fcmpo(LHS, RHS);
     uint8_t cmpu = crt_fcmpu(LHS, RHS);
+    bool ordered = (truth_u_carry == ORDER);
+    bool truth_c_zero = truth_o_zero;
+    bool truth_c_sign = truth_o_sign;
+    bool cmpc_fail = (ordered && (
+        (((cmpc & (1 << 6)) != 0) != truth_c_zero ) ||
+        (((cmpc & (1 << 7)) != 0) != truth_c_sign )
+    ));
     if (
         (((cmpo & (1 << 6)) != 0) != truth_o_zero ) ||
         (((cmpo & (1 << 0)) != 0) != truth_o_carry) ||
         (((cmpo & (1 << 7)) != 0) != truth_o_sign ) ||
         (((cmpu & (1 << 6)) != 0) != truth_u_zero ) ||
-        (((cmpu & (1 << 0)) != 0) != truth_u_carry)
+        (((cmpu & (1 << 0)) != 0) != truth_u_carry) ||
+        cmpc_fail
     ) {
         test_printf(
-            "LHS %08lX\nRHS %08lX\nOT %c%c-----%c !=\nOG %08b\nUT -%c-----%c !=\nUG %08b\n",
+            "LHS %08lX\nRHS %08lX\n"
+            "OT %c%c-----%c !=\nOG %08b\n"
+            "UT -%c-----%c !=\nUG %08b\n"
+            "CT %c%c------ %c=\nCG %08b\n",
             LHS, RHS,
             truth_o_sign ? '1' : '0',
             truth_o_zero ? '1' : '0',
             truth_o_carry ? '1' : '0',
             cmpo,
             truth_u_zero ? '1' : '0',
             truth_u_carry ? '1' : '0',
-            cmpu
+            cmpu,
+            !ordered ? '?' : (truth_c_sign ? '1' : '0'),
+            !ordered ? '?' : (truth_c_zero ? '1' : '0'),
+            !ordered ? '?' : '!',
+            cmpc
         );
         return false;
     }
@@ -223,25 +256,41 @@ static bool test_dcmp(
     bool truth_u_zero,
     bool truth_u_carry
 ) {
+    uint8_t cmpc = crt_dcmp(LHS, RHS);
     uint8_t cmpo = crt_dcmpo(LHS, RHS);
     uint8_t cmpu = crt_dcmpu(LHS, RHS);
+    bool ordered = (truth_u_carry == ORDER);
+    bool truth_c_zero = truth_o_zero;
+    bool truth_c_sign = truth_o_sign;
+    bool cmpc_fail = (ordered && (
+        (((cmpc & (1 << 6)) != 0) != truth_c_zero ) ||
+        (((cmpc & (1 << 7)) != 0) != truth_c_sign )
+    ));
     if (
         (((cmpo & (1 << 6)) != 0) != truth_o_zero ) ||
         (((cmpo & (1 << 0)) != 0) != truth_o_carry) ||
         (((cmpo & (1 << 7)) != 0) != truth_o_sign ) ||
         (((cmpu & (1 << 6)) != 0) != truth_u_zero ) ||
-        (((cmpu & (1 << 0)) != 0) != truth_u_carry)
+        (((cmpu & (1 << 0)) != 0) != truth_u_carry) ||
+        cmpc_fail
     ) {
         test_printf(
-            "LHS %016llX\nRHS %016llX\nOT %c%c-----%c !=\nOG %08b\nUT -%c-----%c !=\nUG %08b\n",
+            "LHS %016llX\nRHS %016llX\n"
+            "OT %c%c-----%c !=\nOG %08b\n"
+            "UT -%c-----%c !=\nUG %08b\n"
+            "CT %c%c------ %c=\nCG %08b\n",
             LHS, RHS,
             truth_o_sign ? '1' : '0',
             truth_o_zero ? '1' : '0',
             truth_o_carry ? '1' : '0',
             cmpo,
             truth_u_zero ? '1' : '0',
             truth_u_carry ? '1' : '0',
-            cmpu
+            cmpu,
+            !ordered ? '?' : (truth_c_sign ? '1' : '0'),
+            !ordered ? '?' : (truth_c_zero ? '1' : '0'),
+            !ordered ? '?' : '!',
+            cmpc
         );
         return false;
     }
@@ -284,21 +333,6 @@ static bool test_dcmp(
     );
 }
 
-static constexpr bool  EQ_O = true;
-static constexpr bool NEQ_U = false;
-
-static constexpr bool  LT_O = true;
-static constexpr bool NLT_U = false;
-
-static constexpr bool NGE_U = true;
-static constexpr bool  GE_O = false;
-
-static constexpr bool NLG_U = true;
-static constexpr bool  LG_O = false;
-
-static constexpr bool ORDER = true;
-static constexpr bool UNORD = false;
-
 int fcmp_basic_test(void) {
     // test signed zero
     C(test_fcmp(+0.0f, +0.0f, EQ_O, NLT_U, GE_O, NLG_U, ORDER));