From 3c9ede175eabf2276f9ff99e8b886562f8b661a3 Mon Sep 17 00:00:00 2001 From: mdw Date: Sat, 13 Nov 1999 01:51:29 +0000 Subject: [PATCH] Minor interface changes. Should be stable now. --- mpx.h | 180 ++++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 110 insertions(+), 70 deletions(-) diff --git a/mpx.h b/mpx.h index 0f1a91d..9429e91 100644 --- a/mpx.h +++ b/mpx.h @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: mpx.h,v 1.2 1999/11/11 17:47:55 mdw Exp $ + * $Id: mpx.h,v 1.3 1999/11/13 01:51:29 mdw Exp $ * * Low level multiprecision arithmetic * @@ -30,6 +30,9 @@ /*----- Revision history --------------------------------------------------* * * $Log: mpx.h,v $ + * Revision 1.3 1999/11/13 01:51:29 mdw + * Minor interface changes. Should be stable now. + * * Revision 1.2 1999/11/11 17:47:55 mdw * Minor changes for different `mptypes.h' format. * @@ -62,32 +65,10 @@ #include -#ifndef MPTYPES_H -# include "mptypes.h" +#ifndef MPW_H +# include "mpw.h" #endif -/*----- Basic macros ------------------------------------------------------*/ - -/* --- @MPW@ --- * - * - * Arguments: @x@ = an unsigned value - * - * Use: Expands to the value of @x@ masked and typecast to a - * multiprecision integer word. - */ - -#define MPW(x) ((mpw)((x) & MPW_MAX)) - -/* --- @MPWS@ --- * - * - * Arguments: @n@ = number of words - * - * Use: Expands to the number of bytes occupied by a given number of - * words. - */ - -#define MPWS(n) ((n) * sizeof(mpw)) - /*----- General manipulation ----------------------------------------------*/ /* --- @MPX_SHRINK@ --- * @@ -99,10 +80,10 @@ */ #define MPX_SHRINK(v, vl) do { \ - const mpw *_v = (v), *_vl = (vl); \ - while (_vl > _v && *--_vl) \ - ; \ - (vl) = _vl; \ + const mpw *_vv = (v), *_vvl = (vl); \ + while (_vvl > _vv && !_vvl[-1]) \ + _vvl--; \ + (vl) = (mpw *)_vvl; \ } while (0) /* --- @MPX_BITS@ --- * @@ -116,6 +97,7 @@ #define MPX_BITS(b, v, vl) do { \ const mpw *_v = (v), *_vl = (vl); \ + MPX_SHRINK(_v, _vl); \ if (_v == _vl) \ (b) = 0; \ else { \ @@ -136,24 +118,24 @@ /* --- @MPX_OCTETS@ --- * * * Arguments: @size_t o@ = result variable - * @const mpw *v@ = pointer to array of words - * @size_t len@ = length of the array (from @MPX_LEN@) + * @const mpw *v, *vl@ = pointer to array of words * * Use: Calculates the number of octets in a multiprecision value. */ -#define MPX_OCTETS(o, v, len) do { \ +#define MPX_OCTETS(o, v, vl) do { \ const mpw *_v = (v), *_vl = (vl); \ + MPX_SHRINK(_v, _vl); \ if (_v == _vl) \ (o) = 0; \ else { \ - _size_t _o = (MPW_BITS / 8) * (_vl - _v - 1); \ + size_t _o = (MPW_BITS / 8) * (_vl - _v - 1); \ mpw _w = _vl[-1]; \ unsigned _k = MPW_BITS / 2; \ - while (_k > 3) { \ + while (_k >= 8) { \ if (_w >> _k) { \ _w >>= _k; \ - _o += _k - 3; \ + _o += _k >> 3; \ } \ _k >>= 1; \ } \ @@ -171,14 +153,14 @@ * Use: Copies a multiprecision integer. */ -#define MPX_COPY(dv, dvl, av, dvl) do { \ - mpw *_dv = (dv); \ - size_t _dn = (dvl) - _dv; \ - const mpw *_av = (av); \ - size_t _an = (avl) - _av; \ +#define MPX_COPY(dv, dvl, av, avl) do { \ + mpw *_dv = (dv), *_dvl = (dvl); \ + size_t _dn = _dvl - _dv; \ + const mpw *_av = (av), *_avl = (avl); \ + size_t _an = _avl - _av; \ if (_av == _dv) { \ if (_dvl > _avl) \ - memset(_avl, 0, MPWS(_dn - _an)); \ + memset(_dv, 0, MPWS(_dn - _an)); \ } else if (_an >= _dn) \ memmove(_dv, _av, MPWS(_dn)); \ else { \ @@ -194,9 +176,10 @@ * Use: Zeroes the area between the two vector pointers. */ -#define MPX_ZERO(v, vl) { \ +#define MPX_ZERO(v, vl) do { \ mpw *_v = (v), *_vl = (vl); \ - memset(_v, 0, MPWS(_vl - _v)); \ + if (_v < _vl) \ + memset(_v, 0, MPWS(_vl - _v)); \ } while (0) /*----- Loading and storing -----------------------------------------------*/ @@ -204,7 +187,7 @@ /* --- @mpx_storel@ --- * * * Arguments: @const mpw *v, *vl@ = base and limit of source vector - * @octet *p@ = pointer to octet array + * @void *p@ = pointer to octet array * @size_t sz@ = size of octet array * * Returns: --- @@ -215,12 +198,12 @@ */ extern void mpx_storel(const mpw */*v*/, const mpw */*vl*/, - octet */*p*/, size_t /*sz*/); + void */*p*/, size_t /*sz*/); /* --- @mpx_loadl@ --- * * * Arguments: @mpw *v, *vl@ = base and limit of destination vector - * @const octet *p@ = pointer to octet array + * @const void *p@ = pointer to octet array * @size_t sz@ = size of octet array * * Returns: --- @@ -231,12 +214,12 @@ extern void mpx_storel(const mpw */*v*/, const mpw */*vl*/, */ extern void mpx_loadl(mpw */*v*/, mpw */*vl*/, - const octet */*p*/, size_t /*sz*/); + const void */*p*/, size_t /*sz*/); /* --- @mpx_storeb@ --- * * * Arguments: @const mpw *v, *vl@ = base and limit of source vector - * @octet *p@ = pointer to octet array + * @void *p@ = pointer to octet array * @size_t sz@ = size of octet array * * Returns: --- @@ -247,12 +230,12 @@ extern void mpx_loadl(mpw */*v*/, mpw */*vl*/, */ extern void mpx_storeb(const mpw */*v*/, const mpw */*vl*/, - octet */*p*/, size_t /*sz*/); + void */*p*/, size_t /*sz*/); /* --- @mpx_loadb@ --- * * * Arguments: @mpw *v, *vl@ = base and limit of destination vector - * @const octet *p@ = pointer to octet array + * @const void *p@ = pointer to octet array * @size_t sz@ = size of octet array * * Returns: --- @@ -263,7 +246,7 @@ extern void mpx_storeb(const mpw */*v*/, const mpw */*vl*/, */ extern void mpx_loadb(mpw */*v*/, mpw */*vl*/, - const octet */*p*/, size_t /*sz*/); + const void */*p*/, size_t /*sz*/); /*----- Logical shifting --------------------------------------------------*/ @@ -337,6 +320,25 @@ extern void mpx_uadd(mpw */*dv*/, mpw */*dvl*/, const mpw */*av*/, const mpw */*avl*/, const mpw */*bv*/, const mpw */*bvl*/); +/* --- @MPX_UADDN@ --- * + * + * Arguments: @dv, dvl@ = source and destination vector base and limit + * @n@ = other addend + * + * Use: Adds a small integer to a multiprecision number. + */ + +#define MPX_UADDN(dv, dvl, n) do { \ + mpw *_ddv = (dv), *_ddvl = (dvl); \ + mpw _c = (n); \ + \ + while (_c && _ddv < _ddvl) { \ + mpd _x = (mpd)*_ddv + (mpd)_c; \ + *_ddv++ = MPW(_x); \ + _c = _x >> MPW_BITS; \ + } \ +} while (0) + /* --- @mpx_usub@ --- * * * Arguments: @mpw *dv, *dvl@ = destination vector base and limit @@ -348,7 +350,7 @@ extern void mpx_uadd(mpw */*dv*/, mpw */*dvl*/, * Use: Performs unsigned integer subtraction. If the result * overflows the destination vector, high-order bits are * discarded. This means that two's complement subtraction - * happens more or less for free, althuogh that's more a side- + * happens more or less for free, although that's more a side- * effect than anything else. The result vector may be equal to * either or both source vectors, but may not otherwise overlap * them. @@ -358,6 +360,46 @@ extern void mpx_usub(mpw */*dv*/, mpw */*dvl*/, const mpw */*av*/, const mpw */*avl*/, const mpw */*bv*/, const mpw */*bvl*/); +/* --- @MPX_USUBN@ --- * + * + * Arguments: @@dv, dvl@ = destination vector base and limit + * @n@ = other addend + * + * Use: Subtracts a small integer from a multiprecision number. + */ + +#define MPX_USUBN(dv, dvl, n) do { \ + mpw *_ddv = (dv), *_ddvl = (dvl); \ + mpw _c = (n); \ + \ + while (_ddv < _ddvl) { \ + mpd _x = (mpd)*_ddv - (mpd)_c; \ + *_ddv++ = MPW(_x); \ + if (_x >> MPW_BITS) \ + _c = 1; \ + else \ + break; \ + } \ +} while (0) + +/* --- @mpx_umul@ --- * + * + * Arguments: @mpw *dv, *dvl@ = destination vector base and limit + * @const mpw *av, *avl@ = multiplicand vector base and limit + * @const mpw *bv, *bvl@ = multiplier vector base and limit + * + * Returns: --- + * + * Use: Performs unsigned integer multiplication. If the result + * overflows the desination vector, high-order bits are + * discarded. The result vector may not overlap the argument + * vectors in any way. + */ + +extern void mpx_umul(mpw */*dv*/, mpw */*dvl*/, + const mpw */*av*/, const mpw */*avl*/, + const mpw */*bv*/, const mpw */*bvl*/); + /* --- @MPX_UMULN@ --- * * * Arguments: @dv, dvl@ = destination vector base and limit @@ -379,7 +421,7 @@ extern void mpx_usub(mpw */*dv*/, mpw */*dvl*/, mpd _x; \ if (_dv >= _dvl) \ break; \ - _x = _m * *_av++ + c; \ + _x = (mpd)_m * (mpd)*_av++ + _c; \ *_dv++ = MPW(_x); \ _c = _x >> MPW_BITS; \ } \ @@ -409,39 +451,33 @@ extern void mpx_usub(mpw */*dv*/, mpw */*dvl*/, mpd _x; \ if (_dv >= _dvl) \ break; \ - _x = *_dv + _m * *_av++ + _c; \ + _x = (mpd)*_dv + (mpd)_m * (mpd)*_av++ + _c; \ *_dv++ = MPW(_x); \ _c = _x >> MPW_BITS; \ } \ - if (_dv < _dvl) { \ - *_dv++ = MPW(_c); \ - MPX_ZERO(_dv, _dvl); \ - } \ + MPX_UADDN(_dv, _dvl, _c); \ } while (0) -/* --- @mpx_umul@ --- * +/* --- @mpx_usqr@ --- * * * Arguments: @mpw *dv, *dvl@ = destination vector base and limit - * @const mpw *av, *avl@ = multiplicand vector base and limit - * @const mpw *bv, *bvl@ = multiplier vector base and limit + * @const mpw *av, *av@ = source vector base and limit * * Returns: --- * - * Use: Performs unsigned integer multiplication. If the result - * overflows the desination vector, high-order bits are - * discarded. The result vector may not overlap the argument - * vectors in any way. + * Use: Performs unsigned integer squaring. The result vector must + * not overlap the source vector in any way. */ -extern void mpx_umul(mpw */*dv*/, mpw */*dvl*/, - const mpw */*av*/, const mpw */*avl*/, - const mpw */*bv*/, const mpw */*bvl*/); +extern void mpx_usqr(mpw */*dv*/, mpw */*dvl*/, + const mpw */*av*/, const mpw */*avl*/); /* --- @mpx_udiv@ --- * * * Arguments: @mpw *qv, *qvl@ = quotient vector base and limit * @mpw *rv, *rvl@ = dividend/remainder vector base and limit * @const mpw *dv, *dvl@ = divisor vector base and limit + * @mpw *sv, *svl@ = scratch workspace * * Returns: --- * @@ -450,11 +486,15 @@ extern void mpx_umul(mpw */*dv*/, mpw */*dvl*/, * the remainder vector can't overflow.) The various vectors * may not overlap in any way. Yes, I know it's a bit odd * requiring the dividend to be in the result position but it - * does make some sense really. + * does make some sense really. The remainder must have + * headroom for at least two extra words. The scratch space + * must be at least two words larger than twice the size of the + * divisor. */ extern void mpx_udiv(mpw */*qv*/, mpw */*qvl*/, mpw */*rv*/, mpw */*rvl*/, - const mpw */*dv*/, const mpw */*dvl*/); + const mpw */*dv*/, const mpw */*dvl*/, + mpw */*sv*/, mpw */*svl*/); /*----- That's all, folks -------------------------------------------------*/ -- 2.11.0