1 files changed, 18 insertions, 18 deletions

diff --git a/src/solvers/coord/solve.h b/src/solvers/coord/solve.h
index 9ea6d1a..6bb9af2 100644
--- a/src/solvers/coord/solve.h
+++ b/src/solvers/coord/solve.h
@@ -13,20 +13,20 @@ typedef struct {
         const unsigned char *ptable;
 } dfsarg_solve_coord_t;
 
-STATIC int64_t solve_coord(oriented_cube_t, coord_t [static 1], uint8_t,
+STATIC int64_t solve_coord(oriented_cube_t, coord_t [NON_NULL], uint8_t,
     uint8_t, uint8_t, uint8_t, uint64_t, uint8_t, uint8_t, uint64_t,
     const unsigned char *, size_t, char *, int (*)(void *), void *);
 STATIC long long solve_coord_dispatch(oriented_cube_t, const char *, unsigned,
     unsigned, unsigned, unsigned, unsigned, unsigned, unsigned long long,
     const unsigned char *, unsigned, char *,
-    long long [static NISSY_SIZE_SOLVE_STATS], int (*)(void *), void *);
-STATIC bool coord_solution_admissible(const dfsarg_solve_coord_t [static 1]);
-STATIC bool coord_continue_onnormal(const dfsarg_solve_coord_t [static 1]);
-STATIC bool coord_continue_oninverse(const dfsarg_solve_coord_t [static 1]);
-STATIC int64_t solve_coord_dfs(dfsarg_solve_coord_t [static 1]);
+    long long [SIZE(NISSY_SIZE_SOLVE_STATS)], int (*)(void *), void *);
+STATIC bool coord_solution_admissible(const dfsarg_solve_coord_t [NON_NULL]);
+STATIC bool coord_continue_onnormal(const dfsarg_solve_coord_t [NON_NULL]);
+STATIC bool coord_continue_oninverse(const dfsarg_solve_coord_t [NON_NULL]);
+STATIC int64_t solve_coord_dfs(dfsarg_solve_coord_t [NON_NULL]);
 
 STATIC bool
-coord_solution_admissible(const dfsarg_solve_coord_t arg[static 1])
+coord_solution_admissible(const dfsarg_solve_coord_t arg[NON_NULL])
 {
         uint8_t n;
 
@@ -39,7 +39,7 @@ coord_solution_admissible(const dfsarg_solve_coord_t arg[static 1])
 }
 
 STATIC bool
-coord_continue_onnormal(const dfsarg_solve_coord_t arg[static 1])
+coord_continue_onnormal(const dfsarg_solve_coord_t arg[NON_NULL])
 {
         uint8_t flag, nn, ni, swbound_n, swbound_i, pval;
         uint64_t coord;
@@ -93,7 +93,7 @@ coord_continue_onnormal(const dfsarg_solve_coord_t arg[static 1])
 }
 
 STATIC bool
-coord_continue_oninverse(const dfsarg_solve_coord_t arg[static 1])
+coord_continue_oninverse(const dfsarg_solve_coord_t arg[NON_NULL])
 {
         uint8_t flag, nn, ni, swbound_n, swbound_i, pval;
         uint64_t coord;
@@ -147,12 +147,11 @@ coord_continue_oninverse(const dfsarg_solve_coord_t arg[static 1])
 }
 
 STATIC int64_t
-solve_coord_dfs(dfsarg_solve_coord_t arg[static 1])
+solve_coord_dfs(dfsarg_solve_coord_t arg[NON_NULL])
 {
         bool lastbackup;
         uint8_t m, l, nnbackup, nibackup, nmoves;
-        uint32_t mm;
-        uint64_t coord;
+        uint64_t mm, coord;
         int64_t n, ret;
         cube_t backup_cube, backup_inverse;
 
@@ -190,7 +189,7 @@ solve_coord_dfs(dfsarg_solve_coord_t arg[static 1])
                 arg->lastisnormal = true;
 
                 for (m = 0; m < NMOVES; m++) {
-                        if (!(mm & (UINT32_C(1) << (uint32_t)m)))
+                        if (!(mm & (UINT64_C(1) << (uint64_t)m)))
                                 continue;
 
                         arg->solution_moves->moves[l] = m;
@@ -221,7 +220,7 @@ solve_coord_dfs(dfsarg_solve_coord_t arg[static 1])
                 arg->lastisnormal = false;
                 
                 for (m = 0; m < NMOVES; m++) {
-                        if (!(mm & (UINT32_C(1) << (uint32_t)m)))
+                        if (!(mm & (UINT64_C(1) << (uint64_t)m)))
                                 continue;
 
                         arg->solution_moves->premoves[l] = m;
@@ -258,7 +257,7 @@ solve_coord_dispatch(
         const unsigned char *data,
         unsigned solutions_size,
         char *sols,
-        long long stats[static NISSY_SIZE_SOLVE_STATS],
+        long long stats[SIZE(NISSY_SIZE_SOLVE_STATS)],
         int (*poll_status)(void *),
         void *poll_status_data
 )
@@ -280,15 +279,16 @@ solve_coord_dispatch(
                 return NISSY_ERROR_INVALID_SOLVER;
         }
 
-        return solve_coord(oc, coord, trans, nissflag, minmoves, maxmoves,
-            maxsolutions, optimal, threads, data_size, data,
+        return solve_coord(oc, coord, trans, (uint8_t)nissflag,
+            (uint8_t)minmoves, (uint8_t)maxmoves, (uint8_t)maxsolutions,
+                (uint8_t)optimal, (uint8_t)threads, data_size, data,
             solutions_size, sols, poll_status, poll_status_data);
 }
 
 STATIC int64_t
 solve_coord(
         oriented_cube_t oc,
-        coord_t coord [static 1],
+        coord_t coord [NON_NULL],
         uint8_t trans,
         uint8_t nissflag,
         uint8_t minmoves,