dmitry Wed Mar 18 10:18:10 2009 UTC Modified files: (Branch: PHP_5_3) /php-src configure.in /ZendEngine2 Makefile.am Zend.dsp zend.c zend_execute_API.c zend_float.h zend_globals.h zend_operators.c zend_strtod.c /php-src/ext/standard math.c /php-src/win32/build config.w32 Log: Fixed floating point mathematic speed degradation (Christian)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.45&r2=1.579.2.52.2.77.2.46&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.45 php-src/configure.in:1.579.2.52.2.77.2.46 --- php-src/configure.in:1.579.2.52.2.77.2.45 Wed Feb 11 09:11:17 2009 +++ php-src/configure.in Wed Mar 18 10:18:09 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.45 2009/02/11 09:11:17 tony2001 Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.46 2009/03/18 10:18:09 dmitry Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1452,7 +1452,7 @@ zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ - zend_closures.c) + zend_closures.c zend_float.c) if test -r "$abs_srcdir/Zend/zend_objects.c"; then PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c) http://cvs.php.net/viewvc.cgi/ZendEngine2/Makefile.am?r1=1.57.2.1.2.1.2.2&r2=1.57.2.1.2.1.2.3&diff_format=u Index: ZendEngine2/Makefile.am diff -u ZendEngine2/Makefile.am:1.57.2.1.2.1.2.2 ZendEngine2/Makefile.am:1.57.2.1.2.1.2.3 --- ZendEngine2/Makefile.am:1.57.2.1.2.1.2.2 Mon Jul 14 09:48:58 2008 +++ ZendEngine2/Makefile.am Wed Mar 18 10:18:09 2009 @@ -17,7 +17,7 @@ zend_objects_API.c zend_ts_hash.c zend_stream.c \ zend_default_classes.c \ zend_iterators.c zend_interfaces.c zend_exceptions.c \ - zend_strtod.c zend_closures.c + zend_strtod.c zend_closures.c zend_float.c libZend_la_LDFLAGS = libZend_la_LIBADD = @ZEND_EXTRA_LIBS@ http://cvs.php.net/viewvc.cgi/ZendEngine2/Zend.dsp?r1=1.25.2.1.2.1.2.1&r2=1.25.2.1.2.1.2.2&diff_format=u Index: ZendEngine2/Zend.dsp diff -u ZendEngine2/Zend.dsp:1.25.2.1.2.1.2.1 ZendEngine2/Zend.dsp:1.25.2.1.2.1.2.2 --- ZendEngine2/Zend.dsp:1.25.2.1.2.1.2.1 Mon Jul 14 09:48:58 2008 +++ ZendEngine2/Zend.dsp Wed Mar 18 10:18:09 2009 @@ -155,6 +155,10 @@ # End Source File # Begin Source File +SOURCE=.\zend_float.c +# End Source File +# Begin Source File + SOURCE=.\zend_hash.c # End Source File # Begin Source File http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.35.2.29&r2=1.308.2.12.2.35.2.30&diff_format=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.308.2.12.2.35.2.29 ZendEngine2/zend.c:1.308.2.12.2.35.2.30 --- ZendEngine2/zend.c:1.308.2.12.2.35.2.29 Wed Feb 18 10:55:08 2009 +++ ZendEngine2/zend.c Wed Mar 18 10:18:09 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.308.2.12.2.35.2.29 2009/02/18 10:55:08 dmitry Exp $ */ +/* $Id: zend.c,v 1.308.2.12.2.35.2.30 2009/03/18 10:18:09 dmitry Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -549,6 +549,7 @@ EG(current_execute_data) = NULL; EG(current_module) = NULL; EG(exit_status) = 0; + EG(saved_fpu_cw) = NULL; EG(active) = 0; } /* }}} */ http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.72&r2=1.331.2.20.2.24.2.73&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.72 ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.73 --- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.72 Thu Mar 5 16:49:47 2009 +++ ZendEngine2/zend_execute_API.c Wed Mar 18 10:18:09 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.72 2009/03/05 16:49:47 felipe Exp $ */ +/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.73 2009/03/18 10:18:09 dmitry Exp $ */ #include <stdio.h> #include <signal.h> @@ -123,6 +123,8 @@ void init_executor(TSRMLS_D) /* {{{ */ { + zend_init_fpu(TSRMLS_C); + INIT_ZVAL(EG(uninitialized_zval)); /* trick to make uninitialized_zval never be modified, passed by ref, etc. */ Z_ADDREF(EG(uninitialized_zval)); @@ -331,6 +333,9 @@ FREE_HASHTABLE(EG(in_autoload)); } } zend_end_try(); + + zend_shutdown_fpu(TSRMLS_C); + EG(active) = 0; } /* }}} */ http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_float.h?r1=1.2.2.4&r2=1.2.2.5&diff_format=u Index: ZendEngine2/zend_float.h diff -u ZendEngine2/zend_float.h:1.2.2.4 ZendEngine2/zend_float.h:1.2.2.5 --- ZendEngine2/zend_float.h:1.2.2.4 Tue Mar 17 13:34:26 2009 +++ ZendEngine2/zend_float.h Wed Mar 18 10:18:09 2009 @@ -16,15 +16,17 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_float.h,v 1.2.2.4 2009/03/17 13:34:26 pajoye Exp $ */ +/* $Id: zend_float.h,v 1.2.2.5 2009/03/18 10:18:09 dmitry Exp $ */ #ifndef ZEND_FLOAT_H #define ZEND_FLOAT_H -#define ZEND_FLOAT_DECLARE XPFPA_DECLARE -#define ZEND_FLOAT_ENSURE() XPFPA_SWITCH_DOUBLE() -#define ZEND_FLOAT_RESTORE() XPFPA_RESTORE() -#define ZEND_FLOAT_RETURN(val) XPFPA_RETURN_DOUBLE(val) +/* + Define functions for FP initialization and de-initialization. +*/ +extern ZEND_API void zend_init_fpu(TSRMLS_D); +extern ZEND_API void zend_shutdown_fpu(TSRMLS_D); +extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D); /* Copy of the contents of xpfpa.h (which is under public domain) See http://wiki.php.net/rfc/rounding for details. @@ -45,7 +47,7 @@ For further details, please visit: http://www.christian-seiler.de/projekte/fpmath/ - Version: 20081026 */ + Version: 20090317 */ /* Implementation notes: @@ -69,11 +71,8 @@ /* MSVC detection (MSVC people usually don't use autoconf) */ #ifdef _MSC_VER # if _MSC_VER >= 1500 - /* Disable it, it slowdowns the floating operation more than - anything else, by a factor 3 (using Bench.php (mandel and - mandel2 for example)*/ /* Visual C++ 2008 or higher, supports _controlfp_s */ - /*# define HAVE__CONTROLFP_S */ +# define HAVE__CONTROLFP_S # else /* Visual C++ (up to 2005), supports _controlfp */ # define HAVE__CONTROLFP @@ -87,6 +86,19 @@ /* float.h defines _controlfp_s */ # include <float.h> +# define XPFPA_HAVE_CW 1 +# define XPFPA_CW_DATATYPE \ + unsigned int + +# define XPFPA_STORE_CW(vptr) do { \ + _controlfp_s((unsigned int *)(vptr), 0, 0); \ + } while (0) + +# define XPFPA_RESTORE_CW(vptr) do { \ + unsigned int _xpfpa_fpu_cw; \ + _controlfp_s(&_xpfpa_fpu_cw, *((unsigned int *)(vptr)), _MCW_PC); \ + } while (0) + # define XPFPA_DECLARE \ unsigned int _xpfpa_fpu_oldcw, _xpfpa_fpu_cw; @@ -141,6 +153,18 @@ # define XPFPA_DECLARE \ unsigned int _xpfpa_fpu_oldcw; +# define XPFPA_HAVE_CW 1 +# define XPFPA_CW_DATATYPE \ + unsigned int + +# define XPFPA_STORE_CW(vptr) do { \ + *((unsigned int *)(vptr)) = _controlfp(0, 0); \ + } while (0) + +# define XPFPA_RESTORE_CW(vptr) do { \ + _controlfp(*((unsigned int *)(vptr)), _MCW_PC); \ + } while (0) + # define XPFPA_SWITCH_DOUBLE() do { \ _xpfpa_fpu_oldcw = _controlfp(0, 0); \ _controlfp(_PC_53, _MCW_PC); \ @@ -188,6 +212,18 @@ # define XPFPA_DECLARE \ fpu_control_t _xpfpa_fpu_oldcw, _xpfpa_fpu_cw; +# define XPFPA_HAVE_CW 1 +# define XPFPA_CW_DATATYPE \ + fpu_control_t + +# define XPFPA_STORE_CW(vptr) do { \ + _FPU_GETCW((*((fpu_control_t *)(vptr)))); \ + } while (0) + +# define XPFPA_RESTORE_CW(vptr) do { \ + _FPU_SETCW((*((fpu_control_t *)(vptr)))); \ + } while (0) + # define XPFPA_SWITCH_DOUBLE() do { \ _FPU_GETCW(_xpfpa_fpu_oldcw); \ _xpfpa_fpu_cw = (_xpfpa_fpu_oldcw & ~_FPU_EXTENDED & ~_FPU_SINGLE) | _FPU_DOUBLE; \ @@ -235,6 +271,18 @@ # define XPFPA_DECLARE \ fp_prec_t _xpfpa_fpu_oldprec; +# define XPFPA_HAVE_CW 1 +# define XPFPA_CW_DATATYPE \ + fp_prec_t + +# define XPFPA_STORE_CW(vptr) do { \ + *((fp_prec_t *)(vptr)) = fpgetprec(); \ + } while (0) + +# define XPFPA_RESTORE_CW(vptr) do { \ + fpsetprec(*((fp_prec_t *)(vptr))); \ + } while (0) + # define XPFPA_SWITCH_DOUBLE() do { \ _xpfpa_fpu_oldprec = fpgetprec(); \ fpsetprec(FP_PD); \ @@ -298,6 +346,18 @@ # define XPFPA_DECLARE \ unsigned int _xpfpa_fpu_oldcw, _xpfpa_fpu_cw; +# define XPFPA_HAVE_CW 1 +# define XPFPA_CW_DATATYPE \ + unsigned int + +# define XPFPA_STORE_CW(vptr) do { \ + __asm__ __volatile__ ("fnstcw %0" : "=m" (*((unsigned int *)(vptr)))); \ + } while (0) + +# define XPFPA_RESTORE_CW(vptr) do { \ + __asm__ __volatile__ ("fldcw %0" : : "m" (*((unsigned int *)(vptr)))); \ + } while (0) + # define XPFPA_SWITCH_DOUBLE() do { \ __asm__ __volatile__ ("fnstcw %0" : "=m" (*&_xpfpa_fpu_oldcw)); \ _xpfpa_fpu_cw = (_xpfpa_fpu_oldcw & ~0x100) | 0x200; \ @@ -345,6 +405,10 @@ generated code will behave as planned. */ # define XPFPA_DECLARE /* NOP */ +# define XPFPA_HAVE_CW 0 +# define XPFPA_CW_DATATYPE unsigned int +# define XPFPA_STORE_CW(variable) /* NOP */ +# define XPFPA_RESTORE_CW(variable) /* NOP */ # define XPFPA_SWITCH_DOUBLE() /* NOP */ # define XPFPA_SWITCH_SINGLE() /* NOP */ # define XPFPA_SWITCH_DOUBLE_EXTENDED() /* NOP */ http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_globals.h?r1=1.141.2.3.2.7.2.22&r2=1.141.2.3.2.7.2.23&diff_format=u Index: ZendEngine2/zend_globals.h diff -u ZendEngine2/zend_globals.h:1.141.2.3.2.7.2.22 ZendEngine2/zend_globals.h:1.141.2.3.2.7.2.23 --- ZendEngine2/zend_globals.h:1.141.2.3.2.7.2.22 Fri Jan 16 00:57:43 2009 +++ ZendEngine2/zend_globals.h Wed Mar 18 10:18:09 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_globals.h,v 1.141.2.3.2.7.2.22 2009/01/16 00:57:43 pajoye Exp $ */ +/* $Id: zend_globals.h,v 1.141.2.3.2.7.2.23 2009/03/18 10:18:09 dmitry Exp $ */ #ifndef ZEND_GLOBALS_H #define ZEND_GLOBALS_H @@ -254,6 +254,8 @@ zend_bool active; + void *saved_fpu_cw; + void *reserved[ZEND_MAX_RESERVED_RESOURCES]; }; http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.208.2.4.2.23.2.20&r2=1.208.2.4.2.23.2.21&diff_format=u Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.20 ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.21 --- ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.20 Tue Feb 17 15:15:18 2009 +++ ZendEngine2/zend_operators.c Wed Mar 18 10:18:10 2009 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.20 2009/02/17 15:15:18 mattwil Exp $ */ +/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.21 2009/03/18 10:18:10 dmitry Exp $ */ #include <ctype.h> @@ -30,7 +30,6 @@ #include "zend_multiply.h" #include "zend_strtod.h" #include "zend_exceptions.h" -#include "zend_float.h" #define LONG_SIGN_MASK (1L << (8*sizeof(long)-1)) @@ -742,7 +741,6 @@ ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) { - ZEND_FLOAT_DECLARE zval op1_copy, op2_copy; int converted = 0; @@ -755,9 +753,7 @@ 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)) { - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) + (double) Z_LVAL_P(op2)); - ZEND_FLOAT_RESTORE(); } else { ZVAL_LONG(result, lval); } @@ -765,21 +761,15 @@ } case TYPE_PAIR(IS_LONG, IS_DOUBLE): - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) + Z_DVAL_P(op2)); - ZEND_FLOAT_RESTORE(); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_LONG): - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, Z_DVAL_P(op1) + ((double)Z_LVAL_P(op2))); - ZEND_FLOAT_RESTORE(); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, Z_DVAL_P(op1) + Z_DVAL_P(op2)); - ZEND_FLOAT_RESTORE(); return SUCCESS; case TYPE_PAIR(IS_ARRAY, IS_ARRAY): { @@ -813,7 +803,6 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) { - ZEND_FLOAT_DECLARE zval op1_copy, op2_copy; int converted = 0; @@ -826,9 +815,7 @@ 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)) { - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, (double) Z_LVAL_P(op1) - (double) Z_LVAL_P(op2)); - ZEND_FLOAT_RESTORE(); } else { ZVAL_LONG(result, lval); } @@ -836,21 +823,15 @@ } case TYPE_PAIR(IS_LONG, IS_DOUBLE): - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) - Z_DVAL_P(op2)); - ZEND_FLOAT_RESTORE(); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_LONG): - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, Z_DVAL_P(op1) - ((double)Z_LVAL_P(op2))); - ZEND_FLOAT_RESTORE(); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, Z_DVAL_P(op1) - Z_DVAL_P(op2)); - ZEND_FLOAT_RESTORE(); return SUCCESS; default: @@ -869,7 +850,6 @@ ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) { - ZEND_FLOAT_DECLARE zval op1_copy, op2_copy; int converted = 0; @@ -878,29 +858,21 @@ case TYPE_PAIR(IS_LONG, IS_LONG): { long overflow; - ZEND_FLOAT_ENSURE(); ZEND_SIGNED_MULTIPLY_LONG(Z_LVAL_P(op1),Z_LVAL_P(op2), Z_LVAL_P(result),Z_DVAL_P(result),overflow); - ZEND_FLOAT_RESTORE(); Z_TYPE_P(result) = overflow ? IS_DOUBLE : IS_LONG; return SUCCESS; } case TYPE_PAIR(IS_LONG, IS_DOUBLE): - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, ((double)Z_LVAL_P(op1)) * Z_DVAL_P(op2)); - ZEND_FLOAT_RESTORE(); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_LONG): - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, Z_DVAL_P(op1) * ((double)Z_LVAL_P(op2))); - ZEND_FLOAT_RESTORE(); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, Z_DVAL_P(op1) * Z_DVAL_P(op2)); - ZEND_FLOAT_RESTORE(); return SUCCESS; default: @@ -918,7 +890,6 @@ ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) { - ZEND_FLOAT_DECLARE zval op1_copy, op2_copy; int converted = 0; @@ -931,17 +902,13 @@ return FAILURE; /* division by zero */ } else if (Z_LVAL_P(op2) == -1 && Z_LVAL_P(op1) == LONG_MIN) { /* Prevent overflow error/crash */ - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, (double) LONG_MIN / -1); - ZEND_FLOAT_RESTORE(); return SUCCESS; } if (Z_LVAL_P(op1) % Z_LVAL_P(op2) == 0) { /* integer */ ZVAL_LONG(result, Z_LVAL_P(op1) / Z_LVAL_P(op2)); } else { - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, ((double) Z_LVAL_P(op1)) / Z_LVAL_P(op2)); - ZEND_FLOAT_RESTORE(); } return SUCCESS; @@ -951,9 +918,7 @@ ZVAL_BOOL(result, 0); return FAILURE; /* division by zero */ } - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, Z_DVAL_P(op1) / (double)Z_LVAL_P(op2)); - ZEND_FLOAT_RESTORE(); return SUCCESS; case TYPE_PAIR(IS_LONG, IS_DOUBLE): @@ -962,9 +927,7 @@ ZVAL_BOOL(result, 0); return FAILURE; /* division by zero */ } - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, (double)Z_LVAL_P(op1) / Z_DVAL_P(op2)); - ZEND_FLOAT_RESTORE(); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): @@ -973,9 +936,7 @@ ZVAL_BOOL(result, 0); return FAILURE; /* division by zero */ } - ZEND_FLOAT_ENSURE(); ZVAL_DOUBLE(result, Z_DVAL_P(op1) / Z_DVAL_P(op2)); - ZEND_FLOAT_RESTORE(); return SUCCESS; default: http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_strtod.c?r1=1.17.2.2.2.13.2.4&r2=1.17.2.2.2.13.2.5&diff_format=u Index: ZendEngine2/zend_strtod.c diff -u ZendEngine2/zend_strtod.c:1.17.2.2.2.13.2.4 ZendEngine2/zend_strtod.c:1.17.2.2.2.13.2.5 --- ZendEngine2/zend_strtod.c:1.17.2.2.2.13.2.4 Tue Dec 2 16:19:10 2008 +++ ZendEngine2/zend_strtod.c Wed Mar 18 10:18:10 2009 @@ -89,11 +89,10 @@ * directly -- and assumed always to succeed. */ -/* $Id: zend_strtod.c,v 1.17.2.2.2.13.2.4 2008/12/02 16:19:10 cseiler Exp $ */ +/* $Id: zend_strtod.c,v 1.17.2.2.2.13.2.5 2009/03/18 10:18:10 dmitry Exp $ */ #include <zend_operators.h> #include <zend_strtod.h> -#include <zend_float.h> #ifdef ZTS #include <TSRM.h> @@ -2033,7 +2032,6 @@ ZEND_API double zend_strtod (CONST char *s00, char **se) { - ZEND_FLOAT_DECLARE int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; CONST char *s, *s0, *s1; @@ -2046,8 +2044,6 @@ CONST char decimal_point = '.'; - ZEND_FLOAT_ENSURE(); - sign = nz0 = nz = 0; value(rv) = 0.; @@ -2578,7 +2574,7 @@ } _THREAD_PRIVATE_MUTEX_UNLOCK(pow5mult_mutex); - ZEND_FLOAT_RETURN(result); + return result; } ZEND_API double zend_hex_strtod(const char *str, char **endptr) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.12&r2=1.131.2.2.2.6.2.13&diff_format=u Index: php-src/ext/standard/math.c diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.12 php-src/ext/standard/math.c:1.131.2.2.2.6.2.13 --- php-src/ext/standard/math.c:1.131.2.2.2.6.2.12 Wed Dec 31 11:15:45 2008 +++ php-src/ext/standard/math.c Wed Mar 18 10:18:10 2009 @@ -19,12 +19,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: math.c,v 1.131.2.2.2.6.2.12 2008/12/31 11:15:45 sebastian Exp $ */ +/* $Id: math.c,v 1.131.2.2.2.6.2.13 2009/03/18 10:18:10 dmitry Exp $ */ #include "php.h" #include "php_math.h" #include "zend_multiply.h" -#include "zend_float.h" #include <math.h> #include <float.h> @@ -94,10 +93,8 @@ /* {{{ php_round_helper Actually performs the rounding of a value to integer in a certain mode */ static inline double php_round_helper(double value, int mode) { - ZEND_FLOAT_DECLARE double tmp_value; - ZEND_FLOAT_ENSURE(); if (value >= 0.0) { tmp_value = floor(value + 0.5); if ((mode == PHP_ROUND_HALF_DOWN && value == (-0.5 + tmp_value)) || @@ -116,7 +113,7 @@ } } - ZEND_FLOAT_RETURN(tmp_value); + return tmp_value; } /* }}} */ @@ -126,13 +123,10 @@ * mode. For the specifics of the algorithm, see http://wiki.php.net/rfc/rounding */ PHPAPI double _php_math_round(double value, int places, int mode) { - ZEND_FLOAT_DECLARE double f1, f2; double tmp_value; int precision_places; - ZEND_FLOAT_ENSURE(); - precision_places = 14 - php_intlog10abs(value); f1 = php_intpow10(abs(places)); @@ -163,7 +157,7 @@ } /* This value is beyond our precision, so rounding it is pointless */ if (fabs(tmp_value) >= 1e15) { - ZEND_FLOAT_RETURN(value); + return value; } } @@ -196,7 +190,7 @@ } } - ZEND_FLOAT_RETURN(tmp_value); + return tmp_value; } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.44&r2=1.40.2.8.2.10.2.45&diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.44 php-src/win32/build/config.w32:1.40.2.8.2.10.2.45 --- php-src/win32/build/config.w32:1.40.2.8.2.10.2.44 Fri Jan 23 15:49:49 2009 +++ php-src/win32/build/config.w32 Wed Mar 18 10:18:10 2009 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.40.2.8.2.10.2.44 2009/01/23 15:49:49 kalle Exp $ +// $Id: config.w32,v 1.40.2.8.2.10.2.45 2009/03/18 10:18:10 dmitry Exp $ // "Master" config file; think of it as a configure.in // equivalent. @@ -311,7 +311,8 @@ zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c \ - zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c"); + zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \ + zend_float.c"); ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c getopt.c fopen_wrappers.c \ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php