15 files changed, 159 insertions, 280 deletions

diff --git a/TODO.txt b/TODO.txt
new file mode 100644
index 0000000..e8bf4f7
--- /dev/null
+++ b/TODO.txt
@@ -0,0 +1,2 @@
+- add public method apply move inplace
+- make apply moves work inplace?
diff --git a/tables.h b/constants.h
index fa83c16..c3b9312 100644
--- a/tables.h
+++ b/constants.h
@@ -1,6 +1,72 @@
 #define NORMAL 0
 #define INVERSE 1
 
+#define _2p11  2048U
+#define _2p12  4096U
+#define _3p7   2187U
+#define _3p8   6561U
+#define _12c4  495U
+#define _8c4   70U
+
+#define _c_ufr      0U
+#define _c_ubl      1U
+#define _c_dfl      2U
+#define _c_dbr      3U
+#define _c_ufl      4U
+#define _c_ubr      5U
+#define _c_dfr      6U
+#define _c_dbl      7U
+
+#define _e_uf       0U
+#define _e_ub       1U
+#define _e_db       2U
+#define _e_df       3U
+#define _e_ur       4U
+#define _e_ul       5U
+#define _e_dl       6U
+#define _e_dr       7U
+#define _e_fr       8U
+#define _e_fl       9U
+#define _e_bl       10U
+#define _e_br       11U
+
+#define _eoshift    4U
+#define _coshift    5U
+
+#define _pbits      0xFU
+#define _esepbit1   0x4U
+#define _esepbit2   0x8U
+#define _csepbit    0x4U
+#define _eobit      0x10U
+#define _cobits     0xF0U
+#define _cobits2    0x60U
+#define _ctwist_cw  0x20U
+#define _ctwist_ccw 0x40U
+#define _eflip      0x10U
+#define _error      0xFFU
+
+typedef enum {
+        U, U2, U3, D, D2, D3,
+        R, R2, R3, L, L2, L3,
+        F, F2, F3, B, B2, B3
+} move_t;
+
+typedef enum {
+        UFr, ULr, UBr, URr, DFr, DLr, DBr, DRr,
+        RUr, RFr, RDr, RBr, LUr, LFr, LDr, LBr,
+        FUr, FRr, FDr, FLr, BUr, BRr, BDr, BLr,
+
+        UFm, ULm, UBm, URm, DFm, DLm, DBm, DRm,
+        RUm, RFm, RDm, RBm, LUm, LFm, LDm, LBm,
+        FUm, FRm, FDm, FLm, BUm, BRm, BDm, BLm
+} trans_t;
+
+_static cube_t zero = { .corner = {0}, .edge = {0} };
+_static cube_t solved = {
+        .corner = {0, 1, 2, 3, 4, 5, 6, 7},
+        .edge = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
+};
+
 _static cube_t move_table[] = {
         [U] = {
                 .corner = {5, 4, 2, 3, 0, 1, 6, 7},
diff --git a/cube.c b/cube.c
index 663f271..f04d27d 100644
--- a/cube.c
+++ b/cube.c
@@ -27,208 +27,9 @@
 
 #endif
 
-#define _2p11  2048U
-#define _2p12  4096U
-#define _3p7   2187U
-#define _3p8   6561U
-#define _12c4  495U
-#define _8c4   70U
-
-#define _c_ufr      0U
-#define _c_ubl      1U
-#define _c_dfl      2U
-#define _c_dbr      3U
-#define _c_ufl      4U
-#define _c_ubr      5U
-#define _c_dfr      6U
-#define _c_dbl      7U
-
-#define _e_uf       0U
-#define _e_ub       1U
-#define _e_db       2U
-#define _e_df       3U
-#define _e_ur       4U
-#define _e_ul       5U
-#define _e_dl       6U
-#define _e_dr       7U
-#define _e_fr       8U
-#define _e_fl       9U
-#define _e_bl       10U
-#define _e_br       11U
-
-#define _eoshift    4U
-#define _coshift    5U
-
-#define _pbits      0xFU
-#define _esepbit1   0x4U
-#define _esepbit2   0x8U
-#define _csepbit    0x4U
-#define _eobit      0x10U
-#define _cobits     0xF0U
-#define _cobits2    0x60U
-#define _ctwist_cw  0x20U
-#define _ctwist_ccw 0x40U
-#define _eflip      0x10U
-#define _error      0xFFU
-
-typedef enum {
-        U, U2, U3, D, D2, D3,
-        R, R2, R3, L, L2, L3,
-        F, F2, F3, B, B2, B3
-} move_t;
-
-typedef enum {
-        UFr, ULr, UBr, URr, DFr, DLr, DBr, DRr,
-        RUr, RFr, RDr, RBr, LUr, LFr, LDr, LBr,
-        FUr, FRr, FDr, FLr, BUr, BRr, BDr, BLr,
-
-        UFm, ULm, UBm, URm, DFm, DLm, DBm, DRm,
-        RUm, RFm, RDm, RBm, LUm, LFm, LDm, LBm,
-        FUm, FRm, FDm, FLm, BUm, BRm, BDm, BLm
-} trans_t;
-
-_static cube_t zero = { .corner = {0}, .edge = {0} };
-_static cube_t solved = {
-        .corner = {0, 1, 2, 3, 4, 5, 6, 7},
-        .edge = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}
-};
-
-#include "tables.h"
-
-/******************************************************************************
-Section: portable fast methods
-
-This section contains performance-critical methods that do not use
-advanced CPU instructions. They are used as an alternative to the ones
-in the previous section(s) for unsupported architectures.
-******************************************************************************/
-
-typedef cube_t cube_fast_t;
-
-_static cube_fast_t cubetofast(cube_t);
-_static cube_t fasttocube(cube_fast_t);
-_static_inline bool equal_fast(cube_fast_t, cube_fast_t);
-_static_inline bool issolved_fast(cube_fast_t);
-_static_inline cube_fast_t invertco_fast(cube_fast_t);
-_static_inline cube_fast_t compose_fast(cube_fast_t, cube_fast_t);
-
-_static_inline int64_t coord_fast_co(cube_fast_t);
-_static_inline int64_t coord_fast_eo(cube_fast_t);
-
-_static cube_fast_t
-cubetofast(cube_t cube)
-{
-        cube_fast_t fast;
-        memcpy(&fast, &cube, sizeof(cube_fast_t));
-        return fast;
-}
-
-_static cube_t
-fasttocube(cube_fast_t fast)
-{
-        cube_t cube;
-        memcpy(&cube, &fast, sizeof(cube_fast_t));
-        return cube;
-}
-
-_static_inline bool
-equal_fast(cube_fast_t c1, cube_fast_t c2)
-{
-        uint8_t i;
-        bool ret;
-
-        ret = true;
-        for (i = 0; i < 8; i++)
-                ret = ret && c1.corner[i] == c2.corner[i];
-        for (i = 0; i < 12; i++)
-                ret = ret && c1.edge[i] == c2.edge[i];
-
-        return ret;
-}
-
-_static_inline bool
-issolved_fast(cube_fast_t cube)
-{
-        return equal_fast(cube, solved);
-}
-
-_static_inline cube_fast_t
-invertco_fast(cube_fast_t c)
-{
-        uint8_t i, piece, orien;
-        cube_fast_t ret;
-
-        ret = c;
-        for (i = 0; i < 8; i++) {
-                piece = c.corner[i];
-                orien = ((piece << 1) | (piece >> 1)) & _cobits2;
-                ret.corner[i] = (piece & _pbits) | orien;
-        }
-
-        return ret;
-}
-
-_static_inline cube_fast_t
-compose_fast(cube_fast_t c1, cube_fast_t c2)
-{
-        cube_fast_t ret;
-        uint8_t i, piece1, piece2, p, orien, aux, auy;
-
-        ret = zero;
-
-        for (i = 0; i < 12; i++) {
-                piece2 = c2.edge[i];
-                p = piece2 & _pbits;
-                piece1 = c1.edge[p];
-                orien = (piece2 ^ piece1) & _eobit;
-                ret.edge[i] = (piece1 & _pbits) | orien;
-        }
-
-        for (i = 0; i < 8; i++) {
-                piece2 = c2.corner[i];
-                p = piece2 & _pbits;
-                piece1 = c1.corner[p];
-                aux = (piece2 & _cobits) + (piece1 & _cobits);
-                auy = (aux + _ctwist_cw) >> 2U;
-                orien = (aux + auy) & _cobits2;
-                ret.corner[i] = (piece1 & _pbits) | orien;
-        }
-
-        return ret;
-}
-
-_static_inline int64_t
-coord_fast_co(cube_fast_t c)
-{
-        int i, p;
-        int64_t ret;
-
-        for (ret = 0, i = 0, p = 1; i < 7; i++, p *= 3)
-                ret += p * (c.corner[i] >> _coshift);
-
-        return ret;
-}
-
-_static_inline int64_t
-coord_fast_eo(cube_fast_t c)
-{
-        int i, p;
-        int64_t ret;
-
-        for (ret = 0, i = 1, p = 1; i < 12; i++, p *= 2)
-                ret += p * (c.edge[i] >> _eoshift);
-
-        return ret;
-}
-
-/******************************************************************************
-Section: generic methods
-
-This section contains generic functionality, including the public functions.
-Some of these routines depend on the efficient functions implemented in the
-previous sections, while some other operate directly on the cube.
-******************************************************************************/
+#include "constants.h"
 
+_static_inline cube_t invertco(cube_t);
 _static int permsign(uint8_t *, int);
 _static uint8_t readco(char *);
 _static uint8_t readcp(char *);
@@ -245,8 +46,8 @@ _static uint8_t readmodifier(char);
 _static uint8_t readtrans(char *);
 _static int writemoves(uint8_t *, int, char *);
 _static void writetrans(uint8_t, char *);
-_static cube_fast_t move(cube_fast_t, move_t);
-_static cube_fast_t transform(cube_fast_t, trans_t);
+_static cube_t move(cube_t, move_t);
+_static cube_t transform(cube_t, trans_t);
 
 cube_t
 cube_new(void)
@@ -393,10 +194,33 @@ cube_error(cube_t cube)
 cube_t
 cube_compose(cube_t c1, cube_t c2)
 {
+        cube_t ret;
+        uint8_t i, piece1, piece2, p, orien, aux, auy;
+
         DBG_ASSERT(cube_consistent(c1) && cube_consistent(c2),
             zero, "cube_compose error: inconsistent cube\n")
 
-        return fasttocube(compose_fast(cubetofast(c1), cubetofast(c2)));
+        ret = zero;
+
+        for (i = 0; i < 12; i++) {
+                piece2 = c2.edge[i];
+                p = piece2 & _pbits;
+                piece1 = c1.edge[p];
+                orien = (piece2 ^ piece1) & _eobit;
+                ret.edge[i] = (piece1 & _pbits) | orien;
+        }
+
+        for (i = 0; i < 8; i++) {
+                piece2 = c2.corner[i];
+                p = piece2 & _pbits;
+                piece1 = c1.corner[p];
+                aux = (piece2 & _cobits) + (piece1 & _cobits);
+                auy = (aux + _ctwist_cw) >> 2U;
+                orien = (aux + auy) & _cobits2;
+                ret.corner[i] = (piece1 & _pbits) | orien;
+        }
+
+        return ret;
 }
 
 cube_t
@@ -428,14 +252,14 @@ cube_inverse(cube_t cube)
 cube_t
 applymoves(cube_t cube, char *buf)
 {
-        cube_fast_t fast;
+        cube_t ret;
         uint8_t r, m;
         char *b;
 
         DBG_ASSERT(cube_consistent(cube), zero,
             "move error: inconsistent cube\n");
 
-        fast = cubetofast(cube);
+        ret = cube_clone(cube);
 
         for (b = buf; *b != '\0'; b++) {
                 while (*b == ' ' || *b == '\t' || *b == '\n')
@@ -446,11 +270,11 @@ applymoves(cube_t cube, char *buf)
                         goto applymoves_error;
                 if ((m = readmodifier(*(b+1))) != 0)
                         b++;
-                fast = move(fast, r + m);
+                ret = move(ret, r + m);
         }
 
 applymoves_finish:
-        return fasttocube(fast);
+        return ret;
 
 applymoves_error:
         DBG_LOG("applymoves error\n");
@@ -460,17 +284,41 @@ applymoves_error:
 cube_t
 applytrans(cube_t cube, char *buf)
 {
-        cube_fast_t fast;
+        cube_t ret;
         uint8_t t;
 
         DBG_ASSERT(cube_consistent(cube), zero,
             "transformation error: inconsistent cube\n");
 
         t = readtrans(buf);
-        fast = cubetofast(cube);
-        fast = transform(fast, t);
+        ret = cube_clone(cube);
+        ret = transform(ret, t);
 
-        return fasttocube(fast);
+        return cube_clone(ret);
+}
+
+int64_t
+cube_coord_co(cube_t c)
+{
+        int i, p;
+        int64_t ret;
+
+        for (ret = 0, i = 0, p = 1; i < 7; i++, p *= 3)
+                ret += p * (c.corner[i] >> _coshift);
+
+        return ret;
+}
+
+int64_t
+cube_coord_eo(cube_t c)
+{
+        int i, p;
+        int64_t ret;
+
+        for (ret = 0, i = 1, p = 1; i < 12; i++, p *= 2)
+                ret += p * (c.edge[i] >> _eoshift);
+
+        return ret;
 }
 
 cube_t
@@ -808,14 +656,31 @@ writetrans(uint8_t t, char *buf)
         buf[11] = '\0';
 }
 
-_static cube_fast_t
-move(cube_fast_t c, move_t m)
+_static cube_t
+move(cube_t c, move_t m)
+{
+        return cube_compose(c, move_table[m]);
+}
+
+_static_inline cube_t
+invertco(cube_t c)
 {
-        return compose_fast(c, move_table[m]);
+        uint8_t i, piece, orien;
+        cube_t ret;
+
+        ret = c;
+        for (i = 0; i < 8; i++) {
+                piece = c.corner[i];
+                orien = ((piece << 1) | (piece >> 1)) & _cobits2;
+                ret.corner[i] = (piece & _pbits) | orien;
+        }
+
+        return ret;
 }
 
-_static cube_fast_t
-transform(cube_fast_t c, trans_t t)
+
+_static cube_t
+transform(cube_t c, trans_t t)
 {
         cube_t tcube, tinv;
 
@@ -823,28 +688,15 @@ transform(cube_fast_t c, trans_t t)
         tinv = trans_table[t][INVERSE];
 
         return t < 24 ?
-            compose_fast(compose_fast(tcube, c), tinv) :
-            invertco_fast(compose_fast(compose_fast(tcube, c), tinv));
+            cube_compose(cube_compose(tcube, c), tinv) :
+            invertco(cube_compose(cube_compose(tcube, c), tinv));
 }
 
+/* TODO: expose or remove, maybe add inverse move */
 _static_inline uint8_t inverse_trans(uint8_t);
-_static_inline uint8_t movebase(uint8_t);
-_static_inline uint8_t moveaxis(uint8_t);
 
 _static_inline uint8_t
 inverse_trans(uint8_t t)
 {
         return inverse_trans_table[t];
 }
-
-_static_inline uint8_t
-movebase(uint8_t move)
-{
-        return move / 3;
-}
-
-_static_inline uint8_t
-moveaxis(uint8_t move)
-{
-        return move / 6;
-}
diff --git a/cube.h b/cube.h
index f70e04a..77c6c21 100644
--- a/cube.h
+++ b/cube.h
@@ -33,6 +33,9 @@ bool cube_error(cube_t);
 cube_t cube_compose(cube_t, cube_t);
 cube_t cube_inverse(cube_t);
 
+int64_t cube_coord_co(cube_t);
+int64_t cube_coord_eo(cube_t);
+
 /******************************************************************************
 Read / write utilities
 
diff --git a/debugcube.o b/debugcube.o
deleted file mode 100644
index a37ffff..0000000
--- a/debugcube.o
+++ /dev/null
diff --git a/test/001_cube_conversion/00_solved.in b/test/001_cube_conversion/00_solved.in
deleted file mode 100644
index dff224d..0000000
--- a/test/001_cube_conversion/00_solved.in
+++ /dev/null
@@ -1 +0,0 @@
-UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0
diff --git a/test/001_cube_conversion/00_solved.out b/test/001_cube_conversion/00_solved.out
deleted file mode 100644
index dff224d..0000000
--- a/test/001_cube_conversion/00_solved.out
+++ /dev/null
@@ -1 +0,0 @@
-UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0
diff --git a/test/001_cube_conversion/01_scrambled.in b/test/001_cube_conversion/01_scrambled.in
deleted file mode 100644
index 453cc8a..0000000
--- a/test/001_cube_conversion/01_scrambled.in
+++ /dev/null
@@ -1 +0,0 @@
-BL1 DB0 UL1 DF0 BR1 UF1 DL0 FL1 UB0 DR1 FR1 UR1 UBR2 UBL1 DFR2 DBL2 DBR0 DFL0 UFR0 UFL2
diff --git a/test/001_cube_conversion/01_scrambled.out b/test/001_cube_conversion/01_scrambled.out
deleted file mode 100644
index 453cc8a..0000000
--- a/test/001_cube_conversion/01_scrambled.out
+++ /dev/null
@@ -1 +0,0 @@
-BL1 DB0 UL1 DF0 BR1 UF1 DL0 FL1 UB0 DR1 FR1 UR1 UBR2 UBL1 DFR2 DBL2 DBR0 DFL0 UFR0 UFL2
diff --git a/test/001_cube_conversion/cube_conversion_tests.c b/test/001_cube_conversion/cube_conversion_tests.c
deleted file mode 100644
index fe8a68f..0000000
--- a/test/001_cube_conversion/cube_conversion_tests.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "../test.h"
-
-cube_fast_t cubetofast(cube_t);
-cube_t fasttocube(cube_fast_t);
-bool equal(cube_t, cube_t);
-
-int main(void) {
-        char cubestr[STRLENMAX];
-        cube_t cube, cube2;
-        cube_fast_t fast;
-
-        fgets(cubestr, STRLENMAX, stdin);
-        cube = readcube("H48", cubestr);
-        fast = cubetofast(cube);
-        cube2 = fasttocube(fast);
-
-        if (cube_error(cube)) {
-                printf("Error reading cube\n");
-        } else if (cube_error(cube2)) {
-                printf("Error converting cube\n");
-        } else {
-                writecube("H48", cube2, cubestr);
-                printf("%s\n", cubestr);
-        }
-
-        return 0;
-}
diff --git a/test/050_compose/compose_tests.c b/test/050_compose/compose_tests.c
index c0bbbef..3bf6c34 100644
--- a/test/050_compose/compose_tests.c
+++ b/test/050_compose/compose_tests.c
@@ -1,7 +1,5 @@
 #include "../test.h"
 
-cube_t compose(cube_t, cube_t);
-
 int main(void) {
         char str[STRLENMAX];
         cube_t c1, c2, c3;
@@ -11,7 +9,7 @@ int main(void) {
         fgets(str, STRLENMAX, stdin);
         c2 = readcube("H48", str);
 
-        c3 = compose(c1, c2);
+        c3 = cube_compose(c1, c2);
 
         if (cube_error(c3)) {
                 printf("Error composing cubes\n");
diff --git a/test/071_coord_eo/coord_eo_tests.c b/test/071_coord_eo/coord_eo_tests.c
index 85128e0..5951042 100644
--- a/test/071_coord_eo/coord_eo_tests.c
+++ b/test/071_coord_eo/coord_eo_tests.c
@@ -1,19 +1,14 @@
 #include "../test.h"
 
-int64_t coord_fast_eo(cube_fast_t);
-cube_fast_t cubetofast(cube_t);
-
 int main(void) {
         char str[STRLENMAX];
         cube_t cube;
-        cube_fast_t fast;
         int64_t result;
 
         fgets(str, STRLENMAX, stdin);
         cube = readcube("H48", str);
-        fast = cubetofast(cube);
 
-        result = coord_fast_eo(fast);
+        result = cube_coord_eo(cube);
 
         printf("%" PRId64 "\n", result);
 
diff --git a/test/072_coord_co/coord_co_tests.c b/test/072_coord_co/coord_co_tests.c
index bb061e5..aa4136b 100644
--- a/test/072_coord_co/coord_co_tests.c
+++ b/test/072_coord_co/coord_co_tests.c
@@ -1,19 +1,14 @@
 #include "../test.h"
 
-int64_t coord_fast_co(cube_fast_t);
-cube_fast_t cubetofast(cube_t);
-
 int main(void) {
         char str[STRLENMAX];
         cube_t cube;
-        cube_fast_t fast;
         int64_t result;
 
         fgets(str, STRLENMAX, stdin);
         cube = readcube("H48", str);
-        fast = cubetofast(cube);
 
-        result = coord_fast_co(fast);
+        result = cube_coord_co(cube);
 
         printf("%" PRId64 "\n", result);
 
diff --git a/test/last.err b/test/last.err
deleted file mode 100644
index e69de29..0000000
--- a/test/last.err
+++ /dev/null
diff --git a/test/last.out b/test/last.out
deleted file mode 100644
index 102ac1b..0000000
--- a/test/last.out
+++ /dev/null
@@ -1 +0,0 @@
-UL1 UB0 DL1 UR0 BL1 DR1 BR0 DB0 FL1 UF0 FR1 DF0 DFR2 DFL0 DBL0 UFL0 UBR1 UBL0 UFR2 DBR1