From 13275a4bb8696e730a4fffdd05b8e1d046e489c6 Mon Sep 17 00:00:00 2001
From: Sebastiano Tronto <sebastiano@tronto.net>
Date: Sun, 19 Nov 2023 10:40:49 +0100
Subject: Simplified cube definition for move and transformations even more

---
 utils/genmovecode.sh  | 16 +++++-----------
 utils/gentranscode.sh | 17 +++++++++--------
 utils/h48_to_avx.c    | 19 -------------------
 utils/h48_to_lst.c    | 19 +++++++++++++++++++
 utils/h48_to_src.c    | 19 -------------------
 5 files changed, 33 insertions(+), 57 deletions(-)
 delete mode 100644 utils/h48_to_avx.c
 create mode 100644 utils/h48_to_lst.c
 delete mode 100644 utils/h48_to_src.c

(limited to 'utils')

diff --git a/utils/genmovecode.sh b/utils/genmovecode.sh
index 9d5fa7a..d6440e5 100755
--- a/utils/genmovecode.sh
+++ b/utils/genmovecode.sh
@@ -1,21 +1,15 @@
 #!/bin/sh
 
-type="${1:-src}"
-
-gcc -DDEBUG h48_to_"$type".c ../cube.c -o h48_to_"$type"
-
-lineavx() { printf '#define _move_cube_%s ' "$1"; }
-linesrc() { printf '_static cube_fast_t _move_cube_%s = ' "$1"; }
-sedavx() { sed '1,2s/$/ \\/ ; 3s/$/)/ ; 3q'; }
-sedsrc() { sed '3s/$/ };/ ; 3q'; }
+gcc -DDEBUG h48_to_lst.c ../cube.c -o h48_to_lst
 
 gen() {
 	for f in move_??_*.txt; do
 		move="$(echo $f | sed 's/.*_// ; s/\.txt//')"
-		line$type "$move"
-		./h48_to_"$type" <"$f" | sed$type
+		printf '#define _move_cube_%s fastcube( \\\n    ' "$move"
+		./h48_to_lst <"$f"
+		printf ')\n'
 	done
 }
 
 gen
-rm -f h48_to_"$type" invert
+rm -f h48_to_lst invert
diff --git a/utils/gentranscode.sh b/utils/gentranscode.sh
index b9d41b6..f9aeb7b 100755
--- a/utils/gentranscode.sh
+++ b/utils/gentranscode.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-type="${1:-src}"
-
-gcc -DDEBUG h48_to_"$type".c ../cube.c -o h48_to_"$type"
+gcc -DDEBUG h48_to_lst.c ../cube.c -o h48_to_lst
 gcc -DDEBUG invert.c ../cube.c -o invert
 
 lineavx() { printf '#define _trans_cube_%s ' "$1"; }
@@ -13,12 +11,15 @@ sedsrc() { sed '3s/$/ };/ ; 3q'; }
 gen() {
 	for f in transform_??_???.txt; do
 		trans="$(echo $f | sed 's/.*_// ; s/\.txt//')"
-		line$type "$trans"
-		./h48_to_"$type" <"$f" | sed$type
-		line$type "${trans}_inverse"
-		./invert <"$f" | ./h48_to_"$type" | sed$type
+		printf '#define _trans_cube_%s fastcube( \\\n    ' "$trans"
+		./h48_to_lst <"$f"
+		printf ')\n'
+		printf '#define _trans_cube_%s_inverse fastcube( \\\n    ' \
+			"$trans"
+		./invert <"$f" | ./h48_to_lst
+		printf ')\n'
 	done
 }
 
 gen
-rm -f h48_to_"$type" invert
+rm -f h48_to_lst invert
diff --git a/utils/h48_to_avx.c b/utils/h48_to_avx.c
deleted file mode 100644
index ba82366..0000000
--- a/utils/h48_to_avx.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <stdio.h>
-#include <inttypes.h>
-#include <stdbool.h>
-
-#include "../cube.h"
-
-#define STRLENMAX 1000
-
-int main() {
-	char str[STRLENMAX];
-	cube_t cube;
-
-	fgets(str, STRLENMAX, stdin);
-	cube = readcube("H48", str);
-	writecube("AVX", cube, str);
-	fputs(str, stdout);
-
-	return 0;
-}
diff --git a/utils/h48_to_lst.c b/utils/h48_to_lst.c
new file mode 100644
index 0000000..debb7f4
--- /dev/null
+++ b/utils/h48_to_lst.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include <inttypes.h>
+#include <stdbool.h>
+
+#include "../cube.h"
+
+#define STRLENMAX 1000
+
+int main() {
+	char str[STRLENMAX];
+	cube_t cube;
+
+	fgets(str, STRLENMAX, stdin);
+	cube = readcube("H48", str);
+	writecube("LST", cube, str);
+	fputs(str, stdout);
+
+	return 0;
+}
diff --git a/utils/h48_to_src.c b/utils/h48_to_src.c
deleted file mode 100644
index 6fdea5c..0000000
--- a/utils/h48_to_src.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <stdio.h>
-#include <inttypes.h>
-#include <stdbool.h>
-
-#include "../cube.h"
-
-#define STRLENMAX 1000
-
-int main() {
-	char str[STRLENMAX];
-	cube_t cube;
-
-	fgets(str, STRLENMAX, stdin);
-	cube = readcube("H48", str);
-	writecube("SRC", cube, str);
-	fputs(str, stdout);
-
-	return 0;
-}
-- 
cgit v1.3