ecc: remove ecc_modp_foo/ecc_modq_foo macros

To make ecc functions usage more obvious remove ecc_modp_foo() and
ecc_modq_foo() wrapper macros.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>

1 files changed, 27 insertions, 27 deletions

diff --git a/ecc-add-jjj.c b/ecc-add-jjj.c
index 1143e79a..54b2246a 100644
--- a/ecc-add-jjj.c
+++ b/ecc-add-jjj.c
@@ -74,47 +74,47 @@ ecc_add_jjj (const struct ecc_curve *ecc,
   mp_limb_t *v    = scratch + 6*ecc->p.size;
 
   /* z1^2, z2^2, u1 = x1 x2^2, u2 = x2 z1^2 - u1 */
-  ecc_modp_sqr (ecc, z1z1, p + 2*ecc->p.size);
-  ecc_modp_sqr (ecc, z2z2, q + 2*ecc->p.size);
-  ecc_modp_mul (ecc, u1, p, z2z2);
-  ecc_modp_mul (ecc, u2, q, z1z1);
-  ecc_modp_sub (ecc, u2, u2, u1);  /* Store h in u2 */
+  ecc_mod_sqr (&ecc->p, z1z1, p + 2*ecc->p.size);
+  ecc_mod_sqr (&ecc->p, z2z2, q + 2*ecc->p.size);
+  ecc_mod_mul (&ecc->p, u1, p, z2z2);
+  ecc_mod_mul (&ecc->p, u2, q, z1z1);
+  ecc_mod_sub (&ecc->p, u2, u2, u1);  /* Store h in u2 */
 
   /* z3, use i, j, v as scratch, result at i. */
-  ecc_modp_add (ecc, i, p + 2*ecc->p.size, q + 2*ecc->p.size);
-  ecc_modp_sqr (ecc, v, i);
-  ecc_modp_sub (ecc, v, v, z1z1);
-  ecc_modp_sub (ecc, v, v, z2z2);
-  ecc_modp_mul (ecc, i, v, u2);
+  ecc_mod_add (&ecc->p, i, p + 2*ecc->p.size, q + 2*ecc->p.size);
+  ecc_mod_sqr (&ecc->p, v, i);
+  ecc_mod_sub (&ecc->p, v, v, z1z1);
+  ecc_mod_sub (&ecc->p, v, v, z2z2);
+  ecc_mod_mul (&ecc->p, i, v, u2);
   /* Delayed write, to support in-place operation. */
 
   /* s1 = y1 z2^3, s2 = y2 z1^3, scratch at j and v */
-  ecc_modp_mul (ecc, j, z1z1, p + 2*ecc->p.size); /* z1^3 */
-  ecc_modp_mul (ecc, v, z2z2, q + 2*ecc->p.size); /* z2^3 */
-  ecc_modp_mul (ecc, s1, p + ecc->p.size, v);
-  ecc_modp_mul (ecc, v, j, q + ecc->p.size);
-  ecc_modp_sub (ecc, s2, v, s1);
-  ecc_modp_mul_1 (ecc, s2, s2, 2);
+  ecc_mod_mul (&ecc->p, j, z1z1, p + 2*ecc->p.size); /* z1^3 */
+  ecc_mod_mul (&ecc->p, v, z2z2, q + 2*ecc->p.size); /* z2^3 */
+  ecc_mod_mul (&ecc->p, s1, p + ecc->p.size, v);
+  ecc_mod_mul (&ecc->p, v, j, q + ecc->p.size);
+  ecc_mod_sub (&ecc->p, s2, v, s1);
+  ecc_mod_mul_1 (&ecc->p, s2, s2, 2);
 
   /* Store z3 */
   mpn_copyi (r + 2*ecc->p.size, i, ecc->p.size);
 
   /* i, j, v */
-  ecc_modp_sqr (ecc, i, u2);
-  ecc_modp_mul_1 (ecc, i, i, 4);
-  ecc_modp_mul (ecc, j, u2, i);
-  ecc_modp_mul (ecc, v, u1, i);
+  ecc_mod_sqr (&ecc->p, i, u2);
+  ecc_mod_mul_1 (&ecc->p, i, i, 4);
+  ecc_mod_mul (&ecc->p, j, u2, i);
+  ecc_mod_mul (&ecc->p, v, u1, i);
 
   /* now, u1, u2 and i are free for reuse .*/
   /* x3, use u1, u2 as scratch */
-  ecc_modp_sqr (ecc, u1, s2);
-  ecc_modp_sub (ecc, r, u1, j);
-  ecc_modp_submul_1 (ecc, r, v, 2);
+  ecc_mod_sqr (&ecc->p, u1, s2);
+  ecc_mod_sub (&ecc->p, r, u1, j);
+  ecc_mod_submul_1 (&ecc->p, r, v, 2);
 
   /* y3 */
-  ecc_modp_mul (ecc, u1, s1, j); /* Frees j */
-  ecc_modp_sub (ecc, u2, v, r);  /* Frees v */
-  ecc_modp_mul (ecc, i, s2, u2);
-  ecc_modp_submul_1 (ecc, i, u1, 2);
+  ecc_mod_mul (&ecc->p, u1, s1, j); /* Frees j */
+  ecc_mod_sub (&ecc->p, u2, v, r);  /* Frees v */
+  ecc_mod_mul (&ecc->p, i, s2, u2);
+  ecc_mod_submul_1 (&ecc->p, i, u1, 2);
   mpn_copyi (r + ecc->p.size, i, ecc->p.size);
 }