X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/f984b31a0c2f39711261b91433aedb54628cb963..e8cd4ca5039114e52f7b659a2d5fec1f72541a87:/mp.c

diff --git a/mp.c b/mp.c
index 1513974..e14b720 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;
@@ -47,14 +58,13 @@ mp *mp_frompylong(PyObject *obj)
 
   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 +83,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);
@@ -102,11 +111,11 @@ mp *mp_frompyobject(PyObject *o, int radix)
 {
   mp *x;
 
-  if (PyString_Check(o)) {
+  if (TEXT_CHECK(o)) {
     mptext_stringctx sc;
     mp *x;
-    sc.buf = PyString_AS_STRING(o);
-    sc.lim = sc.buf + PyString_GET_SIZE(o);
+    size_t sz;
+    TEXT_PTRLEN(o, sc.buf, sz); sc.lim = sc.buf + sz;
     x = mp_read(MP_NEW, radix, &mptext_stringops, &sc);
     if (!x) return (0);
     if (sc.buf < sc.lim) { MP_DROP(x); return (0); }
@@ -128,8 +137,7 @@ PyObject *mp_topystring(mp *x, int radix, const char *xpre,
   size_t postlen = post ? strlen(post) : 0;
   char *p;
   MP_COPY(x);
-  o = PyString_FromStringAndSize(0, len + 1 + xprelen + prelen + postlen);
-  p = PyString_AS_STRING(o);
+  TEXT_PREPAREWRITE(o, p, len + 1 + xprelen + prelen + postlen);
   sc.buf = p;
   if (xpre) { memcpy(sc.buf, xpre, xprelen); sc.buf += xprelen; }
   if (MP_NEGP(x)) { *sc.buf++ = '-'; x = mp_neg(x, x); }
@@ -138,7 +146,7 @@ PyObject *mp_topystring(mp *x, int radix, const char *xpre,
   mp_write(x, radix, &mptext_stringops, &sc);
   if (post) { memcpy(sc.buf, post, postlen); sc.buf += postlen; }
   MP_DROP(x);
-  _PyString_Resize(&o, sc.buf - p);
+  TEXT_DONEWRITE(o, sc.buf - p);
   return (o);
 }
 
@@ -191,7 +199,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); }
@@ -201,7 +209,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)));
@@ -314,6 +322,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
@@ -325,9 +353,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)
@@ -519,6 +544,20 @@ COERCE(mp, MP)
 COERCE(gf, GF)
 #undef COERCE
 
+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);
+}
+
 static int mp_pycompare(PyObject *x, PyObject *y)
   { return mp_cmp(MP_X(x), MP_X(y)); }
 
@@ -545,14 +584,14 @@ end:
   return ((PyObject *)zz);
 }
 
-long mphash(mp *x)
+Py_hash_t mphash(mp *x)
 {
   PyObject *l = mp_topylong(x);
-  long h = PyObject_Hash(l);
+  Py_hash_t h = PyObject_Hash(l);
   Py_DECREF(l); return (h);
 }
 
-static long mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); }
+static Py_hash_t mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); }
 
 static PyObject *mpmeth_jacobi(PyObject *me, PyObject *arg)
 {
@@ -698,7 +737,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,		\
@@ -709,7 +748,7 @@ end:
       if (!len) len = 1;						\
     }									\
     rc = bytestring_pywrap(0, len);					\
-    mp_##name(MP_X(me), PyString_AS_STRING(rc), len);			\
+    mp_##name(MP_X(me), BIN_PTR(rc), len);				\
   end:									\
     return (rc);							\
   }
@@ -723,13 +762,12 @@ STOREOP(storeb2c, 2c)
   static PyObject *ty##meth_frombuf(PyObject *me, PyObject *arg)	\
   {									\
     buf b;								\
-    char *p;								\
-    Py_ssize_t sz;							\
+    struct bin in;							\
     PyObject *rc = 0;							\
     mp *x;								\
 									\
-    if (!PyArg_ParseTuple(arg, "s#:frombuf", &p, &sz)) goto end;	\
-    buf_init(&b, p, sz);						\
+    if (!PyArg_ParseTuple(arg, "O&:frombuf", convbin, &in)) goto end;	\
+    buf_init(&b, (/*unconst*/ void *)in.p, in.sz);			\
     if ((x = buf_getmp(&b)) == 0) VALERR("malformed data");		\
     rc = Py_BuildValue("(NN)", ty##_pywrap(x),				\
 		       bytestring_pywrapbuf(&b));			\
@@ -750,10 +788,10 @@ static PyObject *mpmeth_tobuf(PyObject *me)
   x = MP_X(me);
   n = mp_octets(x) + 3;
   rc = bytestring_pywrap(0, n);
-  buf_init(&b, PyString_AS_STRING(rc), n);
+  buf_init(&b, BIN_PTR(rc), n);
   buf_putmp(&b, x);
   assert(BOK(&b));
-  _PyString_Resize(&rc, BLEN(&b));
+  BIN_SETLEN(rc, BLEN(&b));
   return (rc);
 }
 
@@ -815,10 +853,9 @@ static PyObject *mpmeth_fibonacci(PyObject *me, PyObject *arg)
 #define LOADOP(pre, name)						\
   static PyObject *pre##meth_##name(PyObject *me, PyObject *arg)	\
   {									\
-    char *p;								\
-    Py_ssize_t len;							\
-    if (!PyArg_ParseTuple(arg, "s#:" #name, &p, &len)) return (0);	\
-    return (pre##_pywrap(mp_##name(MP_NEW, p, len)));			\
+    struct bin in;							\
+    if (!PyArg_ParseTuple(arg, "O&:" #name, convbin, &in)) return (0);	\
+    return (pre##_pywrap(mp_##name(MP_NEW, in.p, in.sz)));		\
   }
 LOADOP(mp, loadl)
 LOADOP(mp, loadb)
@@ -932,7 +969,7 @@ static const PyNumberMethods mp_pynumber = {
 };
 
 static const PyTypeObject mp_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MP",					/* @tp_name@ */
   sizeof(mp_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -974,7 +1011,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@ */
@@ -1091,7 +1128,7 @@ static const PyMethodDef mpmul_pymethods[] = {
 };
 
 static const PyTypeObject mpmul_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPMul",				/* @tp_name@ */
   sizeof(mpmul_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1360,7 +1397,7 @@ static const PyMethodDef mpmont_pymethods[] = {
 };
 
 static const PyTypeObject mpmont_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPMont",				/* @tp_name@ */
   sizeof(mpmont_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1501,7 +1538,7 @@ static const PyMethodDef mpbarrett_pymethods[] = {
 };
 
 static const PyTypeObject mpbarrett_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPBarrett",				/* @tp_name@ */
   sizeof(mpbarrett_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1631,7 +1668,7 @@ static const const PyMethodDef mpreduce_pymethods[] = {
 };
 
 static const PyTypeObject mpreduce_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPReduce",				/* @tp_name@ */
   sizeof(mpreduce_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1815,7 +1852,7 @@ static const PyMethodDef mpcrt_pymethods[] = {
 };
 
 static const PyTypeObject mpcrt_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "MPCRT",				/* @tp_name@ */
   sizeof(mpcrt_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1865,7 +1902,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)
 {
@@ -2115,7 +2152,7 @@ static const PyNumberMethods gf_pynumber = {
 };
 
 static const PyTypeObject gf_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GF",					/* @tp_name@ */
   sizeof(mp_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2316,7 +2353,7 @@ static const PyMethodDef gfreduce_pymethods[] = {
 };
 
 static const PyTypeObject gfreduce_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GFReduce",				/* @tp_name@ */
   sizeof(gfreduce_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2454,7 +2491,7 @@ static const PyMethodDef gfn_pymethods[] = {
 };
 
 static const PyTypeObject gfn_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GFN",				/* @tp_name@ */
   sizeof(gfn_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */