another clean-up before rebasing

Author: czurnieden

etc/makefile

@@ -41,10 +41,10 @@ mont: mont.o
 getlimbsize: get_limbsize.o
 	$(CC) $(LTM_TUNE_CFLAGS) get_limbsize.o $(LIBNAME) -o get_limbsize
 
-# Make pretty pictures (2000 is the maximum number of limbs to print for mul/sqr)
+# Make pretty pictures (3000 is the maximum number of limbs to print for mul/sqr)
 # "tune" runs twice because it runs automatically when build.
 graphs: tune get_limbsize
-	./tune_it.sh 2000
+	./tune_it.sh 3000
 	gnuplot -c plot_graphs.gp `./get_limbsize`
 
 clean:

etc/makefile.icc

@@ -37,10 +37,10 @@ tune: tune.o
 getlimbsize: get_limbsize.o
 	$(CC) $(LTM_TUNE_CFLAGS) get_limbsize.o $(LIBNAME) -o get_limbsize
 
-# Make pretty pictures (2000 is the maximum number of limbs to print for mul/sqr)
+# Make pretty pictures (3000 is the maximum number of limbs to print for mul/sqr)
 # "tune" runs twice because it runs automatically when build.
 graphs: tune get_limbsize
-	./tune_it.sh 2000
+	./tune_it.sh 3000
 	gnuplot -c plot_graphs.gp `./get_limbsize`
 
 

etc/tune.c

@@ -680,22 +680,13 @@ int main(int argc, char **argv)
          if (test[n].fn != NULL) {
             s_run(test[n].name, test[n].fn, test[n].cutoff);
             *test[n].update = *test[n].cutoff;
-            *test[n].cutoff = INT_MAX;
-         };
-      }
-
-      /* We need the updated fast multiplication cutoffs for the radix conversion, set them */
-      for (n = 0; n < (sizeof(test)/sizeof(test[0]) - 2); ++n) {
-         if (test[n].fn != NULL) {
-            *test[n].cutoff = *test[n].update;
          };
       }
 
       /* Cutoffs for radix conversions are in bits to make handling of 62 different radices easier  */
       for (; n < sizeof(test)/sizeof(test[0]); ++n) {
          if (test[n].fn != NULL) {
             s_run(test[n].name, test[n].fn, test[n].cutoff);
-            /* TODO: can overflow for small INT_MAX */
             *test[n].update = (*test[n].cutoff) * MP_DIGIT_BIT;
             *test[n].cutoff = INT_MAX;
          }

etc/tune_it.sh

@@ -122,13 +122,3 @@ if [ $# -eq 1 ]; then
    "$MPWD"/tune -p -r $RLOOPS -L $LAG -S "$RNUM" -o $OFFSET -M $1 -G $(./get_limbsize) -s $TMP0,$TMP1,$TMP2,$TMP3,$TMP4,$TMP5
 fi
 
-
-
-
-
-
-
-
-
-
-

makefile.shared

@@ -93,12 +93,6 @@ $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))
 mtest:
 	cd mtest ; $(CC) $(LTM_CFLAGS) -O0 mtest.c $(LTM_LDFLAGS) -o mtest
 
-tuneold: $(LIBNAME)
-	$(LTCOMPILE) $(LTM_CFLAGS) -c etc/tune.c -o etc/tune.o
-	$(LTLINK) $(LTM_LDFLAGS) -o etc/tune etc/tune.o $(LIBNAME)
-	cd etc/; /bin/sh tune_it.sh; cd ..
-	$(MAKE) -f makefile.shared
-
 # etc/tune.c uses hidden symbols, so we assume that only difference between the shared and static
 # libraries is just that: they are shared or static and simply build a static library to run
 # etc/tune
@@ -107,18 +101,6 @@ tune:
 	$(MAKE) -f makefile clean
 	$(MAKE) -f makefile.shared
 
-
-graphsold: $(LIBNAME)
-	$(LTCOMPILE) $(LTM_CFLAGS) -c etc/tune.c -o etc/tune.o
-	$(LTLINK) $(LTM_LDFLAGS) -o etc/tune etc/tune.o $(LIBNAME)
-	$(LTCOMPILE) $(LTM_CFLAGS) -c etc/get_limbsize.c -o etc/get_limbsize.o
-	$(LTLINK) $(LTM_LDFLAGS) -o etc/get_limbsize etc/get_limbsize.o $(LIBNAME)
-	cd etc/;\
-	/bin/sh tune_it.sh 2000;\
-	gnuplot -c plot_graphs.gp `./get_limbsize`;\
-	cd ..
-	$(MAKE) -f makefile.shared
-
 graphs:
 	$(MAKE) -f makefile graphs
 	$(MAKE) -f makefile clean

mp_read_radix.c

@@ -3,6 +3,7 @@
 /* LibTomMath, multiple-precision integer library -- Tom St Denis */
 /* SPDX-License-Identifier: Unlicense */
 
+/* TODO: strlen() shouldn't be problematic but you'll never know */
 #ifdef MP_USE_MEMOPS
 #  include <string.h>
 #  define MP_STRLEN(s) strlen(s)

mp_to_radix.c

@@ -49,7 +49,7 @@ mp_err mp_to_radix(const mp_int *a, char *str, size_t maxlen, size_t *written, i
 
 
    if (MP_HAS(S_MP_FASTER_TO_RADIX) && (a->used > (MP_RADIX_WRITE_CUTOFF / MP_DIGIT_BIT))) {
-      if ((err = s_mp_faster_to_radix(&a_bar, str, maxlen, &part_written, radix)) != MP_OKAY)            goto LBL_ERR;
+      if ((err = s_mp_faster_to_radix(&a_bar, str, maxlen, &part_written, radix)) != MP_OKAY)          goto LBL_ERR;
    } else if (MP_HAS(S_MP_SLOWER_TO_RADIX)) {
       char *start = str;
       if ((err = s_mp_slower_to_radix(&a_bar, &str, &maxlen, &part_written, radix, false)) != MP_OKAY) goto LBL_ERR;

tommath_private.h

@@ -90,6 +90,7 @@ do {                                                    \
 #  define MP_RADIX_WRITE_CUTOFF   MP_DEFAULT_RADIX_WRITE_CUTOFF
 #endif
 
+/* Changing it has not much effect on speed but will reduce the tree height/stack use if incremented */
 #ifndef MP_RADIX_BARRETT_START_MULTIPLICATOR
 #   define MP_RADIX_BARRETT_START_MULTIPLICATOR  10
 /* Better safe than sorry */
@@ -105,8 +106,6 @@ do {                                                    \
 
 
 
-
-
 /* define heap macros */
 #ifndef MP_MALLOC
 /* default to libc stuff */