refactor

Author: eendebakpt

Objects/longobject.c

@@ -498,6 +498,26 @@ PyLong_FromDouble(double dval)
 #define PY_ABS_LONG_MIN         (0-(unsigned long)LONG_MIN)
 #define PY_ABS_SSIZE_T_MIN      (0-(size_t)PY_SSIZE_T_MIN)
 
+static inline unsigned long
+_unroll_digits(PyLongObject *v, Py_ssize_t *i)
+{
+    digit *digits = v->long_value.ob_digit;
+    assert(*digit_count >= 2);
+    /* unroll 1 digit */
+    --(*i);
+    assert(ULONG_MAX >= ((1UL << PyLong_SHIFT) - 1));
+    unsigned long x = digits[*i];
+
+    #if ((ULONG_MAX >> PyLong_SHIFT)) >= ((1UL << PyLong_SHIFT) - 1)
+    /* unroll another digit */
+    x <<= PyLong_SHIFT;
+    --(*i);
+    x |= digits[*i];
+    #endif
+
+    return x;
+}
+
 /* Get a C long int from an int object or any object that has an __index__
    method.
 
@@ -507,7 +527,6 @@ PyLong_FromDouble(double dval)
    For other errors (e.g., TypeError), return -1 and set an error condition.
    In this case *overflow will be 0.
 */
-
 long
 PyLong_AsLongAndOverflow(PyObject *vv, int *overflow)
 {
@@ -557,21 +576,7 @@ PyLong_AsLongAndOverflow(PyObject *vv, int *overflow)
         i = _PyLong_DigitCount(v);
         sign = _PyLong_NonCompactSign(v);
 
-        digit *digits = v->long_value.ob_digit;
-        assert(i >= 2);
-        /* unroll 1 digit */
-        --i;
-        assert(ULONG_MAX >= ((1UL << PyLong_SHIFT) - 1));
-        x = digits[i];
-
-        #if ((ULONG_MAX >> PyLong_SHIFT)) >= ((1UL << PyLong_SHIFT) - 1)
-        /* unroll another digit */
-        x <<= PyLong_SHIFT;
-        --i;
-        x |= digits[i];
-        #endif
-
-
+        x = _unroll_digits(v, &i);
         while (--i >= 0) {
             if (x > SIZE_MAX >> PyLong_SHIFT) {
                 *overflow = sign;
@@ -661,18 +666,12 @@ PyLong_AsSsize_t(PyObject *vv) {
     i = _PyLong_DigitCount(v);
     sign = _PyLong_NonCompactSign(v);
 
-    digit *digits = v->long_value.ob_digit;
-    assert(i >= 2);
-    /* unroll 1 digit */
-    --i;
-    assert(ULONG_MAX >= ((1UL << PyLong_SHIFT) - 1));
-    x = digits[i];
-
+    x = _unroll_digits(v, &i);
     while (--i >= 0) {
         if (x > SIZE_MAX >> PyLong_SHIFT) {
             goto overflow;
         }
-        x = (x << PyLong_SHIFT) | digits[i];
+        x = (x << PyLong_SHIFT) | v->long_value.ob_digit[i];
     }
     /* Haven't lost any bits, but casting to a signed type requires
      * extra care (see comment above).
@@ -730,18 +729,12 @@ PyLong_AsUnsignedLong(PyObject *vv)
     }
     i = _PyLong_DigitCount(v);
 
-    digit *digits = v->long_value.ob_digit;
-    assert(i >= 2);
-    /* unroll 1 digit */
-    --i;
-    assert(ULONG_MAX >= ((1UL << PyLong_SHIFT) - 1));
-    x = digits[i];
-
+    x = _unroll_digits(v, &i);
     while (--i >= 0) {
         if (x > SIZE_MAX >> PyLong_SHIFT) {
             goto overflow;
         }
-        x = (x << PyLong_SHIFT) | digits[i];
+        x = (x << PyLong_SHIFT) | v->long_value.ob_digit[i];
     }
     return x;
 overflow:
@@ -781,20 +774,14 @@ PyLong_AsSize_t(PyObject *vv)
     }
     i = _PyLong_DigitCount(v);
 
-    digit *digits = v->long_value.ob_digit;
-    assert(i >= 2);
-    /* unroll 1 digit */
-    --i;
-    assert(ULONG_MAX >= ((1UL << PyLong_SHIFT) - 1));
-    x = digits[i];
-
+    x = _unroll_digits(v, &i);
     while (--i >= 0) {
             if (x > SIZE_MAX >> PyLong_SHIFT) {
                 PyErr_SetString(PyExc_OverflowError,
                     "Python int too large to convert to C size_t");
                 return (size_t) -1;
             }
-            x = (x << PyLong_SHIFT) | digits[i];
+            x = (x << PyLong_SHIFT) | v->long_value.ob_digit[i];
         }
     return x;
 }
@@ -823,7 +810,7 @@ _PyLong_AsUnsignedLongMask(PyObject *vv)
     }
     i = _PyLong_DigitCount(v);
     int sign = _PyLong_NonCompactSign(v);
-    x = 0;
+    x = _unroll_digits(v, &i);
     while (--i >= 0) {
         x = (x << PyLong_SHIFT) | v->long_value.ob_digit[i];
     }
@@ -1642,7 +1629,7 @@ _PyLong_AsUnsignedLongLongMask(PyObject *vv)
     }
     i = _PyLong_DigitCount(v);
     sign = _PyLong_NonCompactSign(v);
-    x = 0;
+    x = _unroll_digits(v, &i);
     while (--i >= 0) {
         x = (x << PyLong_SHIFT) | v->long_value.ob_digit[i];
     }