Skip to content

Commit 99688ad

Browse files
minadminad
committed
another proposal: use _ul and _l for the long macros
1 parent 107a503 commit 99688ad

File tree

3 files changed

+45
-45
lines changed

3 files changed

+45
-45
lines changed

‎demo/test.c

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ static int test_mp_fread_fwrite(void)
230230
return EXIT_FAILURE;
231231
}
232232

233-
mp_set_ulong(&a, 123456uL);
233+
mp_set_ul(&a, 123456uL);
234234
tmp = tmpfile();
235235
if ((e = mp_fwrite(&a, 64, tmp)) != MP_OKAY) {
236236
goto LBL_ERR;
@@ -313,8 +313,8 @@ static int test_s_mp_jacobi(void)
313313
return EXIT_FAILURE;
314314
}
315315

316-
mp_set_ulong(&a, 0uL);
317-
mp_set_ulong(&b, 1uL);
316+
mp_set_ul(&a, 0uL);
317+
mp_set_ul(&b, 1uL);
318318
if ((err = s_mp_jacobi(&a, &b, &i)) != MP_OKAY) {
319319
printf("Failed executing s_mp_jacobi(0 | 1) %s.\n", mp_error_to_string(err));
320320
goto LBL_ERR;
@@ -324,10 +324,10 @@ static int test_s_mp_jacobi(void)
324324
goto LBL_ERR;
325325
}
326326
for (cnt = 0; cnt < (int)(sizeof(jacobi)/sizeof(jacobi[0])); ++cnt) {
327-
mp_set_ulong(&b, jacobi[cnt].n);
327+
mp_set_ul(&b, jacobi[cnt].n);
328328
/* only test positive values of a */
329329
for (n = -5; n <= 10; ++n) {
330-
mp_set_ulong(&a, (unsigned int)abs(n));
330+
mp_set_ul(&a, (unsigned int)abs(n));
331331
should = MP_OKAY;
332332
if (n < 0) {
333333
mp_neg(&a, &a);
@@ -391,8 +391,8 @@ static int test_mp_kronecker(void)
391391
return EXIT_FAILURE;
392392
}
393393

394-
mp_set_ulong(&a, 0uL);
395-
mp_set_ulong(&b, 1uL);
394+
mp_set_ul(&a, 0uL);
395+
mp_set_ul(&b, 1uL);
396396
if ((err = mp_kronecker(&a, &b, &i)) != MP_OKAY) {
397397
printf("Failed executing mp_kronecker(0 | 1) %s.\n", mp_error_to_string(err));
398398
goto LBL_ERR;
@@ -404,18 +404,18 @@ static int test_mp_kronecker(void)
404404
for (cnt = 0; cnt < (int)(sizeof(kronecker)/sizeof(kronecker[0])); ++cnt) {
405405
k = kronecker[cnt].n;
406406
if (k < 0) {
407-
mp_set_ulong(&a, (unsigned long)(-k));
407+
mp_set_ul(&a, (unsigned long)(-k));
408408
mp_neg(&a, &a);
409409
} else {
410-
mp_set_ulong(&a, (unsigned long) k);
410+
mp_set_ul(&a, (unsigned long) k);
411411
}
412412
/* only test positive values of a */
413413
for (m = -10; m <= 10; m++) {
414414
if (m < 0) {
415-
mp_set_ulong(&b,(unsigned long)(-m));
415+
mp_set_ul(&b,(unsigned long)(-m));
416416
mp_neg(&b, &b);
417417
} else {
418-
mp_set_ulong(&b, (unsigned long) m);
418+
mp_set_ul(&b, (unsigned long) m);
419419
}
420420
if ((err = mp_kronecker(&a, &b, &i)) != MP_OKAY) {
421421
printf("Failed executing mp_kronecker(%ld | %ld) %s.\n", kronecker[cnt].n, m, mp_error_to_string(err));
@@ -446,13 +446,13 @@ static int test_mp_complement(void)
446446

447447
for (i = 0; i < 1000; ++i) {
448448
long l = rand_long();
449-
mp_set_ulong(&a, ulabs(l));
449+
mp_set_ul(&a, ulabs(l));
450450
if (l < 0)
451451
mp_neg(&a, &a);
452452
mp_complement(&a, &b);
453453

454454
l = ~l;
455-
mp_set_ulong(&c, ulabs(l));
455+
mp_set_ul(&c, ulabs(l));
456456
if (l < 0)
457457
mp_neg(&c, &c);
458458

@@ -483,13 +483,13 @@ static int test_mp_signed_rsh(void)
483483
int em;
484484

485485
l = rand_long();
486-
mp_set_ulong(&a, ulabs(l));
486+
mp_set_ul(&a, ulabs(l));
487487
if (l < 0)
488488
mp_neg(&a, &a);
489489

490490
em = abs(rand_int()) % 32;
491491

492-
mp_set_ulong(&d, ulabs(l >> em));
492+
mp_set_ul(&d, ulabs(l >> em));
493493
if ((l >> em) < 0)
494494
mp_neg(&d, &d);
495495

@@ -521,16 +521,16 @@ static int test_mp_xor(void)
521521
long l, em;
522522

523523
l = rand_long();
524-
mp_set_ulong(&a, ulabs(l));
524+
mp_set_ul(&a, ulabs(l));
525525
if (l < 0)
526526
mp_neg(&a, &a);
527527

528528
em = rand_long();
529-
mp_set_ulong(&b, ulabs(em));
529+
mp_set_ul(&b, ulabs(em));
530530
if (em < 0)
531531
mp_neg(&b, &b);
532532

533-
mp_set_ulong(&d, ulabs(l ^ em));
533+
mp_set_ul(&d, ulabs(l ^ em));
534534
if ((l ^ em) < 0)
535535
mp_neg(&d, &d);
536536

@@ -562,16 +562,16 @@ static int test_mp_or(void)
562562
long l, em;
563563

564564
l = rand_long();
565-
mp_set_ulong(&a, ulabs(l));
565+
mp_set_ul(&a, ulabs(l));
566566
if (l < 0)
567567
mp_neg(&a, &a);
568568

569569
em = rand_long();
570-
mp_set_ulong(&b, ulabs(em));
570+
mp_set_ul(&b, ulabs(em));
571571
if (em < 0)
572572
mp_neg(&b, &b);
573573

574-
mp_set_ulong(&d, ulabs(l | em));
574+
mp_set_ul(&d, ulabs(l | em));
575575
if ((l | em) < 0)
576576
mp_neg(&d, &d);
577577

@@ -602,16 +602,16 @@ static int test_mp_and(void)
602602
long l, em;
603603

604604
l = rand_long();
605-
mp_set_ulong(&a, ulabs(l));
605+
mp_set_ul(&a, ulabs(l));
606606
if (l < 0)
607607
mp_neg(&a, &a);
608608

609609
em = rand_long();
610-
mp_set_ulong(&b, ulabs(em));
610+
mp_set_ul(&b, ulabs(em));
611611
if (em < 0)
612612
mp_neg(&b, &b);
613613

614-
mp_set_ulong(&d, ulabs(l & em));
614+
mp_set_ul(&d, ulabs(l & em));
615615
if ((l & em) < 0)
616616
mp_neg(&d, &d);
617617

@@ -744,18 +744,18 @@ static int test_mp_get_uint32(void)
744744

745745
for (i = 0; i < 1000; ++i) {
746746
t = (unsigned long)rand_long() & 0xFFFFFFFFuL;
747-
mp_set_ulong(&a, t);
747+
mp_set_ul(&a, t);
748748
if (t != mp_get_uint32(&a)) {
749749
printf("\nmp_get_uint32() bad result!");
750750
goto LBL_ERR;
751751
}
752752
}
753-
mp_set_ulong(&a, 0uL);
753+
mp_set_ul(&a, 0uL);
754754
if (mp_get_uint32(&a) != 0) {
755755
printf("\nmp_get_uint32() bad result!");
756756
goto LBL_ERR;
757757
}
758-
mp_set_ulong(&a, 0xFFFFFFFFuL);
758+
mp_set_ul(&a, 0xFFFFFFFFuL);
759759
if (mp_get_uint32(&a) != 0xFFFFFFFFuL) {
760760
printf("\nmp_get_uint32() bad result!");
761761
goto LBL_ERR;
@@ -768,7 +768,7 @@ static int test_mp_get_uint32(void)
768768
return EXIT_FAILURE;
769769
}
770770

771-
static int test_mp_get_ulong(void)
771+
static int test_mp_get_ul(void)
772772
{
773773
unsigned long s, t;
774774
int i;
@@ -784,10 +784,10 @@ static int test_mp_get_ulong(void)
784784
t = ~0UL;
785785
printf(" t = 0x%lx i = %d\r", t, i);
786786
do {
787-
mp_set_ulong(&a, t);
788-
s = mp_get_ulong(&a);
787+
mp_set_ul(&a, t);
788+
s = mp_get_ul(&a);
789789
if (s != t) {
790-
printf("\nmp_get_ulong() bad result! 0x%lx != 0x%lx", s, t);
790+
printf("\nmp_get_ul() bad result! 0x%lx != 0x%lx", s, t);
791791
goto LBL_ERR;
792792
}
793793
t <<= 1;
@@ -943,8 +943,8 @@ static int test_mp_sqrtmod_prime(void)
943943

944944
/* r^2 = n (mod p) */
945945
for (i = 0; i < (int)(sizeof(sqrtmod_prime)/sizeof(sqrtmod_prime[0])); ++i) {
946-
mp_set_ulong(&a, sqrtmod_prime[i].p);
947-
mp_set_ulong(&b, sqrtmod_prime[i].n);
946+
mp_set_ul(&a, sqrtmod_prime[i].p);
947+
mp_set_ul(&b, sqrtmod_prime[i].n);
948948
if (mp_sqrtmod_prime(&b, &a, &c) != MP_OKAY) {
949949
printf("Failed executing %d. mp_sqrtmod_prime\n", (i+1));
950950
goto LBL_ERR;
@@ -2154,7 +2154,7 @@ int unit_tests(int argc, char **argv)
21542154
T(mp_fread_fwrite),
21552155
T(mp_get_uint32),
21562156
T(mp_get_uint64),
2157-
T(mp_get_ulong),
2157+
T(mp_get_ul),
21582158
T(mp_ilogb),
21592159
T(mp_incr),
21602160
T(mp_invmod),

‎doc/bn.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -882,8 +882,8 @@ \subsection{Long Constants - platform dependant}
882882

883883
\index{mp\_set\_ulong}
884884
\begin{alltt}
885-
void mp_set_slong (mp_int * a, long b);
886-
void mp_set_ulong (mp_int * a, unsigned long b);
885+
void mp_set_l (mp_int * a, long b);
886+
void mp_set_ul (mp_int * a, unsigned long b);
887887
\end{alltt}
888888

889889
This will assign the value of the platform-dependent sized variable $b$ to the mp\_int $a$.
@@ -892,8 +892,8 @@ \subsection{Long Constants - platform dependant}
892892

893893
\index{mp\_get\_ulong}
894894
\begin{alltt}
895-
long mp_get_slong (mp_int * a);
896-
unsigned long mp_get_ulong (mp_int * a);
895+
long mp_get_l (mp_int * a);
896+
unsigned long mp_get_ul (mp_int * a);
897897
\end{alltt}
898898

899899
This will return the least significant bits of the mp\_int $a$ that fit into a ``long''.

‎tommath.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -297,24 +297,24 @@ uint32_t mp_get_mag32(const mp_int *a) MP_WUR;
297297
uint64_t mp_get_mag64(const mp_int *a) MP_WUR;
298298

299299
/* get integer, set integer (long) */
300-
#define mp_get_slong(a) (sizeof (long) == 8 ? (long)mp_get_int64(a) : (long)mp_get_int32(a))
301-
#define mp_set_slong(a, b) (sizeof (long) == 8 ? mp_set_int64((a), (b)) : mp_set_int32((a), (int32_t)(b)))
300+
#define mp_get_l(a) (sizeof (long) == 8 ? (long)mp_get_int64(a) : (long)mp_get_int32(a))
301+
#define mp_set_l(a, b) (sizeof (long) == 8 ? mp_set_int64((a), (b)) : mp_set_int32((a), (int32_t)(b)))
302302

303303
/* get integer, set integer (unsigned long) */
304-
#define mp_get_ulong(a) (sizeof (long) == 8 ? (unsigned long)mp_get_uint64(a) : (unsigned long)mp_get_uint32(a))
305-
#define mp_set_ulong(a, b) (sizeof (long) == 8 ? mp_set_uint64((a), (b)) : mp_set_uint32((a), (uint32_t)(b)))
306-
#define mp_get_mag_long(a) (sizeof (long) == 8 ? (unsigned long)mp_get_mag64(a) : (unsigned long)mp_get_mag32(a))
304+
#define mp_get_ul(a) (sizeof (long) == 8 ? (unsigned long)mp_get_uint64(a) : (unsigned long)mp_get_uint32(a))
305+
#define mp_set_ul(a, b) (sizeof (long) == 8 ? mp_set_uint64((a), (b)) : mp_set_uint32((a), (uint32_t)(b)))
306+
#define mp_get_magl(a) (sizeof (long) == 8 ? (unsigned long)mp_get_mag64(a) : (unsigned long)mp_get_mag32(a))
307307

308308
/* set to single unsigned digit, up to MP_DIGIT_MAX */
309309
void mp_set(mp_int *a, mp_digit b);
310310
mp_err mp_init_set(mp_int *a, mp_digit b) MP_WUR;
311311

312312
/* get integer, set integer and init with integer (deprecated) */
313313
MP_DEPRECATED(mp_get_mag32/mp_get_uint32) unsigned long mp_get_int(const mp_int *a) MP_WUR;
314-
MP_DEPRECATED(mp_get_mag_long/mp_get_ulong) unsigned long mp_get_long(const mp_int *a) MP_WUR;
314+
MP_DEPRECATED(mp_get_magl/mp_get_ul) unsigned long mp_get_long(const mp_int *a) MP_WUR;
315315
MP_DEPRECATED(mp_get_mag64/mp_get_uint64) unsigned long long mp_get_long_long(const mp_int *a) MP_WUR;
316316
MP_DEPRECATED(mp_set_uint32) mp_err mp_set_int(mp_int *a, unsigned long b);
317-
MP_DEPRECATED(mp_set_ulong) mp_err mp_set_long(mp_int *a, unsigned long b);
317+
MP_DEPRECATED(mp_set_ul) mp_err mp_set_long(mp_int *a, unsigned long b);
318318
MP_DEPRECATED(mp_set_uint64) mp_err mp_set_long_long(mp_int *a, unsigned long long b);
319319
MP_DEPRECATED(mp_init_uint32) mp_err mp_init_set_int(mp_int *a, unsigned long b) MP_WUR;
320320

0 commit comments

Comments
 (0)