archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/gmp: Refactor gmp_divexact() and gmp_mod() to use custom ZPP specifier

Browse source
This commit is contained in:
Gina Peter Banyard 2024-11-02 23:48:22 +00:00
parent 8e9b944a83
commit fabfb6fe00
3 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

50
ext/gmp/gmp.c
View file

@ -275,11 +275,6 @@ static void gmp_mpz_mod_ui(mpz_ptr a, mpz_srcptr b, gmp_ulong c) {
mpz_mod_ui(a, b, c); mpz_mod_ui(a, b, c);
} }
/* Binary operations */
#define gmp_binary_op(op) _gmp_binary_ui_op(INTERNAL_FUNCTION_PARAM_PASSTHRU, op, NULL, 0)
#define gmp_binary_ui_op_no_zero(op, uop) \
_gmp_binary_ui_op(INTERNAL_FUNCTION_PARAM_PASSTHRU, op, uop, 1)
static void gmp_free_object_storage(zend_object *obj) /* {{{ */ static void gmp_free_object_storage(zend_object *obj) /* {{{ */
{ {
gmp_object *intern = GET_GMP_OBJECT_FROM_OBJ(obj); gmp_object *intern = GET_GMP_OBJECT_FROM_OBJ(obj);
@ -878,21 +873,6 @@ static inline void gmp_zval_binary_ui_op(zval *return_value, zval *a_arg, zval *
} }
/* }}} */ /* }}} */
/* {{{ _gmp_binary_ui_op */
static inline void _gmp_binary_ui_op(INTERNAL_FUNCTION_PARAMETERS, gmp_binary_op_t gmp_op, gmp_binary_ui_op_t gmp_ui_op, int check_b_zero)
{
zval *a_arg, *b_arg;
ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_ZVAL(a_arg)
Z_PARAM_ZVAL(b_arg)
ZEND_PARSE_PARAMETERS_END();
gmp_zval_binary_ui_op(
return_value, a_arg, b_arg, gmp_op, gmp_ui_op, check_b_zero, /* is_operator */ false);
}
/* }}} */
/* Unary operations */ /* Unary operations */
/* {{{ gmp_zval_unary_op */ /* {{{ gmp_zval_unary_op */
@ -1232,14 +1212,40 @@ ZEND_FUNCTION(gmp_div_q)
/* {{{ Computes a modulo b */ /* {{{ Computes a modulo b */
ZEND_FUNCTION(gmp_mod) ZEND_FUNCTION(gmp_mod)
{ {
gmp_binary_ui_op_no_zero(mpz_mod, gmp_mpz_mod_ui); mpz_ptr gmpnum_a, gmpnum_b, gmpnum_result;
ZEND_PARSE_PARAMETERS_START(2, 2)
GMP_Z_PARAM_INTO_MPZ_PTR(gmpnum_a)
GMP_Z_PARAM_INTO_MPZ_PTR(gmpnum_b)
ZEND_PARSE_PARAMETERS_END();
if (mpz_cmp_ui(gmpnum_b, 0) == 0) {
zend_argument_error(zend_ce_division_by_zero_error, 2, "Modulo by zero");
RETURN_THROWS();
}
INIT_GMP_RETVAL(gmpnum_result);
mpz_mod(gmpnum_result, gmpnum_a, gmpnum_b);
} }
/* }}} */ /* }}} */
/* {{{ Divide a by b using exact division algorithm */ /* {{{ Divide a by b using exact division algorithm */
ZEND_FUNCTION(gmp_divexact) ZEND_FUNCTION(gmp_divexact)
{ {
gmp_binary_ui_op_no_zero(mpz_divexact, NULL); mpz_ptr gmpnum_a, gmpnum_b, gmpnum_result;
ZEND_PARSE_PARAMETERS_START(2, 2)
GMP_Z_PARAM_INTO_MPZ_PTR(gmpnum_a)
GMP_Z_PARAM_INTO_MPZ_PTR(gmpnum_b)
ZEND_PARSE_PARAMETERS_END();
if (mpz_cmp_ui(gmpnum_b, 0) == 0) {
zend_argument_error(zend_ce_division_by_zero_error, 2, "Division by zero");
RETURN_THROWS();
}
INIT_GMP_RETVAL(gmpnum_result);
mpz_divexact(gmpnum_result, gmpnum_a, gmpnum_b);
} }
/* }}} */ /* }}} */

2
ext/gmp/tests/gmp_divexact.phpt
View file

@ -42,7 +42,7 @@ echo "Done\n";
?> ?>
--EXPECT-- --EXPECT--
string(1) "0" string(1) "0"
Division by zero gmp_divexact(): Argument #2 ($num2) Division by zero
string(2) "10" string(2) "10"
string(3) "512" string(3) "512"
string(19) "5000000000000000000" string(19) "5000000000000000000"

2
ext/gmp/tests/gmp_mod.phpt
View file

@ -42,7 +42,7 @@ object(GMP)#2 (1) {
["num"]=> ["num"]=>
string(1) "0" string(1) "0"
} }
Modulo by zero gmp_mod(): Argument #2 ($num2) Modulo by zero
gmp_mod(): Argument #1 ($num1) must be of type GMP|string|int, array given gmp_mod(): Argument #1 ($num1) must be of type GMP|string|int, array given
object(GMP)#4 (1) { object(GMP)#4 (1) {
["num"]=> ["num"]=>