Add functions for comparing an MPI to an integer.

include/cryb/mpi.h

@@ -42,10 +42,22 @@ const char *cryb_mpi_version(void);
 #define mpi_add_abs		cryb_mpi_add_abs
 #define mpi_cmp			cryb_mpi_cmp
 #define mpi_cmp_abs		cryb_mpi_cmp_abs
+#define mpi_cmp_abs_u32		cryb_mpi_cmp_abs_u32
+#define mpi_cmp_abs_u64		cryb_mpi_cmp_abs_u64
+#define mpi_cmp_i32		cryb_mpi_cmp_i32
+#define mpi_cmp_i64		cryb_mpi_cmp_i64
+#define mpi_cmp_u32		cryb_mpi_cmp_u32
+#define mpi_cmp_u64		cryb_mpi_cmp_u64
 #define mpi_copy		cryb_mpi_copy
 #define mpi_destroy		cryb_mpi_destroy
 #define mpi_eq			cryb_mpi_eq
 #define mpi_eq_abs		cryb_mpi_eq_abs
+#define mpi_eq_abs_u32		cryb_mpi_eq_abs_u32
+#define mpi_eq_abs_u64		cryb_mpi_eq_abs_u64
+#define mpi_eq_i32		cryb_mpi_eq_i32
+#define mpi_eq_i64		cryb_mpi_eq_i64
+#define mpi_eq_u32		cryb_mpi_eq_u32
+#define mpi_eq_u64		cryb_mpi_eq_u64
 #define mpi_grow		cryb_mpi_grow
 #define mpi_init		cryb_mpi_init
 #define mpi_load		cryb_mpi_load
@@ -92,8 +104,20 @@ int mpi_sub_abs(cryb_mpi *, const cryb_mpi *, const cryb_mpi *);
 int mpi_sub(cryb_mpi *, const cryb_mpi *, const cryb_mpi *);
 int mpi_cmp_abs(const cryb_mpi *, const cryb_mpi *);
 int mpi_cmp(const cryb_mpi *, const cryb_mpi *);
+int mpi_cmp_abs_u64(const cryb_mpi *, uint64_t);
+int mpi_cmp_u64(const cryb_mpi *, uint64_t);
+int mpi_cmp_i64(const cryb_mpi *, int64_t);
+int mpi_cmp_abs_u32(const cryb_mpi *, uint32_t);
+int mpi_cmp_u32(const cryb_mpi *, uint32_t);
+int mpi_cmp_i32(const cryb_mpi *, int32_t);
 int mpi_eq_abs(const cryb_mpi *, const cryb_mpi *);
 int mpi_eq(const cryb_mpi *, const cryb_mpi *);
+int mpi_eq_abs_u64(const cryb_mpi *, uint64_t);
+int mpi_eq_u64(const cryb_mpi *, uint64_t);
+int mpi_eq_i64(const cryb_mpi *, int64_t);
+int mpi_eq_abs_u32(const cryb_mpi *, uint32_t);
+int mpi_eq_u32(const cryb_mpi *, uint32_t);
+int mpi_eq_i32(const cryb_mpi *, int32_t);
 
 CRYB_END
 

lib/mpi/Makefile.am

@@ -7,10 +7,14 @@ libcryb_mpi_la_SOURCES = \
 	cryb_mpi_add_abs.c \
 	cryb_mpi_cmp.c \
 	cryb_mpi_cmp_abs.c \
+	cryb_mpi_cmp_i32.c \
+	cryb_mpi_cmp_i64.c \
 	cryb_mpi_copy.c \
 	cryb_mpi_destroy.c \
 	cryb_mpi_eq.c \
 	cryb_mpi_eq_abs.c \
+	cryb_mpi_eq_i32.c \
+	cryb_mpi_eq_i64.c \
 	cryb_mpi_grow.c \
 	cryb_mpi_init.c \
 	cryb_mpi_load.c \

lib/mpi/cryb_mpi_cmp_i32.c

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2017 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "cryb/impl.h"
+
+#include <stdint.h>
+#include <string.h>
+
+#include <cryb/mpi.h>
+
+#include "cryb_mpi_impl.h"
+
+/*
+ * Fast comparison of an MPI with a 32-bit integer
+ */
+int
+mpi_cmp_abs_u32(const cryb_mpi *X, uint32_t u)
+{
+
+	/* if log2(|X|) > N then |X| > |i|  */
+	if (X->msb >= 32)
+		return (1);
+	if (X->words[0] != u)
+		return (X->words[0] > u ? 1 : -1);
+	return (0);
+}
+
+int
+mpi_cmp_u32(const cryb_mpi *X, uint32_t u)
+{
+
+	return (X->neg ? -1 : mpi_cmp_abs_u32(X, u));
+}
+
+int
+mpi_cmp_i32(const cryb_mpi *X, int32_t i)
+{
+
+	if (X->neg) {
+		if (i < 0)
+			return (-mpi_cmp_abs_u32(X, -i));
+		else
+			return (-1);
+	} else {
+		if (i < 0)
+			return (1);
+		else
+			return (mpi_cmp_abs_u32(X, i));
+	}
+}

lib/mpi/cryb_mpi_cmp_i64.c

@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2017 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "cryb/impl.h"
+
+#include <stdint.h>
+#include <string.h>
+
+#include <cryb/mpi.h>
+
+#include "cryb_mpi_impl.h"
+
+/*
+ * Fast comparison of an MPI with a 64-bit integer
+ */
+int
+mpi_cmp_abs_u64(const cryb_mpi *X, uint64_t u)
+{
+	uint32_t h, l;
+
+	/* if log2(|X|) > N then |X| > |i|  */
+	if (X->msb >= 64)
+		return (1);
+	/* compare upper half */
+	h = u >> 32;
+	if (X->msb > 31 && X->words[1] != h)
+		return (X->words[1] > h ? 1 : -1);
+	/* compare lower half */
+	l = u & 0xffffffffLU;
+	if (X->words[0] != l)
+		return (X->words[0] > l ? 1 : -1);
+	return (0);
+}
+
+int
+mpi_cmp_u64(const cryb_mpi *X, uint64_t u)
+{
+
+	return (X->neg ? -1 : mpi_cmp_abs_u64(X, u));
+}
+
+int
+mpi_cmp_i64(const cryb_mpi *X, int64_t i)
+{
+
+	if (X->neg) {
+		if (i < 0)
+			return (-mpi_cmp_abs_u64(X, -i));
+		else
+			return (-1);
+	} else {
+		if (i < 0)
+			return (1);
+		else
+			return (mpi_cmp_abs_u64(X, i));
+	}
+}

lib/mpi/cryb_mpi_eq_i32.c

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2017 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "cryb/impl.h"
+
+#include <stdint.h>
+#include <string.h>
+
+#include <cryb/mpi.h>
+
+#include "cryb_mpi_impl.h"
+
+/*
+ * Fast comparison of an MPI with a 32-bit integer
+ */
+int
+mpi_eq_abs_u32(const cryb_mpi *A, uint32_t u)
+{
+
+	return (A->msb < 32 && A->words[0] == u);
+}
+
+int
+mpi_eq_u32(const cryb_mpi *A, uint32_t u)
+{
+
+	return (!A->neg && mpi_eq_abs_u32(A, u));
+}
+
+int
+mpi_eq_i32(const cryb_mpi *A, int32_t i)
+{
+
+	return (A->neg ? (i < 0 && mpi_eq_abs_u32(A, -i)) :
+	    (i >= 0 && mpi_eq_abs_u32(A, i)));
+}

lib/mpi/cryb_mpi_eq_i64.c

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "cryb/impl.h"
+
+#include <stdint.h>
+#include <string.h>
+
+#include <cryb/mpi.h>
+
+#include "cryb_mpi_impl.h"
+
+/*
+ * Fast comparison of an MPI with a 64-bit integer
+ */
+int
+mpi_eq_abs_u64(const cryb_mpi *A, uint64_t u)
+{
+
+	return (A->msb < 64 && A->words[1] == (u >> 32) &&
+	    A->words[0] == (u & 0xffffffffLU));
+}
+
+int
+mpi_eq_u64(const cryb_mpi *A, uint64_t u)
+{
+
+	return (!A->neg && mpi_eq_abs_u64(A, u));
+}
+
+int
+mpi_eq_i64(const cryb_mpi *A, int64_t i)
+{
+
+	return (A->neg ? (i < 0 && mpi_eq_abs_u64(A, -i)) :
+	    (i >= 0 && mpi_eq_abs_u64(A, i)));
+}

t/t_mpi_compar.c

@@ -49,7 +49,8 @@
 
 static struct t_cmp_case {
 	const char *desc;
-	int a, b, cmp;
+	int32_t a, b;
+	int cmp;
 } t_cmp_cases[] = {
 	{ "-3 == -3",	-3,	-3,	 0 },
 	{ "-3 < -2",	-3,	-2,	-1 },
@@ -126,6 +127,50 @@ t_mpi_cmp(char **desc CRYB_UNUSED, void *arg)
 	return (ret);
 }
 
+static int
+t_mpi_eq(char **desc CRYB_UNUSED, void *arg)
+{
+	struct t_cmp_case *tc = arg;
+	cryb_mpi a = CRYB_MPI_ZERO, b = CRYB_MPI_ZERO;
+	int ret = 1;
+
+	mpi_set(&a, tc->a);
+	mpi_set(&b, tc->b);
+	ret &= t_compare_i(tc->cmp == 0, mpi_eq(&a, &b));
+	mpi_destroy(&a);
+	mpi_destroy(&b);
+	return (ret);
+}
+
+/*
+ * Compare an MPI with an integer
+ */
+static int
+t_mpi_cmp_i32(char **desc CRYB_UNUSED, void *arg)
+{
+	struct t_cmp_case *tc = arg;
+	cryb_mpi a = CRYB_MPI_ZERO;
+	int ret = 1;
+
+	mpi_set(&a, tc->a);
+	ret &= t_compare_i(tc->cmp, mpi_cmp_i32(&a, tc->b));
+	mpi_destroy(&a);
+	return (ret);
+}
+
+static int
+t_mpi_eq_i32(char **desc CRYB_UNUSED, void *arg)
+{
+	struct t_cmp_case *tc = arg;
+	cryb_mpi a = CRYB_MPI_ZERO;
+	int ret = 1;
+
+	mpi_set(&a, tc->a);
+	ret &= t_compare_i(tc->cmp == 0, mpi_eq_i32(&a, tc->b));
+	mpi_destroy(&a);
+	return (ret);
+}
+
 
 /***************************************************************************
  * Boilerplate
@@ -144,7 +189,16 @@ t_prepare(int argc, char *argv[])
 	/* comparison */
 	for (i = 0; i < sizeof t_cmp_cases / sizeof t_cmp_cases[0]; ++i)
 		t_add_test(t_mpi_cmp, &t_cmp_cases[i],
-		    "%s", t_cmp_cases[i].desc);
+		    "mpi cmp mpi (%s)", t_cmp_cases[i].desc);
+	for (i = 0; i < sizeof t_cmp_cases / sizeof t_cmp_cases[0]; ++i)
+		t_add_test(t_mpi_eq, &t_cmp_cases[i],
+		    "mpi eq mpi (%s)", t_cmp_cases[i].desc);
+	for (i = 0; i < sizeof t_cmp_cases / sizeof t_cmp_cases[0]; ++i)
+		t_add_test(t_mpi_cmp_i32, &t_cmp_cases[i],
+		    "mpi cmp i32 (%s)", t_cmp_cases[i].desc);
+	for (i = 0; i < sizeof t_cmp_cases / sizeof t_cmp_cases[0]; ++i)
+		t_add_test(t_mpi_eq_i32, &t_cmp_cases[i],
+		    "mpi eq i32 (%s)", t_cmp_cases[i].desc);
 
 	return (0);
 }