Make zmul and zsqr (calls low-level functions) inline

Signed-off-by: Mattias Andrée <maandree@kth.se>

2 files changed, 29 insertions, 2 deletions

diff --git a/zahl.h b/zahl.h
index 93f3705..5cb9b1a 100644
--- a/zahl.h
+++ b/zahl.h
@@ -91,12 +91,12 @@ ZAHL_INLINE void zabs(z_t, z_t);        /* a := |b| */
 ZAHL_INLINE void zneg(z_t, z_t);        /* a := -b */
 void zadd(z_t, z_t, z_t);               /* a := b + c */
 void zsub(z_t, z_t, z_t);               /* a := b - c */
-void zmul(z_t, z_t, z_t);               /* a := b * c */
+ZAHL_INLINE void zmul(z_t, z_t, z_t);   /* a := b * c */
 void zmodmul(z_t, z_t, z_t, z_t);       /* a := (b * c) % d */
 void zdiv(z_t, z_t, z_t);               /* a := b / c */
 void zdivmod(z_t, z_t, z_t, z_t);       /* a := c / d, b = c % d */
 void zmod(z_t, z_t, z_t);               /* a := b % c */
-void zsqr(z_t, z_t);                    /* a := b² */
+ZAHL_INLINE void zsqr(z_t, z_t);        /* a := b² */
 void zmodsqr(z_t, z_t, z_t);            /* a := b² % c */
 void zpow(z_t, z_t, z_t);               /* a := b ↑ c */
 void zmodpow(z_t, z_t, z_t, z_t);       /* a := (b ↑ c) % d */
@@ -172,6 +172,8 @@ void zperror(const char *);             /* Identical to perror(3p) except it sup
 void zbset_ll_set(z_t, size_t);         /* zbset(a, a, b, 1) */
 void zbset_ll_clear(z_t, size_t);       /* zbset(a, a, b, 0) */
 void zbset_ll_flip(z_t, size_t);        /* zbset(a, a, b, -1) */
+void zmul_ll(z_t, z_t, z_t);            /* zmul for non-negative operands */
+void zsqr_ll(z_t, z_t);                 /* zsqr for non-negative operand */
 
 
 
diff --git a/zahl/inlines.h b/zahl/inlines.h
index 9e196f8..8f6b490 100644
--- a/zahl/inlines.h
+++ b/zahl/inlines.h
@@ -266,3 +266,28 @@ zsave(z_t a, void *buffer)
 	}
 	return sizeof(int) + sizeof(size_t) + (zzero(a) ? 0 : a->used * sizeof(zahl_char_t));
 }
+
+
+ZAHL_INLINE void
+zmul(z_t a, z_t b, z_t c)
+{
+	int b_sign, c_sign;
+	b_sign = b->sign, b->sign *= b_sign;
+	c_sign = c->sign, c->sign *= c_sign;
+	zmul_ll(a, b, c);
+	c->sign = c_sign;
+	b->sign = b_sign;
+	ZAHL_SET_SIGNUM(a, zsignum(b) * zsignum(c));
+}
+
+
+ZAHL_INLINE void
+zsqr(z_t a, z_t b)
+{
+	if (ZAHL_UNLIKELY(zzero(b))) {
+		ZAHL_SET_SIGNUM(a, 0);
+	} else {
+		zsqr_ll(a, b);
+		ZAHL_SET_SIGNUM(a, 1);
+	}
+}