Skip to content

Simplify test-cases, by using mp_set_l #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2019
Merged

Simplify test-cases, by using mp_set_l #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 15 additions & 56 deletions demo/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ static int64_t rand_int64(void)
return x;
}

static unsigned long ulabs(long x)
{
return x > 0 ? (unsigned long)x : -(unsigned long)x;
}

static uint32_t uabs32(int32_t x)
{
return x > 0 ? (uint32_t)x : -(uint32_t)x;
Expand Down Expand Up @@ -351,20 +346,10 @@ static int test_mp_kronecker(void)
}
for (cnt = 0; cnt < (int)(sizeof(kronecker)/sizeof(kronecker[0])); ++cnt) {
k = kronecker[cnt].n;
if (k < 0) {
mp_set_ul(&a, (unsigned long)(-k));
mp_neg(&a, &a);
} else {
mp_set_ul(&a, (unsigned long) k);
}
mp_set_l(&a, k);
/* only test positive values of a */
for (m = -10; m <= 10; m++) {
if (m < 0) {
mp_set_ul(&b,(unsigned long)(-m));
mp_neg(&b, &b);
} else {
mp_set_ul(&b, (unsigned long) m);
}
mp_set_l(&b, m);
if ((err = mp_kronecker(&a, &b, &i)) != MP_OKAY) {
printf("Failed executing mp_kronecker(%ld | %ld) %s.\n", kronecker[cnt].n, m, mp_error_to_string(err));
goto LBL_ERR;
Expand Down Expand Up @@ -394,15 +379,11 @@ static int test_mp_complement(void)

for (i = 0; i < 1000; ++i) {
long l = rand_long();
mp_set_ul(&a, ulabs(l));
if (l < 0)
mp_neg(&a, &a);
mp_set_l(&a, l);
mp_complement(&a, &b);

l = ~l;
mp_set_ul(&c, ulabs(l));
if (l < 0)
mp_neg(&c, &c);
mp_set_l(&c, l);

if (mp_cmp(&b, &c) != MP_EQ) {
printf("\nmp_complement() bad result!");
Expand Down Expand Up @@ -431,15 +412,11 @@ static int test_mp_signed_rsh(void)
int em;

l = rand_long();
mp_set_ul(&a, ulabs(l));
if (l < 0)
mp_neg(&a, &a);
mp_set_l(&a, l);

em = abs(rand_int()) % 32;

mp_set_ul(&d, ulabs(l >> em));
if ((l >> em) < 0)
mp_neg(&d, &d);
mp_set_l(&d, l >> em);

mp_signed_rsh(&a, em, &b);
if (mp_cmp(&b, &d) != MP_EQ) {
Expand Down Expand Up @@ -469,18 +446,12 @@ static int test_mp_xor(void)
long l, em;

l = rand_long();
mp_set_ul(&a, ulabs(l));
if (l < 0)
mp_neg(&a, &a);
mp_set_l(&a,l);

em = rand_long();
mp_set_ul(&b, ulabs(em));
if (em < 0)
mp_neg(&b, &b);
mp_set_l(&b, em);

mp_set_ul(&d, ulabs(l ^ em));
if ((l ^ em) < 0)
mp_neg(&d, &d);
mp_set_l(&d, l ^ em);

mp_xor(&a, &b, &c);
if (mp_cmp(&c, &d) != MP_EQ) {
Expand Down Expand Up @@ -510,18 +481,12 @@ static int test_mp_or(void)
long l, em;

l = rand_long();
mp_set_ul(&a, ulabs(l));
if (l < 0)
mp_neg(&a, &a);
mp_set_l(&a, l);

em = rand_long();
mp_set_ul(&b, ulabs(em));
if (em < 0)
mp_neg(&b, &b);
mp_set_l(&b, em);

mp_set_ul(&d, ulabs(l | em));
if ((l | em) < 0)
mp_neg(&d, &d);
mp_set_l(&d, l | em);

mp_or(&a, &b, &c);
if (mp_cmp(&c, &d) != MP_EQ) {
Expand Down Expand Up @@ -550,18 +515,12 @@ static int test_mp_and(void)
long l, em;

l = rand_long();
mp_set_ul(&a, ulabs(l));
if (l < 0)
mp_neg(&a, &a);
mp_set_l(&a, l);

em = rand_long();
mp_set_ul(&b, ulabs(em));
if (em < 0)
mp_neg(&b, &b);
mp_set_l(&b, em);

mp_set_ul(&d, ulabs(l & em));
if ((l & em) < 0)
mp_neg(&d, &d);
mp_set_l(&d, l & em);

mp_and(&a, &b, &c);
if (mp_cmp(&c, &d) != MP_EQ) {
Expand Down
2 changes: 1 addition & 1 deletion etc/mersenne.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ int main(void)
tt = clock() - tt;

/* display if prime */
printf("2^%-5ld - 1 is prime, test took %ld ticks\n", k, tt);
printf("2^%-5ld - 1 is prime, test took %ld ticks\n", k, (long)tt);
}

/* goto next odd exponent */
Expand Down
2 changes: 1 addition & 1 deletion etc/pprime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ int main(void)
pprime(k, li, &p, &q);
t1 = clock() - t1;

printf("\n\nTook %ld ticks, %d bits\n", t1, mp_count_bits(&p));
printf("\n\nTook %d ticks, %d bits\n", t1, mp_count_bits(&p));

mp_toradix(&p, buf, 10);
printf("P == %s\n", buf);
Expand Down