XOR table generator utility: Improved output formatting + some code clean-up.

diff --git a/etc/gentable_FIN/gentable_FIN.vcxproj b/etc/gentable_FIN/gentable_FIN.vcxproj
index c542f7b..a5ee839 100644 (file)
--- a/etc/gentable_FIN/gentable_FIN.vcxproj
+++ b/etc/gentable_FIN/gentable_FIN.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\gentable_fin.cpp" />
+    <ClCompile Include="src\gentable_FIN.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{579E7209-F88C-4D5B-A8D6-6FBAF923ABD1}</ProjectGuid>

diff --git a/etc/gentable_FIN/src/gentable_fin.cpp b/etc/gentable_FIN/src/gentable_FIN.cpp
similarity index 92%
rename from etc/gentable_FIN/src/gentable_fin.cpp
rename to etc/gentable_FIN/src/gentable_FIN.cpp
index c2dadee..e8138d8 100644 (file)
--- a/etc/gentable_FIN/src/gentable_fin.cpp
+++ b/etc/gentable_FIN/src/gentable_FIN.cpp
@@ -67,6 +67,7 @@ static void create_permutation(uint32_t *const out)
 int main()
 {
        uint32_t permutation[MASH384_SIZE];
+       printf("MHash GenTableFIN [%s]\n\n", __DATE__);
 
        for(uint32_t i = 997U; i < UINT32_MAX; ++i)
        {
@@ -82,15 +83,20 @@ int main()
        }
        puts("");
 
+       printf("\n-----\n\n");
+
+       puts("{");
        for(size_t i = 0U; i < MASH384_SIZE; ++i)
        {
-               printf(((i % 16) > 0U) ? ", 0x%02X" : "0x%02X", permutation[i]);
+               printf(((i % 16) > 0U) ? ", 0x%02X" : "\t0x%02X", permutation[i]);
                if((i % 16U) == 15U)
                {
-                       puts(",");
+                       puts((i < MASH384_SIZE - 1U) ? "," : "");
                }
        }
+       puts("}");
 
-       puts("\nCompleted.\n");
+       printf("\nCOMPLETED.\n\n");
+       getchar();
        return EXIT_SUCCESS;
 }

diff --git a/etc/gentable_MIX/gentable_MIX.vcxproj b/etc/gentable_MIX/gentable_MIX.vcxproj
index 3604fab..30a772f 100644 (file)
--- a/etc/gentable_MIX/gentable_MIX.vcxproj
+++ b/etc/gentable_MIX/gentable_MIX.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\gentable_mix.cpp" />
+    <ClCompile Include="src\gentable_MIX.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{579E7209-F88C-4D5B-A8D6-6FBAF923ABD1}</ProjectGuid>

diff --git a/etc/gentable_MIX/gentable_MIX.vcxproj.filters b/etc/gentable_MIX/gentable_MIX.vcxproj.filters
index 1b69462..1be5b08 100644 (file)
--- a/etc/gentable_MIX/gentable_MIX.vcxproj.filters
+++ b/etc/gentable_MIX/gentable_MIX.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\gentable_mix.cpp">
+    <ClCompile Include="src\gentable_MIX.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

diff --git a/etc/gentable_MIX/src/gentable_mix.cpp b/etc/gentable_MIX/src/gentable_MIX.cpp
similarity index 97%
rename from etc/gentable_MIX/src/gentable_mix.cpp
rename to etc/gentable_MIX/src/gentable_MIX.cpp
index de4a82f..483f086 100644 (file)
--- a/etc/gentable_MIX/src/gentable_mix.cpp
+++ b/etc/gentable_MIX/src/gentable_MIX.cpp
@@ -109,6 +109,8 @@ static void print_row(const size_t row)
 
 int main()
 {
+       printf("MHash GenTableMIX [%s]\n\n", __DATE__);
+
        create_permutation(mix_table[0U]);
        print_row(0U);
 
@@ -128,6 +130,7 @@ int main()
                print_row(i);
        }
 
-       puts("\nCompleted.\n");
+       printf("\nCOMPLETED.\n\n");
+       getchar();
        return EXIT_SUCCESS;
 }

diff --git a/etc/gentable_XOR/src/gentable_XOR.cpp b/etc/gentable_XOR/src/gentable_XOR.cpp
index 9530cb7..7b496c3 100644 (file)
--- a/etc/gentable_XOR/src/gentable_XOR.cpp
+++ b/etc/gentable_XOR/src/gentable_XOR.cpp
@@ -45,13 +45,11 @@
 #define ROW_NUM (UINT8_MAX+2)           /*total number of rows*/
 #define ROW_LEN (HASH_LEN / CHAR_BIT)   /*number of bits per row*/
 
-#define __DISTANCE_STR(X) #X
-#define _DISTANCE_STR(X) __DISTANCE_STR(X)
-#define DISTANCE_STR _DISTANCE_STR(DISTANCE_MIN)
-
 #define MAGIC_NUMBER 0x3C6058A7C1132CB2ui64
 #define THREAD_ID (pthread_getw32threadid_np(pthread_self()))
 
+#define R_OK 0x04
+
 //-----------------------------------------------------------------------------
 // Globals
 //-----------------------------------------------------------------------------
@@ -150,21 +148,19 @@ static inline uint_fast32_t check_distance_buff(const uint_fast32_t distance_max
 
 static void dump_table(FILE *out)
 {
-       fputs("uint8_t MHASH_384_TABLE_XOR[UINT8_MAX+2][MHASH_384_LEN] =\n{\n", out);
        for (size_t i = 0; i < ROW_NUM; i++)
        {
-               fputs("\t{ ", out);
+               fputs("{ ", out);
                for (size_t j = 0; j < ROW_LEN; j++)
                {
-                       if (j > 0)
+                       if(!(j % 8U))
                        {
-                               fputc(',', out);
+                               fputs((j > 0U) ? ", 0x" : "0x", out);
                        }
-                       fprintf(out, "0x%02X", g_table[i][j]);
+                       fprintf(out, "%02X", g_table[i][j]);
                }
                fprintf(out, " }%s /*%02X*/\n", (i != (ROW_NUM - 1)) ? "," : " ", (uint32_t)(i % 0x100));
        }
-       fputs("};\n", out);
 }
 
 //-----------------------------------------------------------------------------
@@ -450,7 +446,7 @@ static void* thread_spin(void *const param)
                        return NULL;
                }
                _sleep(delay);
-               if (delay >= 500)
+               if (delay >= 1000)
                {
                        printf("\b\b\b[%c]", SPINNER[g_spinpos]);
                        g_spinpos = (g_spinpos + 1) % 4;
@@ -644,7 +640,7 @@ int wmain(int argc, wchar_t *argv[])
        SEM_INIT(&stop_flag);
        MUTEX_INIT(&stop_mutex);
 
-       if (_waccess(argv[1], 4) == 0)
+       if (_waccess(argv[1], R_OK) == 0)
        {
                printf("Loading existing table data and proceeding...\n");
                if (!load_table_data(argv[1], &initial_row_index, &distance_max))
@@ -656,7 +652,7 @@ int wmain(int argc, wchar_t *argv[])
        for (size_t i = initial_row_index; i < ROW_NUM; i++)
        {
                char time_string[64];
-               printf("\aRow %03u of %03u [%c]", (uint32_t)(i+1U), ROW_NUM, SPINNER[g_spinpos]);
+               printf("\aRow %03u of %03u [%03u] [%c]", (uint32_t)(i+1U), ROW_NUM, distance_max, SPINNER[g_spinpos]);
                g_spinpos = (g_spinpos + 1) % 4;
 
                PTHREAD_CREATE(&thread_id[THREAD_COUNT], NULL, thread_spin, &stop_flag);
@@ -693,13 +689,16 @@ int wmain(int argc, wchar_t *argv[])
        }
 
        printf("\n-----\n\n");
-
+       
        dump_table(stdout);
-       if (fopen_s(&file_out, "table_XOR." DISTANCE_STR ".txt", "w") == 0)
-       {
-               dump_table(file_out);
-               fclose(file_out);
-       }
+
+       //wchar_t output_name[64U];
+       //_snwprintf(output_name, 64U, L"table_XOR.%u.txt", DISTANCE_MIN);
+       //if (_wfopen_s(&file_out, output_name, L"w") == 0)
+       //{
+       //      dump_table(file_out);
+       //      fclose(file_out);
+       //}
 
        printf("\n-----\n\n");
 
@@ -722,6 +721,6 @@ int wmain(int argc, wchar_t *argv[])
        MUTEX_DESTROY(&stop_mutex);
 
        printf("COMPLETED.\n\n");
-       system("shutdown /s /t 180");
-       return getchar();
+       getchar();
+       return EXIT_SUCCESS;
 }