Skip to content

Commit 6e530cf

Browse files
committed
removed unnecessary code
1 parent 0434243 commit 6e530cf

File tree

6 files changed

+4
-35
lines changed

6 files changed

+4
-35
lines changed

demo/test.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,6 @@ static int test_mp_read_radix(void)
12231223
goto LBL_ERR;
12241224
}
12251225
DO(mp_rand(&a, bignum / MP_DIGIT_BIT));
1226-
/*fprintf(stderr,"\nNumber of limbs in &b = %d, bit_count of &b = %d\n", bignum / MP_DIGIT_BIT, mp_count_bits(&a));*/
12271226
for (i = 2; i < 65; i++) {
12281227
start = clock();
12291228
for (j = 0; j < 100; j++) {

mp_read_radix.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,13 @@ mp_err mp_read_radix(mp_int *a, const char *str, int radix)
8787
mp_zero(a);
8888

8989
/* TODO: Reading is quite quick, especially for bases of the form 2^n. Faster even for small input.
90-
Include branches fror them and/or (tunable?) cutoff? */
90+
Include branches for them and/or (tunable?) cutoff? */
9191

9292
/* Try faster version first */
9393
if (MP_HAS(S_MP_FASTER_READ_RADIX)) {
9494
if ((err = s_mp_faster_read_radix(a, str, 0, slen, radix)) != MP_OKAY) goto LTM_ERR;
9595
} else if (MP_HAS(S_MP_SLOWER_READ_RADIX)) {
9696
if ((err = s_mp_slower_read_radix(a, str, 0, slen, radix)) != MP_OKAY) goto LTM_ERR;
97-
} else {
98-
/* TODO: add an error for "Function not available in this build"? */
99-
err = MP_ERR;
100-
goto LTM_ERR;
10197
}
10298

10399
/* set the sign only if a != 0 */

mp_to_radix.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ mp_err mp_to_radix(const mp_int *a, char *str, size_t maxlen, size_t *written, i
5858
str = start;
5959
/* part_written does not count EOS */
6060
part_written++;
61-
} else {
62-
/* TODO: Add an error for "Function not available in this build"?
63-
The compiler has no reason to complain in that case. */
64-
err = MP_ERR;
65-
goto LBL_ERR;
6661
}
6762

6863
if (written != NULL) {

s_mp_slower_read_radix.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@ mp_err s_mp_slower_read_radix(mp_int *a, const char *str, size_t start, size_t e
77
{
88
mp_err err;
99
size_t i;
10-
int binary_radix = 0;
1110

1211
/* checks are done by caller */
1312
char *_s = (char *)(str + start);
1413

15-
if (MP_IS_2EXPT((unsigned int)radix)) {
16-
binary_radix = (int)s_mp_log2_radix[radix];
17-
}
18-
1914
for (i = start; (i < end) && (*_s != '\0') ; i++) {
2015
uint8_t y;
2116

@@ -31,12 +26,8 @@ mp_err s_mp_slower_read_radix(mp_int *a, const char *str, size_t start, size_t e
3126
err = MP_VAL;
3227
goto LBL_ERR;
3328
}
34-
if (binary_radix != 0) {
35-
if ((err = mp_mul_2d(a, binary_radix, a)) != MP_OKAY) goto LBL_ERR;
36-
} else {
37-
if ((err = mp_mul_d(a, (mp_digit)radix, a)) != MP_OKAY) goto LBL_ERR;
38-
}
39-
if ((err = mp_add_d(a, (mp_digit)y, a)) != MP_OKAY) goto LBL_ERR;
29+
if ((err = mp_mul_d(a, (mp_digit)radix, a)) != MP_OKAY) goto LBL_ERR;
30+
if ((err = mp_add_d(a, (mp_digit)y, a)) != MP_OKAY) goto LBL_ERR;
4031
_s++;
4132
}
4233

s_mp_slower_to_radix.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ mp_err s_mp_slower_to_radix(const mp_int *a, char **str, size_t *part_maxlen, si
1818
size_t digs = 0u;
1919
mp_int t;
2020
mp_digit d;
21-
int binary_radix = 0;
2221
mp_err err = MP_OKAY;
2322
int ybar = 0;
2423

@@ -32,9 +31,6 @@ mp_err s_mp_slower_to_radix(const mp_int *a, char **str, size_t *part_maxlen, si
3231
ybar = s_mp_radix_exponent_y[radix] * MP_RADIX_BARRETT_START_MULTIPLICATOR;
3332
}
3433

35-
if (MP_IS_2EXPT((unsigned int)radix)) {
36-
binary_radix = (int)s_mp_log2_radix[radix];
37-
}
3834
if ((err = mp_init_copy(&t, a)) != MP_OKAY) goto LTM_ERR;
3935

4036
while (!mp_iszero(&t)) {
@@ -43,13 +39,7 @@ mp_err s_mp_slower_to_radix(const mp_int *a, char **str, size_t *part_maxlen, si
4339
err = MP_BUF;
4440
goto LTM_ERR;
4541
}
46-
if (binary_radix != 0) {
47-
/* The remainder of function mp_div_2d() is a bigint not a mp_digit*/
48-
d = t.dp[0] & (mp_digit)(radix - 1);
49-
if ((err = mp_div_2d(&t, binary_radix, &t, NULL)) != MP_OKAY) goto LTM_ERR;
50-
} else {
51-
if ((err = mp_div_d(&t, (mp_digit)radix, &t, &d)) != MP_OKAY) goto LTM_ERR;
52-
}
42+
if ((err = mp_div_d(&t, (mp_digit)radix, &t, &d)) != MP_OKAY) goto LTM_ERR;
5343
*s++ = s_mp_radix_map[d];
5444
++digs;
5545
if (pad) {

tommath_class.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,14 +1298,12 @@
12981298

12991299
#if defined(S_MP_SLOWER_READ_RADIX_C)
13001300
# define MP_ADD_D_C
1301-
# define MP_MUL_2D_C
13021301
# define MP_MUL_D_C
13031302
# define MP_ZERO_C
13041303
#endif
13051304

13061305
#if defined(S_MP_SLOWER_TO_RADIX_C)
13071306
# define MP_CLEAR_C
1308-
# define MP_DIV_2D_C
13091307
# define MP_DIV_D_C
13101308
# define MP_INIT_COPY_C
13111309
#endif

0 commit comments

Comments
 (0)