summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zend/Makefile.am2
-rw-r--r--Zend/Zend.dsp4
-rw-r--r--Zend/ZendTS.dsp4
-rw-r--r--Zend/zend.c1
-rw-r--r--Zend/zend_execute_API.c6
-rw-r--r--Zend/zend_float.c64
-rw-r--r--Zend/zend_float.h82
-rw-r--r--Zend/zend_globals.h2
-rw-r--r--Zend/zend_operators.c39
-rw-r--r--Zend/zend_strtod.c6
-rw-r--r--configure.in2
-rw-r--r--ext/standard/math.c12
-rw-r--r--win32/build/config.w323
13 files changed, 162 insertions, 65 deletions
diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index 5c4cb5aeec..0b25eeb3e2 100644
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -17,7 +17,7 @@ libZend_la_SOURCES=\
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_strtod.c zend_strtol.c zend_closures.c
+ zend_strtod.c zend_strtod.c zend_strtol.c zend_closures.c zend_float.c
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 042d584edb..bb8a670f3b 100644
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -151,6 +151,10 @@ SOURCE=.\zend_extensions.c
# 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
diff --git a/Zend/ZendTS.dsp b/Zend/ZendTS.dsp
index df709fff72..6de88c26bd 100644
--- a/Zend/ZendTS.dsp
+++ b/Zend/ZendTS.dsp
@@ -180,6 +180,10 @@ SOURCE=.\zend_extensions.c
# 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
diff --git a/Zend/zend.c b/Zend/zend.c
index 04a78627fb..989e2a6d59 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -976,6 +976,7 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals TSRMLS
EG(current_execute_data) = NULL;
EG(current_module) = NULL;
EG(exit_status) = 0;
+ EG(saved_fpu_cw) = NULL;
EG(active) = 0;
}
/* }}} */
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index bdf20bc8a3..ec1f9327b3 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -32,6 +32,7 @@
#include "zend_closures.h"
#include "zend_exceptions.h"
#include "zend_vm.h"
+#include "zend_float.h"
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
@@ -136,6 +137,8 @@ static int clean_non_persistent_class_full(zend_class_entry **ce TSRMLS_DC) /* {
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));
@@ -353,6 +356,9 @@ void shutdown_executor(TSRMLS_D) /* {{{ */
FREE_HASHTABLE(EG(in_autoload));
}
} zend_end_try();
+
+ zend_shutdown_fpu(TSRMLS_C);
+
EG(active) = 0;
}
/* }}} */
diff --git a/Zend/zend_float.c b/Zend/zend_float.c
new file mode 100644
index 0000000000..0928fe1711
--- /dev/null
+++ b/Zend/zend_float.c
@@ -0,0 +1,64 @@
+/*
+ +----------------------------------------------------------------------+
+ | Zend Engine |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 2.00 of the Zend license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.zend.com/license/2_00.txt. |
+ | If you did not receive a copy of the Zend license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | license@zend.com so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Authors: Christian Seiler <chris_se@gmx.net> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#include "zend.h"
+#include "zend_compile.h"
+#include "zend_float.h"
+
+ZEND_API void zend_init_fpu(TSRMLS_D) /* {{{ */
+{
+#if XPFPA_HAVE_CW
+ XPFPA_DECLARE
+
+ if (!EG(saved_fpu_cw)) {
+ EG(saved_fpu_cw) = emalloc(sizeof(XPFPA_CW_DATATYPE));
+ }
+ XPFPA_STORE_CW(EG(saved_fpu_cw));
+ XPFPA_SWITCH_DOUBLE();
+#else
+ if (EG(saved_fpu_cw)) {
+ efree(EG(saved_fpu_cw));
+ }
+ EG(saved_fpu_cw) = NULL;
+#endif
+}
+/* }}} */
+
+ZEND_API void zend_shutdown_fpu(TSRMLS_D) /* {{{ */
+{
+#if XPFPA_HAVE_CW
+ if (EG(saved_fpu_cw)) {
+ XPFPA_RESTORE_CW(EG(saved_fpu_cw));
+ }
+#endif
+ if (EG(saved_fpu_cw)) {
+ efree(EG(saved_fpu_cw));
+ EG(saved_fpu_cw) = NULL;
+ }
+}
+/* }}} */
+
+ZEND_API void zend_ensure_fpu_mode(TSRMLS_D) /* {{{ */
+{
+ XPFPA_DECLARE
+
+ XPFPA_SWITCH_DOUBLE();
+}
+/* }}} */
diff --git a/Zend/zend_float.h b/Zend/zend_float.h
index 591832ebe8..fdd248bdf3 100644
--- a/Zend/zend_float.h
+++ b/Zend/zend_float.h
@@ -21,10 +21,12 @@
#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 */
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index e8835a8ae6..a1e450cde3 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -242,6 +242,8 @@ struct _zend_executor_globals {
zend_bool active;
+ void *saved_fpu_cw;
+
void *reserved[ZEND_MAX_RESERVED_RESOURCES];
};
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 02b42cb1f6..26cc0c997b 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -30,7 +30,6 @@
#include "zend_multiply.h"
#include "zend_strtod.h"
#include "zend_exceptions.h"
-#include "zend_float.h"
#include "unicode/uchar.h"
#include "unicode/ucol.h"
@@ -1259,7 +1258,6 @@ ZEND_API void multi_convert_to_string_ex(int argc, ...) /* {{{ */
ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
- ZEND_FLOAT_DECLARE
zval op1_copy, op2_copy;
int converted = 0;
@@ -1272,9 +1270,7 @@ ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
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);
}
@@ -1282,21 +1278,15 @@ ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
}
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): {
@@ -1330,7 +1320,6 @@ ZEND_API int add_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
- ZEND_FLOAT_DECLARE
zval op1_copy, op2_copy;
int converted = 0;
@@ -1343,9 +1332,7 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
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);
}
@@ -1353,21 +1340,15 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
}
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:
@@ -1386,7 +1367,6 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
- ZEND_FLOAT_DECLARE
zval op1_copy, op2_copy;
int converted = 0;
@@ -1395,29 +1375,21 @@ ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
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:
@@ -1436,7 +1408,6 @@ ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
- ZEND_FLOAT_DECLARE
zval op1_copy, op2_copy;
int converted = 0;
@@ -1449,17 +1420,13 @@ ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
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;
@@ -1469,9 +1436,7 @@ ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
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):
@@ -1480,9 +1445,7 @@ ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
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):
@@ -1491,9 +1454,7 @@ ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
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:
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
index 83dd3e38c1..6df27ee58f 100644
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@ -94,7 +94,6 @@
#include <zend.h>
#include <unicode/utypes.h>
#include <zend_strtod.h>
-#include <zend_float.h>
#ifdef ZTS
#include <TSRM.h>
@@ -2045,7 +2044,6 @@ ret1:
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;
@@ -2058,8 +2056,6 @@ ZEND_API double zend_strtod (CONST char *s00, char **se) /* {{{ */
CONST char decimal_point = '.';
- ZEND_FLOAT_ENSURE();
-
sign = nz0 = nz = 0;
value(rv) = 0.;
@@ -2590,7 +2586,7 @@ ret:
}
_THREAD_PRIVATE_MUTEX_UNLOCK(pow5mult_mutex);
- ZEND_FLOAT_RETURN(result);
+ return result;
}
/* }}} */
diff --git a/configure.in b/configure.in
index 949f253ee4..3789afb8de 100644
--- a/configure.in
+++ b/configure.in
@@ -1366,7 +1366,7 @@ PHP_ADD_SOURCES(Zend, \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_qsort.c zend_ts_hash.c zend_stream.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c \
- zend_strtol.c zend_gc.c zend_closures.c)
+ zend_strtol.c zend_gc.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)
diff --git a/ext/standard/math.c b/ext/standard/math.c
index 4e3a5ec188..d8ebafaeef 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -24,7 +24,6 @@
#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 @@ static inline double php_intpow10(int power) {
/* {{{ 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 @@ static inline double php_round_helper(double value, int mode) {
}
}
- ZEND_FLOAT_RETURN(tmp_value);
+ return tmp_value;
}
/* }}} */
@@ -126,13 +123,10 @@ static inline double php_round_helper(double value, int mode) {
* 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 @@ PHPAPI double _php_math_round(double value, int places, int mode) {
}
/* 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 @@ PHPAPI double _php_math_round(double value, int places, int mode) {
}
}
- ZEND_FLOAT_RETURN(tmp_value);
+ return tmp_value;
}
/* }}} */
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 30775c8a58..f67bd303e0 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -343,7 +343,8 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
zend_sprintf.c zend_ini.c zend_qsort.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_unicode.c zend_strtol.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 fopen_wrappers.c \
php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
View Lorry Controller Status