ported ext/gmp

diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 01cdf71aa406b006a326b09199eb70e8acd60127..8a89451178e50c5f5d782dd127900d8fb160dfe6 100644 (file)
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -298,7 +298,7 @@ if (IS_GMP(zval)) {                                               \
 #define INIT_GMP_RETVAL(gmpnumber) \
        gmp_create(return_value, &gmpnumber TSRMLS_CC)
 
-static void gmp_strval(zval *result, mpz_t gmpnum, long base);
+static void gmp_strval(zval *result, mpz_t gmpnum, php_int_t base);
 static int convert_to_gmp(mpz_t gmpnumber, zval *val, int base TSRMLS_DC);
 static void gmp_cmp(zval *return_value, zval *a_arg, zval *b_arg TSRMLS_DC);
 
@@ -311,14 +311,14 @@ static void gmp_cmp(zval *return_value, zval *a_arg, zval *b_arg TSRMLS_DC);
 typedef void (*gmp_unary_op_t)(mpz_ptr, mpz_srcptr);
 typedef int (*gmp_unary_opl_t)(mpz_srcptr);
 
-typedef void (*gmp_unary_ui_op_t)(mpz_ptr, unsigned long);
+typedef void (*gmp_unary_ui_op_t)(mpz_ptr, php_uint_t);
 
 typedef void (*gmp_binary_op_t)(mpz_ptr, mpz_srcptr, mpz_srcptr);
 typedef int (*gmp_binary_opl_t)(mpz_srcptr, mpz_srcptr);
 
-typedef void (*gmp_binary_ui_op_t)(mpz_ptr, mpz_srcptr, unsigned long);
+typedef void (*gmp_binary_ui_op_t)(mpz_ptr, mpz_srcptr, php_uint_t);
 typedef void (*gmp_binary_op2_t)(mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr);
-typedef void (*gmp_binary_ui_op2_t)(mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long);
+typedef void (*gmp_binary_ui_op2_t)(mpz_ptr, mpz_ptr, mpz_srcptr, php_uint_t);
 
 static inline void gmp_zval_binary_ui_op(zval *return_value, zval *a_arg, zval *b_arg, gmp_binary_op_t gmp_op, gmp_binary_ui_op_t gmp_ui_op, int check_b_zero TSRMLS_DC);
 static inline void gmp_zval_binary_ui_op2(zval *return_value, zval *a_arg, zval *b_arg, gmp_binary_op2_t gmp_op, gmp_binary_ui_op2_t gmp_ui_op, int check_b_zero TSRMLS_DC);
@@ -452,7 +452,7 @@ static zend_object *gmp_clone_obj(zval *obj TSRMLS_DC) /* {{{ */
 /* }}} */
 
 static void shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zval *op1, zval *op2 TSRMLS_DC) {
-       long shift = zval_get_int(op2);
+       php_int_t shift = zval_get_int(op2);
 
        if (shift < 0) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Shift cannot be negative");
@@ -463,7 +463,7 @@ static void shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zva
 
                FETCH_GMP_ZVAL(gmpnum_op, op1, temp);
                INIT_GMP_RETVAL(gmpnum_result);
-               op(gmpnum_result, gmpnum_op, (unsigned long) shift);
+               op(gmpnum_result, gmpnum_op, (php_uint_t) shift);
                FREE_GMP_TEMP(temp);
        }
 }
@@ -719,7 +719,7 @@ static int convert_to_gmp(mpz_t gmpnumber, zval *val, int base TSRMLS_DC)
 }
 /* }}} */
 
-static void gmp_strval(zval *result, mpz_t gmpnum, long base) /* {{{ */
+static void gmp_strval(zval *result, mpz_t gmpnum, php_int_t base) /* {{{ */
 {
        int num_len;
        zend_string *str;
@@ -755,7 +755,7 @@ static void gmp_cmp(zval *return_value, zval *a_arg, zval *b_arg TSRMLS_DC) /* {
        mpz_ptr gmpnum_a, gmpnum_b;
        gmp_temp_t temp_a, temp_b;
        zend_bool use_si = 0;
-       long res;
+       php_int_t res;
 
        FETCH_GMP_ZVAL(gmpnum_a, a_arg, temp_a);
 
@@ -816,7 +816,7 @@ static inline void gmp_zval_binary_ui_op(zval *return_value, zval *a_arg, zval *
        INIT_GMP_RETVAL(gmpnum_result);
 
        if (use_ui) {
-               gmp_ui_op(gmpnum_result, gmpnum_a, (unsigned long) Z_IVAL_P(b_arg));
+               gmp_ui_op(gmpnum_result, gmpnum_a, (php_uint_t) Z_IVAL_P(b_arg));
        } else {
                gmp_op(gmpnum_result, gmpnum_a, gmpnum_b);
        }
@@ -870,7 +870,7 @@ static inline void gmp_zval_binary_ui_op2(zval *return_value, zval *a_arg, zval
        add_next_index_zval(return_value, &result2);
 
        if (use_ui) {
-               gmp_ui_op(gmpnum_result1, gmpnum_result2, gmpnum_a, (unsigned long) Z_IVAL_P(b_arg));
+               gmp_ui_op(gmpnum_result1, gmpnum_result2, gmpnum_a, (php_uint_t) Z_IVAL_P(b_arg));
        } else {
                gmp_op(gmpnum_result1, gmpnum_result2, gmpnum_a, gmpnum_b);
        }
@@ -998,9 +998,9 @@ ZEND_FUNCTION(gmp_init)
 {
        zval *number_arg;
        mpz_ptr gmpnumber;
-       long base = 0;
+       php_int_t base = 0;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &number_arg, &base) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|i", &number_arg, &base) == FAILURE) {
                return;
        }
 
@@ -1040,11 +1040,11 @@ ZEND_FUNCTION(gmp_intval)
 ZEND_FUNCTION(gmp_strval)
 {
        zval *gmpnumber_arg;
-       long base = 10;
+       php_int_t base = 10;
        mpz_ptr gmpnum;
        gmp_temp_t temp_a;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &gmpnumber_arg, &base) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|i", &gmpnumber_arg, &base) == FAILURE) {
                return;
        }
 
@@ -1097,9 +1097,9 @@ ZEND_FUNCTION(gmp_mul)
 ZEND_FUNCTION(gmp_div_qr)
 {
        zval *a_arg, *b_arg;
-       long round = GMP_ROUND_ZERO;
+       php_int_t round = GMP_ROUND_ZERO;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|l", &a_arg, &b_arg, &round) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|i", &a_arg, &b_arg, &round) == FAILURE) {
                return;
        }
 
@@ -1125,9 +1125,9 @@ ZEND_FUNCTION(gmp_div_qr)
 ZEND_FUNCTION(gmp_div_r)
 {
        zval *a_arg, *b_arg;
-       long round = GMP_ROUND_ZERO;
+       php_int_t round = GMP_ROUND_ZERO;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|l", &a_arg, &b_arg, &round) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|i", &a_arg, &b_arg, &round) == FAILURE) {
                return;
        }
 
@@ -1153,9 +1153,9 @@ ZEND_FUNCTION(gmp_div_r)
 ZEND_FUNCTION(gmp_div_q)
 {
        zval *a_arg, *b_arg;
-       long round = GMP_ROUND_ZERO;
+       php_int_t round = GMP_ROUND_ZERO;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|l", &a_arg, &b_arg, &round) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|i", &a_arg, &b_arg, &round) == FAILURE) {
                return;
        }
 
@@ -1243,9 +1243,9 @@ ZEND_FUNCTION(gmp_pow)
        zval *base_arg;
        mpz_ptr gmpnum_result, gmpnum_base;
        gmp_temp_t temp_base;
-       long exp;
+       php_int_t exp;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &base_arg, &exp) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zi", &base_arg, &exp) == FAILURE) {
                return;
        }
 
@@ -1305,7 +1305,7 @@ ZEND_FUNCTION(gmp_powm)
 
        INIT_GMP_RETVAL(gmpnum_result);
        if (use_ui) {
-               mpz_powm_ui(gmpnum_result, gmpnum_base, (unsigned long) Z_IVAL_P(exp_arg), gmpnum_mod);
+               mpz_powm_ui(gmpnum_result, gmpnum_base, (php_uint_t) Z_IVAL_P(exp_arg), gmpnum_mod);
        } else {
                mpz_powm(gmpnum_result, gmpnum_base, gmpnum_exp, gmpnum_mod);
                FREE_GMP_TEMP(temp_exp);
@@ -1380,11 +1380,11 @@ ZEND_FUNCTION(gmp_sqrtrem)
 ZEND_FUNCTION(gmp_root)
 {
        zval *a_arg;
-       long nth;
+       php_int_t nth;
        mpz_ptr gmpnum_a, gmpnum_result;
        gmp_temp_t temp_a;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &a_arg, &nth) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zi", &a_arg, &nth) == FAILURE) {
                return;
        }
 
@@ -1412,12 +1412,12 @@ ZEND_FUNCTION(gmp_root)
 ZEND_FUNCTION(gmp_rootrem)
 {
        zval *a_arg;
-       long nth;
+       php_int_t nth;
        mpz_ptr gmpnum_a, gmpnum_result1, gmpnum_result2;
        gmp_temp_t temp_a;
        zval result1, result2;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &a_arg, &nth) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zi", &a_arg, &nth) == FAILURE) {
                return;
        }
 
@@ -1479,10 +1479,10 @@ ZEND_FUNCTION(gmp_prob_prime)
 {
        zval *gmpnumber_arg;
        mpz_ptr gmpnum_a;
-       long reps = 10;
+       php_int_t reps = 10;
        gmp_temp_t temp_a;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &gmpnumber_arg, &reps) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|i", &gmpnumber_arg, &reps) == FAILURE) {
                return;
        }
 
@@ -1613,10 +1613,10 @@ ZEND_FUNCTION(gmp_sign)
    Gets random number */
 ZEND_FUNCTION(gmp_random)
 {
-       long limiter = 20;
+       php_int_t limiter = 20;
        mpz_ptr gmpnum_result;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &limiter) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|i", &limiter) == FAILURE) {
                return;
        }
 
@@ -1684,11 +1684,11 @@ ZEND_FUNCTION(gmp_xor)
 ZEND_FUNCTION(gmp_setbit)
 {
        zval *a_arg;
-       long index;
+       php_int_t index;
        zend_bool set = 1;
        mpz_ptr gmpnum_a;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ol|b", &a_arg, gmp_ce, &index, &set) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Oi|b", &a_arg, gmp_ce, &index, &set) == FAILURE) {
                return;
        }
 
@@ -1712,10 +1712,10 @@ ZEND_FUNCTION(gmp_setbit)
 ZEND_FUNCTION(gmp_clrbit)
 {
        zval *a_arg;
-       long index;
+       php_int_t index;
        mpz_ptr gmpnum_a;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ol", &a_arg, gmp_ce, &index) == FAILURE){
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Oi", &a_arg, gmp_ce, &index) == FAILURE){
                return;
        }
 
@@ -1734,11 +1734,11 @@ ZEND_FUNCTION(gmp_clrbit)
 ZEND_FUNCTION(gmp_testbit)
 {
        zval *a_arg;
-       long index;
+       php_int_t index;
        mpz_ptr gmpnum_a;
        gmp_temp_t temp_a;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &a_arg, &index) == FAILURE){
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zi", &a_arg, &index) == FAILURE){
                return;
        }
 
@@ -1776,9 +1776,9 @@ ZEND_FUNCTION(gmp_scan0)
        zval *a_arg;
        mpz_ptr gmpnum_a;
        gmp_temp_t temp_a;
-       long start;
+       php_int_t start;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &a_arg, &start) == FAILURE){
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zi", &a_arg, &start) == FAILURE){
                return;
        }
 
@@ -1801,9 +1801,9 @@ ZEND_FUNCTION(gmp_scan1)
        zval *a_arg;
        mpz_ptr gmpnum_a;
        gmp_temp_t temp_a;
-       long start;
+       php_int_t start;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &a_arg, &start) == FAILURE){
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zi", &a_arg, &start) == FAILURE){
                return;
        }