Removed comments marking CARRY_FREE_GK additions.

5 files changed, 2 insertions, 12 deletions

diff --git a/include/gf_complete.h b/include/gf_complete.h
index 0469b77..8e1e641 100644
--- a/include/gf_complete.h
+++ b/include/gf_complete.h
@@ -36,7 +36,7 @@
 typedef enum {GF_MULT_DEFAULT,
               GF_MULT_SHIFT,
               GF_MULT_CARRY_FREE,
-              GF_MULT_CARRY_FREE_GK, //ADAM
+              GF_MULT_CARRY_FREE_GK,
               GF_MULT_GROUP,
               GF_MULT_BYTWO_p,
               GF_MULT_BYTWO_b,
diff --git a/src/gf.c b/src/gf.c
index 1955559..2c232ec 100644
--- a/src/gf.c
+++ b/src/gf.c
@@ -286,7 +286,6 @@ int gf_error_check(int w, int mult_type, int region_type, int divide_type,
     return 1;
   }
 
-  //ADAM
   if (mult_type == GF_MULT_CARRY_FREE_GK) {
     if (w != 4 && w != 8 && w != 16 &&
         w != 32 && w != 64 && w != 128)            { _gf_errno = GF_E_CFM___W; return 0; }
diff --git a/src/gf_method.c b/src/gf_method.c
index 90d62af..6fb869e 100644
--- a/src/gf_method.c
+++ b/src/gf_method.c
@@ -47,7 +47,6 @@ int create_gf_from_argv(gf_t *gf, int w, int argc, char **argv, int starting)
         } else if (strcmp(argv[starting], "CARRY_FREE") == 0) {
           mult_type = GF_MULT_CARRY_FREE;
           starting++;
-        //ADAM
         } else if (strcmp(argv[starting], "CARRY_FREE_GK") == 0) {
           mult_type = GF_MULT_CARRY_FREE_GK;
           starting++;
diff --git a/src/gf_w32.c b/src/gf_w32.c
index 5ba9daa..5ec2aa7 100644
--- a/src/gf_w32.c
+++ b/src/gf_w32.c
@@ -399,7 +399,6 @@ uint32_t gf_w32_matrix (gf_t *gf, uint32_t b)
    extra memory.  
 */
 
-//ADAM
 static
 inline
 gf_val_32_t
@@ -435,7 +434,6 @@ gf_w32_cfmgk_multiply (gf_t *gf, gf_val_32_t a32, gf_val_32_t b32)
   return rv;
 }
 
-//ADAM
 #if defined(INTEL_SSE4_PCLMUL)
 
 static 
@@ -640,7 +638,6 @@ gf_w32_shift_multiply (gf_t *gf, uint32_t a32, uint32_t b32)
   return product;
 }
 
-//ADAM
   static 
 int gf_w32_cfmgk_init(gf_t *gf)
 {
@@ -654,11 +651,9 @@ int gf_w32_cfmgk_init(gf_t *gf)
   gf->multiply.w32 = gf_w32_cfmgk_multiply;
   gf->multiply_region.w32 = gf_w32_cfmgk_multiply_region_from_single;
 
-  //setup in the private section the q+ and g* ADAM
   uint64_t *q_plus = (uint64_t *) h->private;
   uint64_t *g_star = (uint64_t *) h->private + 1;
 
-  //q+
   uint64_t tmp = h->prim_poly << 32;
   *q_plus = 1ULL << 32;
 
@@ -670,7 +665,6 @@ int gf_w32_cfmgk_init(gf_t *gf)
       tmp ^= h->prim_poly << (i-32);
     }
 
-  //g*
   *g_star = h->prim_poly & ((1ULL << 32) - 1);
 
   return 1;
@@ -2778,7 +2772,6 @@ int gf_w32_scratch_size(int mult_type, int region_type, int divide_type, int arg
     case GF_MULT_CARRY_FREE:
       return sizeof(gf_internal_t);
       break;
-    //ADAM
     case GF_MULT_CARRY_FREE_GK:
       return sizeof(gf_internal_t) + sizeof(uint64_t)*2;
       break;
@@ -2830,7 +2823,7 @@ int gf_w32_init(gf_t *gf)
 
   switch(h->mult_type) {
     case GF_MULT_CARRY_FREE:    if (gf_w32_cfm_init(gf) == 0) return 0; break;
-    case GF_MULT_CARRY_FREE_GK: if (gf_w32_cfmgk_init(gf) == 0) return 0; break; //ADAM
+    case GF_MULT_CARRY_FREE_GK: if (gf_w32_cfmgk_init(gf) == 0) return 0; break;
     case GF_MULT_SHIFT:         if (gf_w32_shift_init(gf) == 0) return 0; break;
     case GF_MULT_COMPOSITE:     if (gf_w32_composite_init(gf) == 0) return 0; break;
     case GF_MULT_DEFAULT: 
diff --git a/tools/gf_methods.c b/tools/gf_methods.c
index 921febf..43589ac 100644
--- a/tools/gf_methods.c
+++ b/tools/gf_methods.c
@@ -20,7 +20,6 @@
 #define BNMULTS (8)
 static char *BMULTS[BNMULTS] = { "CARRY_FREE", "GROUP48", 
                                "TABLE", "LOG", "SPLIT4", "SPLIT8", "SPLIT88", "COMPOSITE" };
-//ADAM
 #define NMULTS (17)
 static char *MULTS[NMULTS] = { "SHIFT", "CARRY_FREE", "CARRY_FREE_GK", "GROUP44", "GROUP48", "BYTWO_p", "BYTWO_b",
                                "TABLE", "LOG", "LOG_ZERO", "LOG_ZERO_EXT", "SPLIT2",