From 8d90515262afe628112e2d7a4c51a06412931ce6 Mon Sep 17 00:00:00 2001 From: Guillaume Melquiond <guillaume.melquiond@inria.fr> Date: Mon, 10 Feb 2020 13:57:55 +0100 Subject: [PATCH] Add a header that overwrites gmp.h with declarations present in wmp.h. --- Makefile.am | 2 +- README.md | 2 ++ wmp-gmp.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 wmp-gmp.h diff --git a/Makefile.am b/Makefile.am index 9c65d06..e0205ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,4 +25,4 @@ libwmp_a_SOURCES = \ lib/zmul2exp.c lib/zmul2exp.h lib/zdiv2exp.c lib/zdiv2exp.h -include_HEADERS = wmp.h +include_HEADERS = wmp.h wmp-gmp.h diff --git a/README.md b/README.md index 2c58a19..52bef09 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ To compile and install the library, use the following commands: The library is meant to be used in place of GMP. To do so, replace `#include <gmp.h>` by `#include <wmp.h>` in C source files, and replace `-lgmp` by `-lwmp` during linking. All functions and types are prefixed by `w` to avoid conflicts, e.g., `mpz_add` is called `wmpz_add`. +When unsupported functions are needed, one can instead use `#include <wmp-gmp.h>`. In that case, functions and types no longer need to be prefixed by `w`, as they also have their standard GMP names. All GMP functions are available, but the ones from WhyMP take precedence. Linking is then done using `-lwmp -lgmp`. + ## Generating the sources To regenerate the C sources of the library using Why3, go into the `why3` submodule, and then use the following commands: diff --git a/wmp-gmp.h b/wmp-gmp.h new file mode 100644 index 0000000..d41c87a --- /dev/null +++ b/wmp-gmp.h @@ -0,0 +1,90 @@ +#ifndef __WMP_H__ + +#include <gmp.h> +#include <wmp.h> + +#undef mpn_add +#undef mpn_add_1 +#undef mpn_add_n +#undef mpn_addmul_1 +#undef mpn_cmp +#undef mpn_copyd +#undef mpn_copyi +#undef mpn_divrem_1 +#undef mpn_lshift +#undef mpn_mul +#undef mpn_mul_1 +#undef mpn_mul_n +#undef mpn_powm +#undef mpn_rshift +#undef mpn_sqrtrem +#undef mpn_sub +#undef mpn_sub_1 +#undef mpn_sub_n +#undef mpn_submul_1 +#undef mpn_tdiv_qr +#undef mpn_zero +#undef mpn_zero_p + +#undef mpz_add +#undef mpz_add_ui +#undef mpz_clear +#undef mpz_cmp +#undef mpz_cmp_ui +#undef mpz_get_ui +#undef mpz_init +#undef mpz_mul +#undef mpz_mul2exp +#undef mpz_mul_si +#undef mpz_mul_ui +#undef mpz_realloc +#undef mpz_set_si +#undef mpz_set_ui +#undef mpz_sub +#undef mpz_sub_ui +#undef mpz_tdiv_q_2exp +#undef mpz_ui_sub + +#define mpn_add wmpn_add +#define mpn_add_1 wmpn_add_1 +#define mpn_add_n wmpn_add_n +#define mpn_addmul_1 wmpn_addmul_1 +#define mpn_cmp wmpn_cmp +#define mpn_copyd wmpn_copyd +#define mpn_copyi wmpn_copyi +#define mpn_divrem_1 wmpn_divrem_1 +#define mpn_lshift wmpn_lshift +#define mpn_mul wmpn_mul +#define mpn_mul_1 wmpn_mul_1 +#define mpn_mul_n wmpn_mul_n +#define mpn_powm wmpn_powm +#define mpn_rshift wmpn_rshift +#define mpn_sqrtrem wmpn_sqrtrem +#define mpn_sub wmpn_sub +#define mpn_sub_1 wmpn_sub_1 +#define mpn_sub_n wmpn_sub_n +#define mpn_submul_1 wmpn_submul_1 +#define mpn_tdiv_qr wmpn_tdiv_qr +#define mpn_zero wmpn_zero +#define mpn_zero_p wmpn_zero_p + +#define mpz_add wmpz_add +#define mpz_add_ui wmpz_add_ui +#define mpz_clear wmpz_clear +#define mpz_cmp wmpz_cmp +#define mpz_cmp_ui wmpz_cmp_ui +#define mpz_get_ui wmpz_get_ui +#define mpz_init wmpz_init +#define mpz_mul wmpz_mul +#define mpz_mul2exp wmpz_mul2exp +#define mpz_mul_si wmpz_mul_si +#define mpz_mul_ui wmpz_mul_ui +#define mpz_realloc wmpz_realloc +#define mpz_set_si wmpz_set_si +#define mpz_set_ui wmpz_set_ui +#define mpz_sub wmpz_sub +#define mpz_sub_ui wmpz_sub_ui +#define mpz_tdiv_q_2exp wmpz_tdiv_q_2exp +#define mpz_ui_sub wmpz_ui_sub + +#endif -- GitLab