Revert "DEBUG /wo gmp issues"

This reverts commit 959d07d.

Author: mvorisek

ext/gmp/gmp.c

@@ -368,7 +368,40 @@ static void shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zva
 
 static int gmp_do_operation_ex(zend_uchar opcode, zval *result, zval *op1, zval *op2) /* {{{ */
 {
+	switch (opcode) {
+	case ZEND_ADD:
+        gmp_zval_binary_ui_op(result, op1, op2, mpz_add, mpz_add_ui, false, true);
+        if (UNEXPECTED(EG(exception))) { return FAILURE; }
+        return SUCCESS;
+	case ZEND_SUB:
+		DO_BINARY_UI_OP(mpz_sub);
+	case ZEND_MUL:
+		DO_BINARY_UI_OP(mpz_mul);
+	case ZEND_POW:
+		shift_operator_helper(mpz_pow_ui, result, op1, op2, opcode);
+		return SUCCESS;
+	case ZEND_DIV:
+		DO_BINARY_UI_OP_EX(mpz_tdiv_q, gmp_mpz_tdiv_q_ui, 1);
+	case ZEND_MOD:
+		DO_BINARY_UI_OP_EX(mpz_mod, gmp_mpz_mod_ui, 1);
+	case ZEND_SL:
+		shift_operator_helper(mpz_mul_2exp, result, op1, op2, opcode);
+		return SUCCESS;
+	case ZEND_SR:
+		shift_operator_helper(mpz_fdiv_q_2exp, result, op1, op2, opcode);
+		return SUCCESS;
+	case ZEND_BW_OR:
+		DO_BINARY_OP(mpz_ior);
+	case ZEND_BW_AND:
+		DO_BINARY_OP(mpz_and);
+	case ZEND_BW_XOR:
+		DO_BINARY_OP(mpz_xor);
+	case ZEND_BW_NOT:
+		DO_UNARY_OP(mpz_com);
+
+	default:
 		return FAILURE;
+	}
 }
 /* }}} */
 
@@ -1012,18 +1045,21 @@ ZEND_FUNCTION(gmp_strval)
 /* {{{ Add a and b */
 ZEND_FUNCTION(gmp_add)
 {
+	gmp_binary_ui_op(mpz_add, mpz_add_ui);
 }
 /* }}} */
 
 /* {{{ Subtract b from a */
 ZEND_FUNCTION(gmp_sub)
 {
+	gmp_binary_ui_op(mpz_sub, mpz_sub_ui);
 }
 /* }}} */
 
 /* {{{ Multiply a and b */
 ZEND_FUNCTION(gmp_mul)
 {
+	gmp_binary_ui_op(mpz_mul, mpz_mul_ui);
 }
 /* }}} */
 
@@ -1477,12 +1513,14 @@ ZEND_FUNCTION(gmp_prob_prime)
 /* {{{ Computes greatest common denominator (gcd) of a and b */
 ZEND_FUNCTION(gmp_gcd)
 {
+	gmp_binary_ui_op(mpz_gcd, gmp_mpz_gcd_ui);
 }
 /* }}} */
 
 /* {{{ Computes least common multiple (lcm) of a and b */
 ZEND_FUNCTION(gmp_lcm)
 {
+	gmp_binary_ui_op(mpz_lcm, mpz_lcm_ui);
 }
 /* }}} */