Commit c1f5b06d4bb8caf5a9edcd90c9a7b3f50ef2cb1e
2019-05-20T05:36:08
refactor with mp_init_multi
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335
diff --git a/bn_mp_n_root_ex.c b/bn_mp_n_root_ex.c
index 8705c6a..95c8a39 100644
--- a/bn_mp_n_root_ex.c
+++ b/bn_mp_n_root_ex.c
@@ -24,18 +24,10 @@ mp_err mp_n_root_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
return MP_VAL;
}
- if ((res = mp_init(&t1)) != MP_OKAY) {
+ if ((res = mp_init_multi(&t1, &t2, &t3, NULL)) != MP_OKAY) {
return res;
}
- if ((res = mp_init(&t2)) != MP_OKAY) {
- goto LBL_T1;
- }
-
- if ((res = mp_init(&t3)) != MP_OKAY) {
- goto LBL_T2;
- }
-
/* if a is negative fudge the sign but keep track */
a_ = *a;
a_.sign = MP_ZPOS;
@@ -60,7 +52,7 @@ mp_err mp_n_root_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
mp_set(c, 1uL);
c->sign = a->sign;
res = MP_OKAY;
- goto LBL_T3;
+ goto LBL_ERR;
}
}
#endif
@@ -69,56 +61,56 @@ mp_err mp_n_root_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
mp_set(c, 1uL);
c->sign = a->sign;
res = MP_OKAY;
- goto LBL_T3;
+ goto LBL_ERR;
}
ilog2 = ilog2 / ((int)b);
if (ilog2 == 0) {
mp_set(c, 1uL);
c->sign = a->sign;
res = MP_OKAY;
- goto LBL_T3;
+ goto LBL_ERR;
}
/* Start value must be larger than root */
ilog2 += 2;
if ((res = mp_2expt(&t2,ilog2)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
do {
/* t1 = t2 */
if ((res = mp_copy(&t2, &t1)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
/* t2 = t1 - ((t1**b - a) / (b * t1**(b-1))) */
/* t3 = t1**(b-1) */
if ((res = mp_expt_d_ex(&t1, b - 1u, &t3, fast)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
/* numerator */
/* t2 = t1**b */
if ((res = mp_mul(&t3, &t1, &t2)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
/* t2 = t1**b - a */
if ((res = mp_sub(&t2, &a_, &t2)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
/* denominator */
/* t3 = t1**(b-1) * b */
if ((res = mp_mul_d(&t3, b, &t3)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
/* t3 = (t1**b - a)/(b * t1**(b-1)) */
if ((res = mp_div(&t2, &t3, &t3, NULL)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
if ((res = mp_sub(&t1, &t3, &t2)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
/*
Number of rounds is at most log_2(root). If it is more it
@@ -133,16 +125,16 @@ mp_err mp_n_root_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
/* Loop beneath can overshoot by one if found root is smaller than actual root */
for (;;) {
if ((res = mp_expt_d_ex(&t1, b, &t2, fast)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
cmp = mp_cmp(&t2, &a_);
if (cmp == MP_EQ) {
res = MP_OKAY;
- goto LBL_T3;
+ goto LBL_ERR;
}
if (cmp == MP_LT) {
if ((res = mp_add_d(&t1, 1uL, &t1)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
} else {
break;
@@ -151,11 +143,11 @@ mp_err mp_n_root_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
/* correct overshoot from above or from recurrence */
for (;;) {
if ((res = mp_expt_d_ex(&t1, b, &t2, fast)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
if (mp_cmp(&t2, &a_) == MP_GT) {
if ((res = mp_sub_d(&t1, 1uL, &t1)) != MP_OKAY) {
- goto LBL_T3;
+ goto LBL_ERR;
}
} else {
break;
@@ -170,12 +162,8 @@ mp_err mp_n_root_ex(const mp_int *a, mp_digit b, mp_int *c, int fast)
res = MP_OKAY;
-LBL_T3:
- mp_clear(&t3);
-LBL_T2:
- mp_clear(&t2);
-LBL_T1:
- mp_clear(&t1);
+LBL_ERR:
+ mp_clear_multi(&t1, &t2, &t3, NULL);
return res;
}
#endif
diff --git a/callgraph.txt b/callgraph.txt
index 4eb61ea..29c1551 100644
--- a/callgraph.txt
+++ b/callgraph.txt
@@ -3881,7 +3881,9 @@ BN_MP_NEG_C
BN_MP_N_ROOT_C
+--->BN_MP_N_ROOT_EX_C
-| +--->BN_MP_INIT_C
+| +--->BN_MP_INIT_MULTI_C
+| | +--->BN_MP_INIT_C
+| | +--->BN_MP_CLEAR_C
| +--->BN_MP_COUNT_BITS_C
| +--->BN_MP_SET_C
| | +--->BN_MP_ZERO_C
@@ -3897,8 +3899,6 @@ BN_MP_N_ROOT_C
| | +--->BN_MP_MUL_C
| | | +--->BN_S_MP_BALANCE_MUL_C
| | | | +--->BN_MP_INIT_SIZE_C
-| | | | +--->BN_MP_INIT_MULTI_C
-| | | | | +--->BN_MP_CLEAR_C
| | | | +--->BN_MP_CLEAR_C
| | | | +--->BN_MP_LSHD_C
| | | | | +--->BN_MP_GROW_C
@@ -3913,8 +3913,6 @@ BN_MP_N_ROOT_C
| | | | +--->BN_MP_EXCH_C
| | | | +--->BN_MP_CLEAR_MULTI_C
| | | +--->BN_S_MP_TOOM_MUL_C
-| | | | +--->BN_MP_INIT_MULTI_C
-| | | | | +--->BN_MP_CLEAR_C
| | | | +--->BN_MP_MOD_2D_C
| | | | | +--->BN_MP_ZERO_C
| | | | | +--->BN_MP_CLAMP_C
@@ -3982,7 +3980,6 @@ BN_MP_N_ROOT_C
| | +--->BN_MP_CLEAR_C
| | +--->BN_MP_SQR_C
| | | +--->BN_S_MP_TOOM_SQR_C
-| | | | +--->BN_MP_INIT_MULTI_C
| | | | +--->BN_MP_MOD_2D_C
| | | | | +--->BN_MP_ZERO_C
| | | | | +--->BN_MP_CLAMP_C
@@ -4044,8 +4041,6 @@ BN_MP_N_ROOT_C
| +--->BN_MP_MUL_C
| | +--->BN_S_MP_BALANCE_MUL_C
| | | +--->BN_MP_INIT_SIZE_C
-| | | +--->BN_MP_INIT_MULTI_C
-| | | | +--->BN_MP_CLEAR_C
| | | +--->BN_MP_CLEAR_C
| | | +--->BN_MP_LSHD_C
| | | | +--->BN_MP_GROW_C
@@ -4060,8 +4055,6 @@ BN_MP_N_ROOT_C
| | | +--->BN_MP_EXCH_C
| | | +--->BN_MP_CLEAR_MULTI_C
| | +--->BN_S_MP_TOOM_MUL_C
-| | | +--->BN_MP_INIT_MULTI_C
-| | | | +--->BN_MP_CLEAR_C
| | | +--->BN_MP_MOD_2D_C
| | | | +--->BN_MP_ZERO_C
| | | | +--->BN_MP_CLAMP_C
@@ -4140,8 +4133,6 @@ BN_MP_N_ROOT_C
| +--->BN_MP_DIV_C
| | +--->BN_MP_CMP_MAG_C
| | +--->BN_MP_ZERO_C
-| | +--->BN_MP_INIT_MULTI_C
-| | | +--->BN_MP_CLEAR_C
| | +--->BN_MP_ABS_C
| | +--->BN_MP_MUL_2D_C
| | | +--->BN_MP_GROW_C
@@ -4164,6 +4155,7 @@ BN_MP_N_ROOT_C
| | +--->BN_MP_CLEAR_MULTI_C
| | | +--->BN_MP_CLEAR_C
| | +--->BN_MP_INIT_SIZE_C
+| | +--->BN_MP_INIT_C
| | +--->BN_MP_INIT_COPY_C
| | | +--->BN_MP_CLEAR_C
| | +--->BN_MP_LSHD_C
@@ -4182,11 +4174,14 @@ BN_MP_N_ROOT_C
| | +--->BN_MP_GROW_C
| | +--->BN_MP_CLAMP_C
| +--->BN_MP_EXCH_C
-| +--->BN_MP_CLEAR_C
+| +--->BN_MP_CLEAR_MULTI_C
+| | +--->BN_MP_CLEAR_C
BN_MP_N_ROOT_EX_C
-+--->BN_MP_INIT_C
++--->BN_MP_INIT_MULTI_C
+| +--->BN_MP_INIT_C
+| +--->BN_MP_CLEAR_C
+--->BN_MP_COUNT_BITS_C
+--->BN_MP_SET_C
| +--->BN_MP_ZERO_C
@@ -4202,8 +4197,6 @@ BN_MP_N_ROOT_EX_C
| +--->BN_MP_MUL_C
| | +--->BN_S_MP_BALANCE_MUL_C
| | | +--->BN_MP_INIT_SIZE_C
-| | | +--->BN_MP_INIT_MULTI_C
-| | | | +--->BN_MP_CLEAR_C
| | | +--->BN_MP_CLEAR_C
| | | +--->BN_MP_LSHD_C
| | | | +--->BN_MP_GROW_C
@@ -4218,8 +4211,6 @@ BN_MP_N_ROOT_EX_C
| | | +--->BN_MP_EXCH_C
| | | +--->BN_MP_CLEAR_MULTI_C
| | +--->BN_S_MP_TOOM_MUL_C
-| | | +--->BN_MP_INIT_MULTI_C
-| | | | +--->BN_MP_CLEAR_C
| | | +--->BN_MP_MOD_2D_C
| | | | +--->BN_MP_ZERO_C
| | | | +--->BN_MP_CLAMP_C
@@ -4287,7 +4278,6 @@ BN_MP_N_ROOT_EX_C
| +--->BN_MP_CLEAR_C
| +--->BN_MP_SQR_C
| | +--->BN_S_MP_TOOM_SQR_C
-| | | +--->BN_MP_INIT_MULTI_C
| | | +--->BN_MP_MOD_2D_C
| | | | +--->BN_MP_ZERO_C
| | | | +--->BN_MP_CLAMP_C
@@ -4349,8 +4339,6 @@ BN_MP_N_ROOT_EX_C
+--->BN_MP_MUL_C
| +--->BN_S_MP_BALANCE_MUL_C
| | +--->BN_MP_INIT_SIZE_C
-| | +--->BN_MP_INIT_MULTI_C
-| | | +--->BN_MP_CLEAR_C
| | +--->BN_MP_CLEAR_C
| | +--->BN_MP_LSHD_C
| | | +--->BN_MP_GROW_C
@@ -4365,8 +4353,6 @@ BN_MP_N_ROOT_EX_C
| | +--->BN_MP_EXCH_C
| | +--->BN_MP_CLEAR_MULTI_C
| +--->BN_S_MP_TOOM_MUL_C
-| | +--->BN_MP_INIT_MULTI_C
-| | | +--->BN_MP_CLEAR_C
| | +--->BN_MP_MOD_2D_C
| | | +--->BN_MP_ZERO_C
| | | +--->BN_MP_CLAMP_C
@@ -4445,8 +4431,6 @@ BN_MP_N_ROOT_EX_C
+--->BN_MP_DIV_C
| +--->BN_MP_CMP_MAG_C
| +--->BN_MP_ZERO_C
-| +--->BN_MP_INIT_MULTI_C
-| | +--->BN_MP_CLEAR_C
| +--->BN_MP_ABS_C
| +--->BN_MP_MUL_2D_C
| | +--->BN_MP_GROW_C
@@ -4469,6 +4453,7 @@ BN_MP_N_ROOT_EX_C
| +--->BN_MP_CLEAR_MULTI_C
| | +--->BN_MP_CLEAR_C
| +--->BN_MP_INIT_SIZE_C
+| +--->BN_MP_INIT_C
| +--->BN_MP_INIT_COPY_C
| | +--->BN_MP_CLEAR_C
| +--->BN_MP_LSHD_C
@@ -4487,7 +4472,8 @@ BN_MP_N_ROOT_EX_C
| +--->BN_MP_GROW_C
| +--->BN_MP_CLAMP_C
+--->BN_MP_EXCH_C
-+--->BN_MP_CLEAR_C
++--->BN_MP_CLEAR_MULTI_C
+| +--->BN_MP_CLEAR_C
BN_MP_OR_C
diff --git a/tommath_class.h b/tommath_class.h
index 880ea8b..f102f1c 100644
--- a/tommath_class.h
+++ b/tommath_class.h
@@ -610,7 +610,7 @@
#endif
#if defined(BN_MP_N_ROOT_EX_C)
-# define BN_MP_INIT_C
+# define BN_MP_INIT_MULTI_C
# define BN_MP_COUNT_BITS_C
# define BN_MP_SET_C
# define BN_MP_2EXPT_C
@@ -624,7 +624,7 @@
# define BN_MP_ADD_D_C
# define BN_MP_SUB_D_C
# define BN_MP_EXCH_C
-# define BN_MP_CLEAR_C
+# define BN_MP_CLEAR_MULTI_C
#endif
#if defined(BN_MP_NEG_C)