com php-src: Use "fast" assembler functions in "slow" ones. Mark assembler functions that changes memory.: Zend/zend_operators.c Zen
d/zend_operators.h

From: Date: Wed, 01 Jun 2016 17:52:14 +0000
Subject: com php-src: Use "fast" assembler functions in "slow" ones. Mark assembler functions that changes memory.: Zend/zend_operators.c Zen
d/zend_operators.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92267@lists.php.net to get a copy of this message
Commit: 1b4946e658eb6c7fe02302fd4efda566340ae3c7 Author: Dmitry Stogov <dmitry@zend.com> Wed, 1 Jun 2016 20:52:14 +0300 Parents: 6a32d44392185be1d36dbc2e8b6c640a5d0491ca Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1b4946e658eb6c7fe02302fd4efda566340ae3c7 Log: Use "fast" assembler functions in "slow" ones. Mark assembler functions that changes memory. Changed paths: M Zend/zend_operators.c M Zend/zend_operators.h Diff: diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 8eb9a7b...4159e43 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -907,20 +907,9 @@ ZEND_API int ZEND_FASTCALL add_function(zval *result, zval *op1, zval *op2) /* { while (1) { switch (TYPE_PAIR(Z_TYPE_P(op1), Z_TYPE_P(op2))) { - case TYPE_PAIR(IS_LONG, IS_LONG): { - zend_long lval = Z_LVAL_P(op1) + Z_LVAL_P(op2); - - /* check for overflow by comparing sign bits */ - if ((Z_LVAL_P(op1) & LONG_SIGN_MASK) == (Z_LVAL_P(op2) & LONG_SIGN_MASK) - && (Z_LVAL_P(op1) & LONG_SIGN_MASK) != (lval & LONG_SIGN_MASK)) { - - ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) + (double) Z_LVAL_P(op2)); - } else { - ZVAL_LONG(result, lval); - } + case TYPE_PAIR(IS_LONG, IS_LONG): + fast_long_add_function(result, op1, op2); return SUCCESS; - } - case TYPE_PAIR(IS_LONG, IS_DOUBLE): ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2)); return SUCCESS; @@ -971,20 +960,9 @@ ZEND_API int ZEND_FASTCALL sub_function(zval *result, zval *op1, zval *op2) /* { while (1) { switch (TYPE_PAIR(Z_TYPE_P(op1), Z_TYPE_P(op2))) { - case TYPE_PAIR(IS_LONG, IS_LONG): { - zend_long lval = Z_LVAL_P(op1) - Z_LVAL_P(op2); - - /* check for overflow by comparing sign bits */ - if ((Z_LVAL_P(op1) & LONG_SIGN_MASK) != (Z_LVAL_P(op2) & LONG_SIGN_MASK) - && (Z_LVAL_P(op1) & LONG_SIGN_MASK) != (lval & LONG_SIGN_MASK)) { - - ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) - (double) Z_LVAL_P(op2)); - } else { - ZVAL_LONG(result, lval); - } + case TYPE_PAIR(IS_LONG, IS_LONG): + fast_long_sub_function(result, op1, op2); return SUCCESS; - - } case TYPE_PAIR(IS_LONG, IS_DOUBLE): ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2)); return SUCCESS; diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 405ca09..3705022 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -456,7 +456,7 @@ static zend_always_inline void fast_long_increment_function(zval *op1) : "r"(&op1->value), "n"(IS_DOUBLE), "n"(ZVAL_OFFSETOF_TYPE) - : "cc"); + : "cc", "memory"); #elif defined(__GNUC__) && defined(__x86_64__) __asm__( "incq (%0)\n\t" @@ -469,7 +469,7 @@ static zend_always_inline void fast_long_increment_function(zval *op1) : "r"(&op1->value), "n"(IS_DOUBLE), "n"(ZVAL_OFFSETOF_TYPE) - : "cc"); + : "cc", "memory"); #else if (UNEXPECTED(Z_LVAL_P(op1) == ZEND_LONG_MAX)) { /* switch to double */ @@ -494,7 +494,7 @@ static zend_always_inline void fast_long_decrement_function(zval *op1) : "r"(&op1->value), "n"(IS_DOUBLE), "n"(ZVAL_OFFSETOF_TYPE) - : "cc"); + : "cc", "memory"); #elif defined(__GNUC__) && defined(__x86_64__) __asm__( "decq (%0)\n\t" @@ -507,7 +507,7 @@ static zend_always_inline void fast_long_decrement_function(zval *op1) : "r"(&op1->value), "n"(IS_DOUBLE), "n"(ZVAL_OFFSETOF_TYPE) - : "cc"); + : "cc", "memory"); #else if (UNEXPECTED(Z_LVAL_P(op1) == ZEND_LONG_MIN)) { /* switch to double */ @@ -542,7 +542,7 @@ static zend_always_inline void fast_long_add_function(zval *result, zval *op1, z "n"(IS_LONG), "n"(IS_DOUBLE), "n"(ZVAL_OFFSETOF_TYPE) - : "eax","cc"); + : "eax","cc", "memory"); #elif defined(__GNUC__) && defined(__x86_64__) __asm__( "movq (%1), %%rax\n\t" @@ -565,7 +565,7 @@ static zend_always_inline void fast_long_add_function(zval *result, zval *op1, z "n"(IS_LONG), "n"(IS_DOUBLE), "n"(ZVAL_OFFSETOF_TYPE) - : "rax","cc"); + : "rax","cc", "memory"); #else /* * 'result' may alias with op1 or op2, so we need to @@ -632,7 +632,7 @@ static zend_always_inline void fast_long_sub_function(zval *result, zval *op1, z "n"(IS_LONG), "n"(IS_DOUBLE), "n"(ZVAL_OFFSETOF_TYPE) - : "eax","cc"); + : "eax","cc", "memory"); #elif defined(__GNUC__) && defined(__x86_64__) __asm__( "movq (%1), %%rax\n\t" @@ -659,7 +659,7 @@ static zend_always_inline void fast_long_sub_function(zval *result, zval *op1, z "n"(IS_LONG), "n"(IS_DOUBLE), "n"(ZVAL_OFFSETOF_TYPE) - : "rax","cc"); + : "rax","cc", "memory"); #else ZVAL_LONG(result, Z_LVAL_P(op1) - Z_LVAL_P(op2));

« previous php.cvs (#92267) next »