X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/e38168e25100c9bcf8e9784c0da1eb4605ce392f..refs/heads/mdw/python3:/mp.c diff --git a/mp.c b/mp.c index e14b720..3549ccb 100644 --- a/mp.c +++ b/mp.c @@ -56,6 +56,12 @@ mp *mp_frompylong(PyObject *obj) mp *x; mpw *p; +#ifdef PY3 + int ov; + long j = PyLong_AsLongAndOverflow(obj, &ov); + if (!ov) return mp_fromlong(MP_NEW, j); +#endif + sz = Py_SIZE(l); if (sz < 0) sz = -sz; bits = (unsigned long)sz * PyLong_SHIFT; @@ -116,6 +122,12 @@ mp *mp_frompyobject(PyObject *o, int radix) mp *x; size_t sz; TEXT_PTRLEN(o, sc.buf, sz); sc.lim = sc.buf + sz; + if (sc.buf + 2 < sc.lim && sc.buf[0] == '0' && + (radix == 16 ? (sc.buf[1] == 'x' || sc.buf[1] == 'X') : + radix == 8 ? (sc.buf[1] == 'o' || sc.buf[1] == 'O') : + radix == 2 ? (sc.buf[1] == 'b' || sc.buf[1] == 'B') : + 0)) + sc.buf += 2; x = mp_read(MP_NEW, radix, &mptext_stringops, &sc); if (!x) return (0); if (sc.buf < sc.lim) { MP_DROP(x); return (0); } @@ -190,7 +202,7 @@ end: return (rc); } -/*----- Python interface --------------------------------------------------*/ +/*----- Arbitrary-precision integers --------------------------------------*/ static void mp_pydealloc(PyObject *o) { @@ -228,8 +240,11 @@ mp *tomp(PyObject *o) if ((x = G_TOINT(GE_G(o), MP_NEW, GE_X(o))) == 0) return (0); return (x); - } else if (PyInt_Check(o)) + } +#ifdef PY2 + else if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o))); +#endif else if ((l = PyNumber_Long(o)) != 0) { x = mp_frompylong(l); Py_DECREF(l); @@ -278,26 +293,29 @@ int convgf(PyObject *o, void *p) return (1); } -static mp *implicitmp(PyObject *o) +mp *implicitmp(PyObject *o) { - if (!o || - GF_PYCHECK(o) || - ECPT_PYCHECK(o) || - FE_PYCHECK(o) || - GE_PYCHECK(o)) - return (0); - return (tomp(o)); + PyObject *l; + + if (!o || GF_PYCHECK(o) || FE_PYCHECK(o)) return (0); + else if (MP_PYCHECK(o)) return (MP_COPY(MP_X(o))); + else if (PFILT_PYCHECK(o)) return (MP_COPY(PFILT_F(o)->m)); +#ifdef PY2 + else if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o))); +#endif + else if ((l = PyNumber_Index(o)) != 0) { +#ifdef PY2 + if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o))); +#endif + if (PyLong_Check(o)) return (mp_frompylong(o)); + } + PyErr_Clear(); return (0); } -static mp *implicitgf(PyObject *o) +mp *implicitgf(PyObject *o) { - if (!o || - MP_PYCHECK(o) || - ECPT_PYCHECK(o) || - FE_PYCHECK(o) || - GE_PYCHECK(o)) - return (0); - return (tomp(o)); + if (GF_PYCHECK(o)) return (MP_COPY(MP_X(o))); + return (0); } static int mpbinop(PyObject *x, PyObject *y, mp **xx, mp **yy) @@ -384,25 +402,24 @@ UNOP(mp, not2c) static PyObject *mp_pyid(PyObject *x) { RETURN_OBJ(x); } #define gf_lsr mp_lsr -#define SHIFTOP(pre, name, rname) \ +#define SHIFTOP(pre, PRE, name, rname) \ static PyObject *pre##_py##name(PyObject *x, PyObject *y) { \ - mp *xx, *yy; \ + PyObject *yix = 0; \ PyObject *z = 0; \ long n; \ - if (pre##binop(x, y, &xx, &yy)) RETURN_NOTIMPL; \ - if (mp_tolong_checked(yy, &n, 1)) goto end; \ - if (n < 0) \ - z = pre##_pywrap(mp_##rname(MP_NEW, xx, -n)); \ - else \ - z = pre##_pywrap(mp_##name(MP_NEW, xx, n)); \ - end: \ - MP_DROP(xx); MP_DROP(yy); \ + if (!PRE##_PYCHECK(x)) RETURN_NOTIMPL; \ + if (GF_PYCHECK(y) || FE_PYCHECK(y)) RETURN_NOTIMPL; \ + yix = PyNumber_Index(y); if (!yix) { PyErr_Clear(); RETURN_NOTIMPL; } \ + n = PyInt_AsLong(yix); Py_DECREF(yix); \ + if (n == -1 && PyErr_Occurred()) { PyErr_Clear(); RETURN_NOTIMPL; } \ + if (n < 0) z = pre##_pywrap(mp_##rname(MP_NEW, MP_X(x), -n)); \ + else z = pre##_pywrap(mp_##name(MP_NEW, MP_X(x), n)); \ return (z); \ } -SHIFTOP(mp, lsl2c, lsr2c) -SHIFTOP(mp, lsr2c, lsl2c) -SHIFTOP(gf, lsl, lsr) -SHIFTOP(gf, lsr, lsl) +SHIFTOP(mp, MP, lsl2c, lsr2c) +SHIFTOP(mp, MP, lsr2c, lsl2c) +SHIFTOP(gf, GF, lsl, lsr) +SHIFTOP(gf, GF, lsr, lsl) #undef SHIFTOP #define DIVOP(pre, name, qq, rr, gather) \ @@ -456,7 +473,7 @@ static PyObject *mp_pyexp(PyObject *x, PyObject *y, PyObject *z) PyObject *rc = 0; if ((xx = implicitmp(x)) == 0 || (yy = implicitmp(y)) == 0 || - (z && z != Py_None && (zz = tomp(z)) == 0)) { + (z && z != Py_None && (zz = implicitmp(z)) == 0)) { mp_drop(xx); mp_drop(yy); mp_drop(zz); RETURN_NOTIMPL; } @@ -502,7 +519,9 @@ static mp *gf_modinv_checked(mp *d, mp *x, mp *p) #define BASEOP(name, radix, pre) \ static PyObject *mp_py##name(PyObject *x) \ { return mp_topystring(MP_X(x), radix, 0, pre, 0); } +#ifdef PY2 BASEOP(oct, 8, "0"); +#endif BASEOP(hex, 16, "0x"); #undef BASEOP @@ -514,8 +533,10 @@ static PyObject *mp_pyint(PyObject *x) if (!mp_tolong_checked(MP_X(x), &l, 0)) return (PyInt_FromLong(l)); else return mp_topylong(MP_X(x)); } +#ifdef PY2 static PyObject *mp_pylong(PyObject *x) { return (mp_topylong(MP_X(x))); } +#endif static PyObject *mp_pyfloat(PyObject *x) { PyObject *l = mp_topylong(MP_X(x)); @@ -524,6 +545,7 @@ static PyObject *mp_pyfloat(PyObject *x) return (PyFloat_FromDouble(f)); } +#ifdef PY2 #define COERCE(pre, PRE) \ static int pre##_pycoerce(PyObject **x, PyObject **y) \ { \ @@ -533,7 +555,7 @@ static PyObject *mp_pyfloat(PyObject *x) Py_INCREF(*x); Py_INCREF(*y); \ return (0); \ } \ - if ((z = tomp(*y)) != 0) { \ + if ((z = implicit##pre(*y)) != 0) { \ Py_INCREF(*x); \ *y = pre##_pywrap(z); \ return (0); \ @@ -543,6 +565,7 @@ static PyObject *mp_pyfloat(PyObject *x) COERCE(mp, MP) COERCE(gf, GF) #undef COERCE +#endif static PyObject *mp_pyrichcompare(PyObject *x, PyObject *y, int op) { @@ -558,8 +581,10 @@ static PyObject *mp_pyrichcompare(PyObject *x, PyObject *y, int op) return (rc); } +#ifdef PY2 static int mp_pycompare(PyObject *x, PyObject *y) { return mp_cmp(MP_X(x), MP_X(y)); } +#endif static PyObject *mp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { @@ -584,6 +609,22 @@ end: return ((PyObject *)zz); } +#define IMPLICIT(pre) \ + static PyObject *pre##meth__implicit(PyObject *me, PyObject *arg) \ + { \ + PyObject *x, *rc = 0; \ + mp *y = MP_NEW; \ + if (!PyArg_ParseTuple(arg, "O:_implicit", &x)) goto end; \ + y = implicit##pre(x); \ + if (!y) TYERR("can't convert implicitly to " #pre); \ + rc = pre##_pywrap(y); \ + end: \ + return (rc); \ + } +IMPLICIT(mp) +IMPLICIT(gf) +#undef IMPLICIT + Py_hash_t mphash(mp *x) { PyObject *l = mp_topylong(x); @@ -912,6 +953,7 @@ static const PyMethodDef mp_pymethods[] = { " Parse STR as a large integer, according to RADIX. If RADIX is\n" " zero, read a prefix from STR to decide radix: allow `0b' for binary,\n" " `0' or `0o' for octal, `0x' for hex, or `R_' for other radix R.") + SMTH (_implicit, 0) SMTH (factorial, "factorial(I) -> I!: compute factorial") SMTH (fibonacci, "fibonacci(I) -> F(I): compute Fibonacci number") SMTH (loadl, "loadl(STR) -> X: read little-endian bytes") @@ -929,7 +971,9 @@ static const PyNumberMethods mp_pynumber = { mp_pyadd, /* @nb_add@ */ mp_pysub, /* @nb_subtract@ */ mp_pymul, /* @nb_multiply@ */ +#ifdef PY2 0, /* @nb_divide@ */ +#endif mp_pymod, /* @nb_remainder@ */ mp_pydivmod, /* @nb_divmod@ */ mp_pyexp, /* @nb_power@ */ @@ -943,17 +987,23 @@ static const PyNumberMethods mp_pynumber = { mp_pyand2c, /* @nb_and@ */ mp_pyxor2c, /* @nb_xor@ */ mp_pyor2c, /* @nb_or@ */ +#ifdef PY2 mp_pycoerce, /* @nb_coerce@ */ +#endif mp_pyint, /* @nb_int@ */ - mp_pylong, /* @nb_long@ */ + PY23(mp_pylong, 0), /* @nb_long@ */ mp_pyfloat, /* @nb_float@ */ +#ifdef PY2 mp_pyoct, /* @nb_oct@ */ mp_pyhex, /* @nb_hex@ */ +#endif 0, /* @nb_inplace_add@ */ 0, /* @nb_inplace_subtract@ */ 0, /* @nb_inplace_multiply@ */ +#ifdef PY2 0, /* @nb_inplace_divide@ */ +#endif 0, /* @nb_inplace_remainder@ */ 0, /* @nb_inplace_power@ */ 0, /* @nb_inplace_lshift@ */ @@ -966,6 +1016,8 @@ static const PyNumberMethods mp_pynumber = { 0, /* @nb_true_divide@ */ 0, /* @nb_inplace_floor_divide@ */ 0, /* @nb_inplace_true_divide@ */ + + mp_pyint, /* @nb_index@ */ }; static const PyTypeObject mp_pytype_skel = { @@ -978,7 +1030,7 @@ static const PyTypeObject mp_pytype_skel = { 0, /* @tp_print@ */ 0, /* @tp_getattr@ */ 0, /* @tp_setattr@ */ - mp_pycompare, /* @tp_compare@ */ + PY23(mp_pycompare, 0), /* @tp_compare@/@tp_as_async@ */ mp_pyrepr, /* @tp_repr@ */ PYNUMBER(mp), /* @tp_as_number@ */ 0, /* @tp_as_sequence@ */ @@ -997,13 +1049,16 @@ static const PyTypeObject mp_pytype_skel = { "Multiprecision integers, similar to `long' but more efficient and\n" "versatile. Support all the standard arithmetic operations, with\n" "implicit conversions from `PrimeFilter', and other objects which\n" - "convert to `long'.\n" + "convert to `" PY23("long", "int") "'.\n" "\n" "Constructor MP(X, [radix = R]) attempts to convert X to an `MP'. If\n" "X is a string, it's read in radix-R form, or we look for a prefix\n" "if R = 0. Other acceptable things are field elements, elliptic curve\n" + PY23( "points, group elements, Python `int' and `long' objects, and anything\n" - "with an integer conversion.\n" + "with an integer conversion.\n", + "points, group elements, Python `int' objects, and anything with an\n" + "integer conversion.\n") "\n" "Notes:\n" "\n" @@ -1277,7 +1332,7 @@ fail: return (-1); } -static PyObject *mm_mexpr(PyObject *me, void *v, int n) +static PyObject *mm_mexpr(PyObject *me, void *v, size_t n) { return mp_pywrap(mpmont_mexpr(MPMONT_PY(me), MP_NEW, v, n)); } static void mp_mexp_drop(void *p) @@ -1317,7 +1372,7 @@ fail: return (-1); } -static PyObject *mm_mexp(PyObject *me, void *v, int n) +static PyObject *mm_mexp(PyObject *me, void *v, size_t n) { return mp_pywrap(mpmont_mexp(MPMONT_PY(me), MP_NEW, v, n)); } static PyObject *mmmeth_mexp(PyObject *me, PyObject *arg) @@ -1472,7 +1527,7 @@ end: return (rc); } -static PyObject *mb_mexp(PyObject *me, void *v, int n) +static PyObject *mb_mexp(PyObject *me, void *v, size_t n) { return mp_pywrap(mpbarrett_mexp(MPBARRETT_PY(me), MP_NEW, v, n)); } static PyObject *mbmeth_mexp(PyObject *me, PyObject *arg) @@ -1729,36 +1784,35 @@ typedef struct mpcrt_pyobj { static PyObject *mcmeth_solve(PyObject *me, PyObject *arg) { mpcrt *c = MPCRT_PY(me); - PyObject *q = 0, *x, *z = 0; + PyObject *q = 0, *it, *x, *z = 0; mp *xx; mp **v = 0; Py_ssize_t i = 0, n = c->k; - Py_INCREF(me); if (PyTuple_GET_SIZE(arg) == n) q = arg; else if (!PyArg_ParseTuple(arg, "O:solve", &q)) goto end; - Py_INCREF(q); - if (!PySequence_Check(q)) TYERR("want a sequence of residues"); - i = PySequence_Size(q); if (i < 0) goto end; - if (i != n) VALERR("residue count mismatch"); - v = xmalloc(n * sizeof(*v)); - for (i = 0; i < n; i++) { - if ((x = PySequence_GetItem(q, i)) == 0) goto end; + v = xmalloc(n*sizeof(*v)); + it = PyObject_GetIter(q); if (!it) goto end; + while (i < n) { + x = PyIter_Next(it); + if (!x) { + if (PyErr_Occurred()) goto end; + VALERR("residue count mismatch"); + } xx = getmp(x); Py_DECREF(x); if (!xx) goto end; - v[i] = xx; + v[i++] = xx; xx = 0; } + x = PyIter_Next(it); + if (x) { Py_DECREF(x); VALERR("residue count mismatch"); } + else if (PyErr_Occurred()) goto end; z = mp_pywrap(mpcrt_solve(c, MP_NEW, v)); end: if (v) { - n = i; - for (i = 0; i < n; i++) - MP_DROP(v[i]); + while (i--) MP_DROP(v[i]); xfree(v); } - Py_DECREF(me); - Py_XDECREF(q); return (z); } @@ -1774,7 +1828,7 @@ static PyObject *mpcrt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) mpcrt_mod *v = 0; Py_ssize_t n, i = 0, j; static const char *const kwlist[] = { "mv", 0 }; - PyObject *q = 0, *x; + PyObject *q, *it = 0, *x; mp *xx = MP_NEW, *y = MP_NEW, *g = MP_NEW; mpmul mm; mpcrt_pyobj *c = 0; @@ -1783,17 +1837,26 @@ static PyObject *mpcrt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) q = arg; else if (!PyArg_ParseTupleAndKeywords(arg, kw, "O:new", KWLIST, &q)) goto end; - Py_INCREF(q); - if (!PySequence_Check(q)) TYERR("want a sequence of moduli"); - n = PySequence_Size(q); if (n < 0) goto end; - if (!n) VALERR("want at least one modulus"); - v = xmalloc(n * sizeof(*v)); - for (i = 0; i < n; i++) { - if ((x = PySequence_GetItem(q, i)) == 0) goto end; + + if (!PySequence_Check(q)) + n = 16; + else { + n = PySequence_Size(arg); + if (n == (size_t)-1 && PyErr_Occurred()) goto end; + } + + v = xmalloc(n*sizeof(*v)); + it = PyObject_GetIter(q); if (!it) goto end; + for (;;) { + x = PyIter_Next(it); if (!x) break; xx = getmp(x); Py_DECREF(x); if (!xx) goto end; if (MP_CMP(xx, <=, MP_ZERO)) VALERR("moduli must be positive"); - v[i].m = xx; v[i].n = 0; v[i].ni = 0; v[i].nni = 0; xx = MP_NEW; + if (i >= n) { n *= 2; v = xrealloc(v, n*sizeof(*v), i*sizeof(*v)); } + v[i].m = xx; v[i].n = 0; v[i].ni = 0; v[i].nni = 0; i++; xx = MP_NEW; } + if (PyErr_Occurred()) goto end; + Py_DECREF(it); it = 0; + mpmul_init(&mm); for (j = 0; j < i; j++) mpmul_add(&mm, v[j].m); xx = mpmul_done(&mm); @@ -1804,20 +1867,17 @@ static PyObject *mpcrt_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) } c = (mpcrt_pyobj *)ty->tp_alloc(ty, 0); - mpcrt_create(&c->c, v, n, 0); - Py_DECREF(q); + mpcrt_create(&c->c, v, i, 0); mp_drop(xx); mp_drop(y); mp_drop(g); return ((PyObject *)c); end: if (v) { - n = i; - for (i = 0; i < n; i++) - MP_DROP(v[i].m); + while (i--) MP_DROP(v[i].m); xfree(v); } - Py_XDECREF(q); mp_drop(xx); mp_drop(y); mp_drop(g); + Py_XDECREF(it); return (0); } @@ -1963,8 +2023,8 @@ static PyObject *gf_pyexp(PyObject *x, PyObject *y, PyObject *z) mp *r = 0; PyObject *rc = 0; - if ((xx = tomp(x)) == 0 || (yy = tomp(y)) == 0 || - (z && z != Py_None && (zz = tomp(z)) == 0)) { + if ((xx = implicitgf(x)) == 0 || (yy = implicitmp(y)) == 0 || + (z && z != Py_None && (zz = implicitgf(z)) == 0)) { mp_drop(xx); mp_drop(yy); mp_drop(zz); RETURN_NOTIMPL; } @@ -2091,6 +2151,7 @@ static const PyMethodDef gf_pymethods[] = { " Parse STR as a binary polynomial, according to RADIX. If RADIX is\n" " zero, read a prefix from STR to decide radix: allow `0b' for binary,\n" " `0' or `0o' for octal, `0x' for hex, or `R_' for other radix R.") + SMTH (_implicit, 0) SMTH (loadl, "loadl(STR) -> X: read little-endian bytes") SMTH (loadb, "loadb(STR) -> X: read big-endian bytes") SMTH (frombuf, "frombuf(STR) -> (X, REST): read buffer format") @@ -2112,7 +2173,9 @@ static const PyNumberMethods gf_pynumber = { gf_pyadd, /* @nb_add@ */ gf_pysub, /* @nb_subtract@ */ gf_pymul, /* @nb_multiply@ */ +#ifdef PY2 0, /* @nb_divide@ */ +#endif gf_pymod, /* @nb_remainder@ */ gf_pydivmod, /* @nb_divmod@ */ gf_pyexp, /* @nb_power@ */ @@ -2126,17 +2189,23 @@ static const PyNumberMethods gf_pynumber = { gf_pyand, /* @nb_and@ */ gf_pyxor, /* @nb_xor@ */ gf_pyor, /* @nb_or@ */ +#ifdef PY2 gf_pycoerce, /* @nb_coerce@ */ +#endif mp_pyint, /* @nb_int@ */ - mp_pylong, /* @nb_long@ */ + PY23(mp_pylong, 0), /* @nb_long@ */ 0 /* doesn't make any sense */, /* @nb_float@ */ +#ifdef PY2 mp_pyoct, /* @nb_oct@ */ mp_pyhex, /* @nb_hex@ */ +#endif 0, /* @nb_inplace_add@ */ 0, /* @nb_inplace_subtract@ */ 0, /* @nb_inplace_multiply@ */ +#ifdef PY2 0, /* @nb_inplace_divide@ */ +#endif 0, /* @nb_inplace_remainder@ */ 0, /* @nb_inplace_power@ */ 0, /* @nb_inplace_lshift@ */ @@ -2149,6 +2218,8 @@ static const PyNumberMethods gf_pynumber = { 0, /* @nb_true_divide@ */ 0, /* @nb_inplace_floor_divide@ */ 0, /* @nb_inplace_true_divide@ */ + + mp_pyint, /* @nb_index@ */ }; static const PyTypeObject gf_pytype_skel = { @@ -2183,8 +2254,11 @@ static const PyTypeObject gf_pytype_skel = { "Constructor GF(X, [radix = R]) attempts to convert X to a `GF'. If\n" "X is a string, it's read in radix-R form, or we look for a prefix\n" "if R = 0. Other acceptable things are field elements, elliptic curve\n" + PY23( "points, group elements, Python `int' and `long' objects, and anything\n" - "with an integer conversion.\n" + "with an integer conversion.\n", + "points, group elements, Python `int' objects, and anything with an\n" + "integer conversion.\n") "\n" "The name is hopelessly wrong from a technical point of view, but\n" "but it's much easier to type than `p2' or `c2' or whatever.\n"