X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/32507e35eeef67236e12adf7d00458e303f8c9aa..39d5f270dbd94d6b99b7a1b6bb62a93cdcbc0ec7:/mp.c diff --git a/mp.c b/mp.c index 4b73223..ceb9142 100644 --- a/mp.c +++ b/mp.c @@ -7,7 +7,7 @@ * (c) 2004 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to Catacomb. * @@ -15,12 +15,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * Catacomb/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with Catacomb/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -269,11 +269,44 @@ int convgf(PyObject *o, void *p) return (1); } +static mp *implicitmp(PyObject *o) +{ + if (!o || + GF_PYCHECK(o) || + ECPT_PYCHECK(o) || + FE_PYCHECK(o) || + GE_PYCHECK(o)) + return (0); + return (tomp(o)); +} + +static mp *implicitgf(PyObject *o) +{ + if (!o || + MP_PYCHECK(o) || + ECPT_PYCHECK(o) || + FE_PYCHECK(o) || + GE_PYCHECK(o)) + return (0); + return (tomp(o)); +} + static int mpbinop(PyObject *x, PyObject *y, mp **xx, mp **yy) { - if ((*xx = tomp(x)) == 0) + if ((*xx = implicitmp(x)) == 0) return (-1); - if ((*yy = tomp(y)) == 0) { + if ((*yy = implicitmp(y)) == 0) { + MP_DROP(*xx); + return (-1); + } + return (0); +} + +static int gfbinop(PyObject *x, PyObject *y, mp **xx, mp **yy) +{ + if ((*xx = implicitgf(x)) == 0) + return (-1); + if ((*yy = implicitgf(y)) == 0) { MP_DROP(*xx); return (-1); } @@ -286,7 +319,7 @@ static int mpbinop(PyObject *x, PyObject *y, mp **xx, mp **yy) #define BINOP(pre, name) \ static PyObject *pre##_py##name(PyObject *x, PyObject *y) { \ mp *xx, *yy, *zz; \ - if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL; \ + if (pre##binop(x, y, &xx, &yy)) RETURN_NOTIMPL; \ zz = pre##_##name(MP_NEW, xx, yy); \ MP_DROP(xx); MP_DROP(yy); \ return (pre##_pywrap(zz)); \ @@ -330,7 +363,7 @@ static PyObject *mp_pyid(PyObject *x) { RETURN_OBJ(x); } mp *xx, *yy; \ PyObject *z = 0; \ long n; \ - if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL; \ + if (pre##binop(x, y, &xx, &yy)) RETURN_NOTIMPL; \ if (mp_tolong_checked(yy, &n)) goto end; \ if (n < 0) \ z = pre##_pywrap(mp_##rname(MP_NEW, xx, -n)); \ @@ -351,7 +384,7 @@ SHIFTOP(gf, lsr, lsl) mp *xx, *yy; \ PyObject *z = 0; \ INIT_##qq(q) INIT_##rr(r) \ - if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL; \ + if (pre##binop(x, y, &xx, &yy)) RETURN_NOTIMPL; \ if (MP_ZEROP(yy)) \ ZDIVERR("division by zero"); \ pre##_div(ARG_##qq(q), ARG_##rr(r), xx, yy); \ @@ -396,7 +429,7 @@ static PyObject *mp_pyexp(PyObject *x, PyObject *y, PyObject *z) mp *r = 0; PyObject *rc = 0; - if ((xx = tomp(x)) == 0 || (yy = tomp(y)) == 0 || + if ((xx = implicitmp(x)) == 0 || (yy = implicitmp(y)) == 0 || (z && z != Py_None && (zz = tomp(z)) == 0)) { mp_drop(xx); mp_drop(yy); mp_drop(zz); RETURN_NOTIMPL; @@ -465,7 +498,7 @@ static PyObject *mp_pyfloat(PyObject *x) return (PyFloat_FromDouble(f)); } -#define COERCE(pre, PRE) \ +#define COERCE(pre, PRE) \ static int pre##_pycoerce(PyObject **x, PyObject **y) \ { \ mp *z; \ @@ -524,8 +557,6 @@ static PyObject *mpmeth_jacobi(PyObject *me, PyObject *arg) PyObject *z = 0; if (!PyArg_ParseTuple(arg, "O&:jacobi", convmp, &y)) goto end; - if (MP_NEGP(MP_X(me)) || MP_EVENP(MP_X(me))) - VALERR("must be positive and odd"); z = PyInt_FromLong(mp_jacobi(y, MP_X(me))); end: if (y) MP_DROP(y); @@ -535,27 +566,27 @@ end: #define BITOP(pre, name, c) \ static PyObject *pre##meth_##name(PyObject *me, PyObject *arg) \ { \ - int i; \ - if (!PyArg_ParseTuple(arg, "i:" #name, &i)) return (0); \ + unsigned long i; \ + if (!PyArg_ParseTuple(arg, "O&:" #name, convulong, &i)) return (0); \ return (pre##_pywrap(mp_##name##c(MP_NEW, MP_X(me), i))); \ } BITOP(mp, setbit, 2c); BITOP(mp, clearbit, 2c); -BITOP(gf, setbit, ); +BITOP(gf, setbit, ); BITOP(gf, clearbit, ); #undef BITOP static PyObject *mpmeth_testbit(PyObject *me, PyObject *arg) { - int i; - if (!PyArg_ParseTuple(arg, "i:testbit", &i)) return (0); + unsigned long i; + if (!PyArg_ParseTuple(arg, "O&:testbit", convulong, &i)) return (0); return (getbool(mp_testbit2c(MP_X(me), i))); } static PyObject *gfmeth_testbit(PyObject *me, PyObject *arg) { - int i; - if (!PyArg_ParseTuple(arg, "i:testbit", &i)) return (0); + unsigned long i; + if (!PyArg_ParseTuple(arg, "O&:testbit", convulong, &i)) return (0); return (getbool(mp_testbit(MP_X(me), i))); } @@ -876,7 +907,7 @@ Notes:\n\ }; static PyObject *meth__MP_fromstring(PyObject *me, - PyObject *arg, PyObject *kw) + PyObject *arg, PyObject *kw) { int r = 0; char *p; @@ -1160,7 +1191,7 @@ fail: static PyObject *mm_mexpr(PyObject *me, void *v, int n) { return mp_pywrap(mpmont_mexpr(MPMONT_PY(me), MP_NEW, v, n)); } - + static void mp_mexp_drop(void *p) { mp_expfactor *f = p; @@ -1200,7 +1231,7 @@ fail: static PyObject *mm_mexp(PyObject *me, void *v, int n) { return mp_pywrap(mpmont_mexp(MPMONT_PY(me), MP_NEW, v, n)); } - + static PyObject *mmmeth_mexp(PyObject *me, PyObject *arg) { return mexp_common(me, arg, sizeof(mp_expfactor), @@ -1353,7 +1384,7 @@ end: static PyObject *mb_mexp(PyObject *me, void *v, int n) { return mp_pywrap(mpbarrett_mexp(MPBARRETT_PY(me), MP_NEW, v, n)); } - + static PyObject *mbmeth_mexp(PyObject *me, PyObject *arg) { return mexp_common(me, arg, sizeof(mp_expfactor), @@ -1772,7 +1803,7 @@ static PyObject *gf_pyrichcompare(PyObject *x, PyObject *y, int op) int xl, yl; int b; - if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL; + if (gfbinop(x, y, &xx, &yy)) RETURN_NOTIMPL; switch (op) { case Py_EQ: b = MP_EQ(xx, yy); break; case Py_NE: b = !MP_EQ(xx, yy); break; @@ -1937,7 +1968,7 @@ static PyMethodDef gf_pymethods[] = { METH (gcdx, "X.gcdx(Y) -> (gcd(X, Y), U, V) with X U + Y V = gcd(X, Y)") METH (modinv, "X.modinv(Y) -> multiplicative inverse of Y mod X") - METH (irreduciblep, "X.irreduciblep() -> true/false") + METH (irreduciblep, "X.irreduciblep() -> true/false") #undef METHNAME #define METHNAME(func) mpmeth_##func KWMETH(tostring, "X.tostring(radix = 10) -> STR") @@ -2070,13 +2101,14 @@ static PyObject *meth__GF_fromstring(PyObject *me, if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|i:fromstring", kwlist, &me, &p, &len, &r)) goto end; - if (!good_radix_p(r, 1)) VALERR("radix out of range"); + if (!good_radix_p(r, 1)) VALERR("bad radix"); sc.buf = p; sc.lim = p + len; - if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0 || MP_NEGP(zz)) - z = Py_BuildValue("(Os#)", Py_None, p, len); - else - z = Py_BuildValue("(Ns#)", gf_pywrap(zz), - sc.buf, (int)(sc.lim - sc.buf)); + if ((zz = mp_read(MP_NEW, r, &mptext_stringops, &sc)) == 0 || + MP_NEGP(zz)) { + if (zz) MP_DROP(zz); + SYNERR("bad binary polynomial"); + } + z = Py_BuildValue("(Ns#)", gf_pywrap(zz), sc.buf, (int)(sc.lim - sc.buf)); end: return (z); } @@ -2107,6 +2139,58 @@ end: return (rc); } +static PyObject *grmeth_trace(PyObject *me, PyObject *arg) +{ + PyObject *rc = 0; + mp *xx = 0; + + if (!PyArg_ParseTuple(arg, "O&:trace", convgf, &xx)) goto end; + rc = PyInt_FromLong(gfreduce_trace(GFREDUCE_PY(me), xx)); +end: + if (xx) MP_DROP(xx); + return (rc); +} + +static PyObject *grmeth_halftrace(PyObject *me, PyObject *arg) +{ + PyObject *rc = 0; + mp *xx = 0; + + if (!PyArg_ParseTuple(arg, "O&:halftrace", convgf, &xx)) goto end; + rc = gf_pywrap(gfreduce_halftrace(GFREDUCE_PY(me), MP_NEW, xx)); +end: + if (xx) MP_DROP(xx); + return (rc); +} + +static PyObject *grmeth_sqrt(PyObject *me, PyObject *arg) +{ + PyObject *rc = 0; + mp *xx = 0, *yy; + + if (!PyArg_ParseTuple(arg, "O&:sqrt", convgf, &xx)) goto end; + if ((yy = gfreduce_sqrt(GFREDUCE_PY(me), MP_NEW, xx)) == 0) + VALERR("no modular square root"); + rc = gf_pywrap(yy); +end: + if (xx) MP_DROP(xx); + return (rc); +} + +static PyObject *grmeth_quadsolve(PyObject *me, PyObject *arg) +{ + PyObject *rc = 0; + mp *xx = 0, *yy; + + if (!PyArg_ParseTuple(arg, "O&:quadsolve", convgf, &xx)) goto end; + if ((yy = gfreduce_quadsolve(GFREDUCE_PY(me), MP_NEW, xx)) == 0) + VALERR("no solution found"); + rc = gf_pywrap(yy); +end: + if (xx) MP_DROP(xx); + return (rc); +} + static PyObject *grmeth_reduce(PyObject *me, PyObject *arg) { PyObject *z = 0; @@ -2156,6 +2240,10 @@ static PyGetSetDef gfreduce_pygetset[] = { static PyMethodDef gfreduce_pymethods[] = { #define METHNAME(name) grmeth_##name METH (reduce, "R.reduce(X) -> X mod B.m") + METH (trace, "R.trace(X) -> Tr(X) = x + x^2 + ... + x^{2^{m - 1}}") + METH (halftrace, "R.halftrace(X) -> x + x^{2^2} + ... + x^{2^{m - 1}}") + METH (sqrt, "R.sqrt(X) -> Y where Y^2 = X mod R") + METH (quadsolve, "R.quadsolve(X) -> Y where Y^2 + Y = X mod R") METH (exp, "R.exp(X, N) -> X^N mod B.m") #undef METHNAME { 0 } @@ -2348,13 +2436,13 @@ and normal basis representations.", static PyMethodDef methods[] = { #define METHNAME(func) meth_##func - KWMETH(_MP_fromstring, "\ + KWMETH(_MP_fromstring, "\ fromstring(STR, radix = 0) -> (X, REST)\n\ \n\ Parse STR as a large integer, according to radix. If radix is zero,\n\ read a prefix from STR to decide radix: allow `0' for octal, `0x' for hex\n\ or `R_' for other radix R.") - KWMETH(_GF_fromstring, "\ + KWMETH(_GF_fromstring, "\ fromstring(STR, radix = 0) -> (X, REST)\n\ \n\ Parse STR as a binary polynomial, according to radix. If radix is zero,\n\