hmmhmmhmm

Author: imaami

src/debruijn26.c

@@ -51,12 +51,12 @@ uint3x32_set (uint3x32 *const x,
 	return x;
 }
 
-static const_inline uint3
+static const_inline unsigned
 uint3x32_get (uint3x32 const *const x,
               unsigned const        i)
 {
-	return uint3((((uint16_t)x->value[(i+1U & 31U) * 3U >> 3U] << 8U)
-	              | x->value[(i & 31U) * 3U >> 3U]) >> (i & 7U) & 7U);
+	return (((uint16_t)x->value[(i+1U & 31U) * 3U >> 3U] << 8U)
+	        | x->value[(i & 31U) * 3U >> 3U]) >> (i & 7U) & 7U;
 }
 
 #else
@@ -86,11 +86,11 @@ uint3x32_set (uint3x32 *const x,
 	return x;
 }
 
-static const_inline uint3
+static const_inline unsigned
 uint3x32_get (uint3x32 const *const x,
               unsigned        const i)
 {
-	return uint3((*x >> (3U * i)) & 7U);
+	return (*x >> (3U * i)) & 7U;
 }
 #endif
 
@@ -203,7 +203,7 @@ main (int    c,
 				printf("%08" PRIx32 "%08" PRIx32 "%08" PRIx32 "\n",
 				       tmp.u32[2], tmp.u32[1], tmp.u32[0]);
 				uint64_t seq = b26_seq_compose2(&bs);
-				(void)fprintf(stderr, "0x%016" PRIx64 "\n", seq);
+				(void)printf("0x%016" PRIx64 "\n", seq);
 			}
 		}
 	}
@@ -214,36 +214,21 @@ main (int    c,
 	b26_data = b26_load(b26_bin_file, false);
 	if (b26_data) {
 		for (size_t i = 0; i < 67108834U; ++i) {
-			struct b26_bits bs = {0};
-			struct b26_bits_2 bs2 = {0};
-			if (!b26_decompose2(b26_data[i], &bs2)) {
+			struct b26_bits_2 bs = {0};
+			if (!b26_decompose2(b26_data[i], &bs)) {
 				(void)fprintf(stderr, "can't decompose2"
 				              " 0x%016" PRIx64 " (%zu)"
 				              "\n", b26_data[i], i);
 				break;
 			}
-			if (!b26_decompose(b26_data[i], &bs)) {
-				(void)fprintf(stderr, "can't decompose"
-				              " 0x%016" PRIx64 " (%zu)"
-				              "\n", b26_data[i], i);
-				break;
-			}
-			uint64_t seq = b26_seq_compose(&bs, 0);
-			uint64_t seq2 = b26_seq_compose2(&bs2);
-			if (seq2 != b26_data[i]) {
+			uint64_t seq = b26_seq_compose2(&bs);
+			if (seq != b26_data[i]) {
 				(void)fprintf(stderr, "can't compose2 "
 				              "0x%016" PRIx64 " (%zu)\n",
 				              b26_data[i], i);
 				break;
 			}
-			if (seq != b26_data[i]) {
-				(void)fprintf(stderr, "can't compose "
-				              "0x%016" PRIx64 " (%zu) "
-				              "from %016" PRIx64 "%016"
-				              PRIx64 "\n", b26_data[i],
-				              i, bs.u64[1], bs.u64[0]);
-				break;
-			}
+			(void)printf("0x%016" PRIx64 "\n", seq);
 			//printf("%016" PRIx64 "%016" PRIx64 "\n",
 			//       bs.u64[1], bs.u64[0]);
 		}
@@ -340,12 +325,23 @@ b26_seq_compose2 (struct b26_bits_2 const *const bits)
 	unsigned i = 32U;
 	unsigned is_1 = bits->is_1;
 	do {
-		uint3 x = uint3x32_get(&bits->data, --i);
+		unsigned n = uint3x32_get(&bits->data, --i);
 		seq += is_1;
-		seq <<= uint3_get(x);
+		seq <<= n;
 		seq -= is_1;
+		printf("\033[%c;3%cm\xe2\x96%c", (char)('0'+is_1),
+		       (char)('0'+n+(n<6U)), (char)(0x80+n));
+		is_1 ^= 1U;
+	} while (i);
+	puts("\033[m");
+	i = 32U;
+	is_1 = bits->is_1;
+	do {
+		unsigned n = uint3x32_get(&bits->data, --i);
+		putchar('0' + (int)n);
 		is_1 ^= 1U;
 	} while (i);
+	putchar('\n');
 	return rol(seq, bits->wrap);
 }
 
@@ -417,7 +413,6 @@ static bool
 b26_decompose2 (uint64_t                 seq,
                 struct b26_bits_2 *const bits)
 {
-	(void)printf("0x%016" PRIx64 "\n", seq);
 	struct b26_bitcount bc = {0};
 	unsigned nbit = count_msb_0(seq);
 	unsigned is_1 = !nbit;