Merge pull request #282 from wegank/32-bit-fix-1

Fix definition of some constants when sizeof(mp_limb_t)==4

Author: mohabsafey

src/fglm/fglm_core.c

@@ -25,6 +25,7 @@
 #include<stdio.h>
 #include<stdlib.h>
 #include<string.h>
+#include<stdint.h>
 #include<unistd.h>
 #include<time.h>
 /* for timing functions */
@@ -504,15 +505,15 @@ static inline void sparse_mat_fglm_mult_vec(CF_t *res, sp_matfglm_t *mat,
   nmod_t mod;
   uint64_t pow2_precomp;
   nmod_init(&mod, (uint64_t)prime);
-  NMOD_RED(pow2_precomp, (UWORD(1) << __DOT_SPLIT_BITS), mod);
+  NMOD_RED(pow2_precomp, (UINT64_C(1) << __DOT_SPLIT_BITS), mod);
 
   _avx512_matrix_vector_product(vres, mat->dense_mat, vec, mat->dst,
                               ncols, nrows, mod, pow2_precomp, st);
 #elif defined(HAVE_AVX2)
   nmod_t mod;
   uint64_t pow2_precomp;
   nmod_init(&mod, (uint64_t)prime);
-  NMOD_RED(pow2_precomp, (UWORD(1) << __DOT_SPLIT_BITS), mod);
+  NMOD_RED(pow2_precomp, (UINT64_C(1) << __DOT_SPLIT_BITS), mod);
 
   _avx2_matrix_vector_product(vres, mat->dense_mat, vec, mat->dst,
                               ncols, nrows, mod, pow2_precomp, st);
@@ -565,15 +566,15 @@ static inline void sparse_mat_fglm_colon_mult_vec(CF_t *res, sp_matfglmcol_t *ma
   nmod_t mod;
   uint64_t pow2_precomp;
   nmod_init(&mod, (uint64_t)prime);
-  NMOD_RED(pow2_precomp, (UWORD(1) << __DOT_SPLIT_BITS), mod);
+  NMOD_RED(pow2_precomp, (UINT64_C(1) << __DOT_SPLIT_BITS), mod);
 
   _avx512_matrix_vector_product(vres, mat->dense_mat, vec, mat->dst,
                               ncols, nrows, mod, pow2_precomp, st);
 #elif defined(HAVE_AVX2)
   nmod_t mod;
   uint64_t pow2_precomp;
   nmod_init(&mod, (uint64_t)prime);
-  NMOD_RED(pow2_precomp, (UWORD(1) << __DOT_SPLIT_BITS), mod);
+  NMOD_RED(pow2_precomp, (UINT64_C(1) << __DOT_SPLIT_BITS), mod);
 
   _avx2_matrix_vector_product(vres, mat->dense_mat, vec, mat->dst,
                               ncols, nrows, mod, pow2_precomp, st);
@@ -2208,4 +2209,3 @@ param_t *nmod_fglm_guess_colon(sp_matfglmcol_t *matrix,
   return param;
 }
 
-

src/fglm/linalg-fglm.c

@@ -40,7 +40,7 @@
 
 // parameters for splitting
 #define __DOT_SPLIT_BITS 56
-#define __DOT_SPLIT_MASK 72057594037927935UL // (1UL << __DOT_SPLIT_BITS) - 1
+#define __DOT_SPLIT_MASK UINT64_C(72057594037927935) // (UINT64_C(1) << __DOT_SPLIT_BITS) - 1
 
 /*--------------------------------------*/
 /* non-vectorized matrix vector product */

src/msolve/msolve.c

@@ -912,12 +912,12 @@ static inline void normalize_nmod_param(param_t *nmod_param) {
 
     for (long i = 1; i < nmod_param->elim->length; i++) {
       nmod_param->denom->coeffs[i - 1] =
-          (i * nmod_param->elim->coeffs[i]) % prime;
+          (uint64_t)i * (uint64_t)nmod_param->elim->coeffs[i] % (uint64_t)prime;
     }
 
     for (long i = 0; i < nmod_param->elim->length - 1; i++) {
       nmod_param->denom->coeffs[i] =
-          (inv * nmod_param->denom->coeffs[i]) % prime;
+          (uint64_t)inv * (uint64_t)nmod_param->denom->coeffs[i] % (uint64_t)prime;
     }
 
     for (int j = 0; j < nmod_param->nvars - 1; j++) {