X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/cfb291f03e0882cba9037be2a2756a6af41fb76a..54f5bcf99ff1594cf2d65067061bf2e8a160bb23:/mp.c diff --git a/mp.c b/mp.c index a664627..3abbcd5 100644 --- a/mp.c +++ b/mp.c @@ -33,6 +33,17 @@ PyTypeObject *mp_pytype = 0; PyTypeObject *gf_pytype = 0; +#ifndef PyLong_SHIFT +# define PyLong_SHIFT SHIFT +#endif + +#ifndef PyLong_MASK +# define PyLong_MASK MASK +#endif + +STATIC_ASSERT(MPW_BITS >= PyLong_SHIFT, + "Catacomb's limbs are now narrower than than Python's!"); + mp *mp_frompylong(PyObject *obj) { unsigned long bits; @@ -45,16 +56,21 @@ 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; - assert(MPW_BITS >= SHIFT); - bits = (unsigned long)sz * SHIFT; + bits = (unsigned long)sz * PyLong_SHIFT; w = (bits + MPW_BITS - 1)/MPW_BITS; x = mp_new(w, Py_SIZE(l) < 0 ? MP_NEG : 0); p = x->v; for (i = 0; i < sz; i++) { r |= (mpd)l->ob_digit[i] << b; - b += SHIFT; + b += PyLong_SHIFT; while (b >= MPW_BITS) { *p++ = MPW(r); r >>= MPW_BITS; @@ -73,26 +89,25 @@ mp *mp_frompylong(PyObject *obj) PyObject *mp_topylong(mp *x) { unsigned long bits = mp_bits(x); - int sz = (bits + SHIFT - 1)/SHIFT; + int sz = (bits + PyLong_SHIFT - 1)/PyLong_SHIFT; PyLongObject *l = _PyLong_New(sz); mpd r = 0; int b = 0; mpw *p = x->v; int i = 0; - assert(MPW_BITS >= SHIFT); while (i < sz && p < x->vl) { r |= (mpd)*p++ << b; b += MPW_BITS; - while (i < sz && b >= SHIFT) { - l->ob_digit[i++] = r & MASK; - r >>= SHIFT; - b -= SHIFT; + while (i < sz && b >= PyLong_SHIFT) { + l->ob_digit[i++] = r & PyLong_MASK; + r >>= PyLong_SHIFT; + b -= PyLong_SHIFT; } } while (i < sz && r) { - l->ob_digit[i++] = r & MASK; - r >>= SHIFT; + l->ob_digit[i++] = r & PyLong_MASK; + r >>= PyLong_SHIFT; } Py_SIZE(l) = (x->f & MP_NEG) ? -sz : sz; return ((PyObject *)l); @@ -190,7 +205,7 @@ static void mp_pydealloc(PyObject *o) } static PyObject *mp_pyrepr(PyObject *o) - { return mp_topystring(MP_X(o), 10, "MP(", 0, "L)"); } + { return mp_topystring(MP_X(o), 10, "MP(", 0, ")"); } static PyObject *mp_pystr(PyObject *o) { return mp_topystring(MP_X(o), 10, 0, 0, 0); } @@ -200,7 +215,7 @@ mp *tomp(PyObject *o) PyObject *l; mp *x; - if (!o) + if (!o || PyFloat_Check(o)) return (0); else if (MP_PYCHECK(o) || GF_PYCHECK(o)) return (MP_COPY(MP_X(o))); @@ -219,8 +234,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); @@ -269,26 +287,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) @@ -313,6 +334,26 @@ static int gfbinop(PyObject *x, PyObject *y, mp **xx, mp **yy) return (0); } +#define FPBINOP(name, pyop) \ + static PyObject *mp_py##name(PyObject *x, PyObject *y) { \ + mp *xx, *yy, *zz; \ + PyObject *l, *rc; \ + if (PyFloat_Check(x)) { \ + l = mp_topylong(MP_X(y)); rc = PyNumber_##pyop(x, l); \ + Py_DECREF(l); return (rc); \ + } else if (PyFloat_Check(y)) { \ + l = mp_topylong(MP_X(x)); rc = PyNumber_##pyop(l, y); \ + Py_DECREF(l); return (rc); \ + } \ + if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL; \ + zz = mp_##name(MP_NEW, xx, yy); \ + MP_DROP(xx); MP_DROP(yy); \ + return (mp_pywrap(zz)); \ + } +FPBINOP(add, Add) +FPBINOP(sub, Subtract) +FPBINOP(mul, Multiply) + #define gf_and mp_and #define gf_or mp_or #define gf_xor mp_xor @@ -324,9 +365,6 @@ static int gfbinop(PyObject *x, PyObject *y, mp **xx, mp **yy) MP_DROP(xx); MP_DROP(yy); \ return (pre##_pywrap(zz)); \ } -BINOP(mp, add) -BINOP(mp, sub) -BINOP(mp, mul) BINOP(mp, and2c) BINOP(mp, or2c) BINOP(mp, xor2c) @@ -358,25 +396,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) \ @@ -430,7 +467,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; } @@ -476,7 +513,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 @@ -488,8 +527,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)); @@ -498,6 +539,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) \ { \ @@ -507,7 +549,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); \ @@ -517,9 +559,26 @@ 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) +{ + mp *xx, *yy; + PyObject *l, *rc; + if (PyFloat_Check(y)) { + l = mp_topylong(MP_X(x)); rc = PyObject_RichCompare(l, y, op); + Py_DECREF(l); return (rc); + } + if (mpbinop(x, y, &xx, &yy)) RETURN_NOTIMPL; + rc = enrich_compare(op, mp_cmp(xx, yy)); + MP_DROP(xx); MP_DROP(yy); + 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) { @@ -544,6 +603,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); @@ -697,7 +772,7 @@ end: PyObject *arg, PyObject *kw) \ { \ long len = -1; \ - static const char *const kwlist[] = { "len", 0 }; \ + static const char *const kwlist[] = { "len", 0 }; \ PyObject *rc = 0; \ \ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|l:" #name, \ @@ -872,6 +947,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") @@ -889,7 +965,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@ */ @@ -903,17 +981,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@ */ @@ -926,6 +1010,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 = { @@ -938,7 +1024,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@ */ @@ -957,13 +1043,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" @@ -971,7 +1060,7 @@ static const PyTypeObject mp_pytype_skel = { 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ - 0, /* @tp_richcompare@ */ + mp_pyrichcompare, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ @@ -1862,7 +1951,7 @@ static const PyTypeObject mpcrt_pytype_skel = { /*----- Binary polynomials ------------------------------------------------*/ static PyObject *gf_pyrepr(PyObject *o) - { return mp_topystring(MP_X(o), 16, "GF(", "0x", "L)"); } + { return mp_topystring(MP_X(o), 16, "GF(", "0x", ")"); } static PyObject *gf_pyrichcompare(PyObject *x, PyObject *y, int op) { @@ -1923,8 +2012,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; } @@ -2051,6 +2140,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") @@ -2072,7 +2162,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@ */ @@ -2086,17 +2178,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@ */ @@ -2109,6 +2207,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 = { @@ -2143,8 +2243,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"