edhoc 1.0.5 → 1.1.1

package/external/libedhoc/externals/zcbor/tests/unit/test3_float16/src/main.c

@@ -10,7 +10,7 @@
 
 ZTEST(zcbor_unit_tests3, test_skip)
 {
-	printk("Skip on VERBOSE builds because of print output volume.\n");
+	printf("Skip on VERBOSE builds because of print output volume.\n");
 }
 
 #else /* ZCBOR_VERBOSE */
@@ -18,7 +18,6 @@ ZTEST(zcbor_unit_tests3, test_skip)
 #include <zephyr/ztest.h>
 #include "zcbor_decode.h"
 #include "zcbor_encode.h"
-#include "zcbor_debug.h"
 
 #include <math.h>
 
@@ -34,6 +33,8 @@ extern uint8_t _binary_fp_bytes_decode_bin_start[];
 extern uint8_t _binary_fp_bytes_decode_bin_end[];
 extern uint8_t _binary_fp_bytes_decode_bin_size[];
 
+#define F16_MANTISSA_MSK 0x3FF /* Bitmask for the mantissa. */
+
 ZTEST(zcbor_unit_tests3, test_float16_decode)
 {
 #ifdef ZCBOR_BIG_ENDIAN
@@ -43,7 +44,9 @@ ZTEST(zcbor_unit_tests3, test_float16_decode)
 #endif
 	uint8_t payload[3] = {0xf9, 0, 0};
 
-	zassert_equal((size_t)&_binary_fp_bytes_decode_bin_size, 0x10000 * sizeof(float) * 2, "0x%x != 0x%x", (size_t)&_binary_fp_bytes_decode_bin_size, 0x10000 * sizeof(float));
+	zassert_equal((size_t)&_binary_fp_bytes_decode_bin_size, 0x10000 * sizeof(float) * 2,
+			"0x%x != 0x%x", (size_t)&_binary_fp_bytes_decode_bin_size,
+			0x10000 * sizeof(float));
 
 	for (int i = 0; i <= 0xFFFF; i++) {
 		uint16_t i_be = i;
@@ -53,19 +56,31 @@ ZTEST(zcbor_unit_tests3, test_float16_decode)
 		*(uint16_t *)&payload[1] = i_be;
 
 		float out;
-		ZCBOR_STATE_D(state_d, 0, payload, sizeof(payload), 1);
+		ZCBOR_STATE_D(state_d, 0, payload, sizeof(payload), 1, 0);
+		ZCBOR_STATE_E(state_e, 0, payload, sizeof(payload), 0);
 
 		zassert_true(zcbor_float16_decode(state_d, &out), NULL);
+		zassert_true(zcbor_float16_put(state_e, out));
+
+
+		uint16_t payload_ne = *(uint16_t *)&payload[1];
+#ifndef ZCBOR_BIG_ENDIAN
+		payload_ne = switch_bytes(payload_ne);
+#endif
+
 		if (isnan(fps[i])) {
 			zassert_true(isnan(out), "Expected NaN (i = %d)\n", i);
+			/* Mask out mantissa when comparing NaNs. */
+			zassert_equal(payload_ne & ~F16_MANTISSA_MSK, i & ~F16_MANTISSA_MSK,
+					"0x%04x != 0x%04x", payload_ne, i);
+			/* Just check that mantissa is non-zero. */
+			zassert_true(payload_ne & F16_MANTISSA_MSK, NULL);
 		} else {
-			zassert_equal(out, fps[i], "Failed i 0x%x (0x%x != 0x%x)\n", i, *(uint32_t *)&out, *(uint32_t *)&fps[i]);
+			zassert_equal(out, fps[i], "Failed i 0x%x (0x%x != 0x%x)\n",
+					i, *(uint32_t *)&out, *(uint32_t *)&fps[i]);
+			zassert_equal(payload_ne, i,
+					"0x%04x != 0x%04x", payload_ne, i);
 		}
-
-		ZCBOR_STATE_E(state_e, 0, payload, sizeof(payload), 0);
-
-		zassert_true(zcbor_float16_put(state_e, out));
-		zassert_equal(*(uint16_t *)&payload[1], i_be, NULL);
 	}
 }
 
@@ -101,7 +116,7 @@ extern uint8_t _binary_fp_bytes_encode_bin_size[];
 /* Return float16 results from fp_bytes_encode.bin */
 static uint16_t get_fp_bytes()
 {
-#ifdef CONFIG_BIG_ENDIAN
+#ifdef ZCBOR_BIG_ENDIAN
 	uint32_t *fps = ((uint32_t *)_binary_fp_bytes_encode_bin_start) + 31742;
 #else
 	uint32_t *fps = (uint32_t *)_binary_fp_bytes_encode_bin_start;
@@ -116,72 +131,59 @@ static uint16_t get_fp_bytes()
 	return retval + 1;
 }
 
+void print_percent(uint32_t i)
+{
+	if ((i % 0x800000) == 0) {
+		static const uint8_t move_cursor_up[] = {0x1b, 0x5b, 0x41, 0};
+		printf("%s", move_cursor_up);
+		printf("\r%d%%\n", (int)((double)(i) / 0x80000000 * 100));
+	}
+}
+
 
 /* Test a single value, and its negative counterpart. */
 static void do_test(uint32_t i, uint16_t exp_value)
 {
-	uint8_t payload[6];
-
-	ZCBOR_STATE_E(state_e, 0, payload, sizeof(payload), 0);
 	uint32_t i2 = i + 0x80000000; /* Negative i */
 
 	/* Reinterpret as floats. */
 	float in = *(float *)&i;
 	float in2 = *(float *)&i2;
 
-	zassert_true(zcbor_float16_put(state_e, in), NULL); /* Encode positive i */
-	zassert_true(zcbor_float16_put(state_e, in2), NULL); /* Encode negative i (i2). */
+	uint16_t out = zcbor_float32_to_16(in);
+	uint16_t out2 = zcbor_float32_to_16(in2);
 
-#ifndef ZCBOR_BIG_ENDIAN
-	*(uint16_t*)&payload[1] = switch_bytes(*(uint16_t*)&payload[1]);
-	*(uint16_t*)&payload[4] = switch_bytes(*(uint16_t*)&payload[4]);
-#endif
-
-	if ((i % 0x800000) == 0) {
-		static const uint8_t move_cursor_up[] = {0x1b, 0x5b, 0x41, 0};
-		printk("%s", move_cursor_up);
-		printk("\r%d%%\n", (int)((double)(i) / 0x80000000 * 100));
-	}
+	print_percent(i);
 
 	/* Check positive and negative. */
-	zassert_true((*(uint16_t*)&payload[1] == exp_value)
-				&& (*(uint16_t*)&payload[4] == exp_value + 0x8000),
+	zassert_true((out == exp_value)	&& (out2 == (exp_value + 0x8000)),
 			"Failed i 0x%x (0x%x != 0x%x) or (0x%x != 0x%x)\n", i,
-			*(uint16_t*)&payload[1], exp_value,
-			*(uint16_t*)&payload[4], exp_value + 0x8000);
+			out, exp_value, out2, exp_value + 0x8000);
 }
 
 
 static void do_test_nan(uint32_t i)
 {
-	uint8_t payload[6];
-	ZCBOR_STATE_E(state_e, 0, payload, sizeof(payload), 0);
-	ZCBOR_STATE_D(state_d, 0, payload, sizeof(payload), 2);
 	float in = *(float *)&i;
 	uint32_t i2 = i + 0x80000000;
 	float in2 = *(float *)&i2;
-	float out;
-	float out2;
 
-	if (((i + 1) % 0x800000) == 0) {
-		static const uint8_t move_cursor_up[] = {0x1b, 0x5b, 0x41, 0};
-		printk("%s", move_cursor_up);
-		printk("\r%d%%\n", (int)((double)(i + 1) / 0x80000000 * 100));
-	}
+	print_percent(i);
+
+	uint16_t out = zcbor_float32_to_16(in);
+	uint16_t out2 = zcbor_float32_to_16(in2);
+	float out3 = zcbor_float16_to_32(out);
+	float out4 = zcbor_float16_to_32(out2);
 
-	zassert_true(zcbor_float16_put(state_e, in), NULL);
-	zassert_true(zcbor_float16_put(state_e, in2), NULL);
-	zassert_true(zcbor_float16_decode(state_d, &out), NULL);
-	zassert_true(zcbor_float16_decode(state_d, &out2), NULL);
-	zassert_true(isnan(out), "Expected NaN: 0x%x (i = 0x%x)\n", switch_bytes(*(uint16_t *)&payload[1]), i);
-	zassert_true(isnan(out2), "Expected NaN: 0x%x (i = 0x%x)\n", switch_bytes(*(uint16_t *)&payload[4]), i2);
+	zassert_true(isnan(out3), "Expected NaN: 0x%x (i = 0x%x)\n", out, i);
+	zassert_true(isnan(out4), "Expected NaN: 0x%x (i = 0x%x)\n", out2, i2);
 }
 
 
 ZTEST(zcbor_unit_tests3, test_float16_encode)
 {
 	zassert_equal((size_t)&_binary_fp_bytes_encode_bin_size, 31742 * 4 * 2, NULL);
-	printk("\n");
+	printf("\n");
 
 	for (uint32_t i = START_ZERO; i < START_NONZERO_FINITE; i++) {
 		do_test(i, 0);
@@ -196,7 +198,6 @@ ZTEST(zcbor_unit_tests3, test_float16_encode)
 		do_test_nan(i);
 	}
 }
-
 #endif /* ZCBOR_VERBOSE */
 
 ZTEST_SUITE(zcbor_unit_tests3, NULL, NULL, NULL, NULL, NULL);