com php-src: share that hunk of code: Zend/zend_operators.c

From: Date: Tue, 23 Dec 2014 01:51:19 +0000
Subject: com php-src: share that hunk of code: Zend/zend_operators.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83831@lists.php.net to get a copy of this message
Commit: b2853e7494ce0fd352d4f74c67594c81a275c570 Author: Andrea Faulds <ajf@ajf.me> Tue, 23 Dec 2014 01:51:19 +0000 Parents: 6ec5ab77df816a66e480f2d3dcf4f917c4390833 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b2853e7494ce0fd352d4f74c67594c81a275c570 Log: share that hunk of code Changed paths: M Zend/zend_operators.c Diff: diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index d78a891..4e4dcd0 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -240,6 +240,38 @@ try_again: /* }}} */ +#define convert_op1_op2_long(op1, op1_lval, op2, op2_lval, op, op_func) \ + do { \ + if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) { \ + if (Z_ISREF_P(op1)) { \ + op1 = Z_REFVAL_P(op1); \ + if (Z_TYPE_P(op1) == IS_LONG) { \ + op1_lval = Z_LVAL_P(op1); \ + break; \ + } \ + } \ + ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(op, op_func); \ + op1_lval = _zval_get_long_func(op1); \ + } else { \ + op1_lval = Z_LVAL_P(op1); \ + } \ + } while (0); \ + do { \ + if (UNEXPECTED(Z_TYPE_P(op2) != IS_LONG)) { \ + if (Z_ISREF_P(op2)) { \ + op2 = Z_REFVAL_P(op2); \ + if (Z_TYPE_P(op2) == IS_LONG) { \ + op2_lval = Z_LVAL_P(op2); \ + break; \ + } \ + } \ + ZEND_TRY_BINARY_OP2_OBJECT_OPERATION(op); \ + op2_lval = _zval_get_long_func(op2); \ + } else { \ + op2_lval = Z_LVAL_P(op2); \ + } \ + } while (0); \ + ZEND_API void convert_to_long(zval *op) /* {{{ */ { if (Z_TYPE_P(op) != IS_LONG) { @@ -1110,37 +1142,8 @@ ZEND_API int mod_function(zval *result, zval *op1, zval *op2) /* {{{ */ { zend_long op1_lval, op2_lval; - do { - if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) { - if (Z_ISREF_P(op1)) { - op1 = Z_REFVAL_P(op1); - if (Z_TYPE_P(op1) == IS_LONG) { - op1_lval = Z_LVAL_P(op1); - break; - } - } - ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_MOD, mod_function); - op1_lval = _zval_get_long_func(op1); - } else { - op1_lval = Z_LVAL_P(op1); - } - } while (0); - do { - if (UNEXPECTED(Z_TYPE_P(op2) != IS_LONG)) { - if (Z_ISREF_P(op2)) { - op2 = Z_REFVAL_P(op2); - if (Z_TYPE_P(op2) == IS_LONG) { - op2_lval = Z_LVAL_P(op2); - break; - } - } - ZEND_TRY_BINARY_OP2_OBJECT_OPERATION(ZEND_MOD); - op2_lval = _zval_get_long_func(op2); - } else { - op2_lval = Z_LVAL_P(op2); - } - } while (0); - + convert_op1_op2_long(op1, op1_lval, op2, op2_lval, ZEND_MOD, mod_function); + if (op2_lval == 0) { zend_error(E_WARNING, "Division by zero"); ZVAL_FALSE(result); @@ -1446,36 +1449,7 @@ ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2) /* {{{ */ { zend_long op1_lval, op2_lval; - do { - if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) { - if (Z_ISREF_P(op1)) { - op1 = Z_REFVAL_P(op1); - if (Z_TYPE_P(op1) == IS_LONG) { - op1_lval = Z_LVAL_P(op1); - break; - } - } - ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_SL, mod_function); - op1_lval = _zval_get_long_func(op1); - } else { - op1_lval = Z_LVAL_P(op1); - } - } while (0); - do { - if (UNEXPECTED(Z_TYPE_P(op2) != IS_LONG)) { - if (Z_ISREF_P(op2)) { - op2 = Z_REFVAL_P(op2); - if (Z_TYPE_P(op2) == IS_LONG) { - op2_lval = Z_LVAL_P(op2); - break; - } - } - ZEND_TRY_BINARY_OP2_OBJECT_OPERATION(ZEND_SL); - op2_lval = _zval_get_long_func(op2); - } else { - op2_lval = Z_LVAL_P(op2); - } - } while (0); + convert_op1_op2_long(op1, op1_lval, op2, op2_lval, ZEND_SL, shift_left_function); /* prevent wrapping quirkiness on some processors where << 64 + x == << x */ if (UNEXPECTED((zend_ulong)op2_lval >= SIZEOF_ZEND_LONG * 8)) { @@ -1501,36 +1475,7 @@ ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2) /* {{{ */ { zend_long op1_lval, op2_lval; - do { - if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) { - if (Z_ISREF_P(op1)) { - op1 = Z_REFVAL_P(op1); - if (Z_TYPE_P(op1) == IS_LONG) { - op1_lval = Z_LVAL_P(op1); - break; - } - } - ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_SR, mod_function); - op1_lval = _zval_get_long_func(op1); - } else { - op1_lval = Z_LVAL_P(op1); - } - } while (0); - do { - if (UNEXPECTED(Z_TYPE_P(op2) != IS_LONG)) { - if (Z_ISREF_P(op2)) { - op2 = Z_REFVAL_P(op2); - if (Z_TYPE_P(op2) == IS_LONG) { - op2_lval = Z_LVAL_P(op2); - break; - } - } - ZEND_TRY_BINARY_OP2_OBJECT_OPERATION(ZEND_SR); - op2_lval = _zval_get_long_func(op2); - } else { - op2_lval = Z_LVAL_P(op2); - } - } while (0); + convert_op1_op2_long(op1, op1_lval, op2, op2_lval, ZEND_SR, shift_right_function); /* prevent wrapping quirkiness on some processors where >> 64 + x == >> x */ if (UNEXPECTED((zend_ulong)op2_lval >= SIZEOF_ZEND_LONG * 8)) {

« previous php.cvs (#83831) next »