cvs: ZendEngine2(PHP_5_2) / zend_execute.c zend_operators.c zend_operators.h zend_vm_def.h zend_vm_execute.h
[email protected] ("Ilia Alshanetsky") Sun, 15 Feb 2009 14:31:22 -0000
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsiliaa1234708282@cvsserver> |
iliaa Sun Feb 15 14:31:22 2009 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_execute.c zend_operators.c zend_operators.h
zend_vm_def.h zend_vm_execute.h
Log:
Revert patch for bug #46701 as it introduces a BC break
iliaa-20090215143122.txt
(text/plain, 12.6 KB)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.716.2.12.2.31&r2=1.716.2.12.2.32&diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.716.2.12.2.31 ZendEngine2/zend_execute.c:1.716.2.12.2.32
--- ZendEngine2/zend_execute.c:1.716.2.12.2.31 Tue Jan 6 01:29:20 2009
+++ ZendEngine2/zend_execute.c Sun Feb 15 14:31:17 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.716.2.12.2.31 2009/01/06 01:29:20 felipe Exp $ */
+/* $Id: zend_execute.c,v 1.716.2.12.2.32 2009/02/15 14:31:17 iliaa Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -979,7 +979,7 @@
long index;
if (Z_TYPE_P(dim) == IS_DOUBLE) {
- DVAL_TO_LVAL(Z_DVAL_P(dim), index);
+ index = (long)Z_DVAL_P(dim);
} else {
index = Z_LVAL_P(dim);
}
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.208.2.4.2.27&r2=1.208.2.4.2.28&diff_format=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.208.2.4.2.27 ZendEngine2/zend_operators.c:1.208.2.4.2.28
--- ZendEngine2/zend_operators.c:1.208.2.4.2.27 Tue Jan 6 01:29:20 2009
+++ ZendEngine2/zend_operators.c Sun Feb 15 14:31:17 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.c,v 1.208.2.4.2.27 2009/01/06 01:29:20 felipe Exp $ */
+/* $Id: zend_operators.c,v 1.208.2.4.2.28 2009/02/15 14:31:17 iliaa Exp $ */
#include <ctype.h>
@@ -186,6 +186,22 @@
} \
}
+#ifdef _WIN64
+# define DVAL_TO_LVAL(d, l) \
+ if ((d) > LONG_MAX) { \
+ (l) = (long)(unsigned long)(__int64) (d); \
+ } else { \
+ (l) = (long) (d); \
+ }
+#else
+# define DVAL_TO_LVAL(d, l) \
+ if ((d) > LONG_MAX) { \
+ (l) = (unsigned long) (d); \
+ } else { \
+ (l) = (long) (d); \
+ }
+#endif
+
#define zendi_convert_to_long(op, holder, result) \
if (op == result) { \
convert_to_long(op); \
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.h?r1=1.94.2.4.2.14&r2=1.94.2.4.2.15&diff_format=u
Index: ZendEngine2/zend_operators.h
diff -u ZendEngine2/zend_operators.h:1.94.2.4.2.14 ZendEngine2/zend_operators.h:1.94.2.4.2.15
--- ZendEngine2/zend_operators.h:1.94.2.4.2.14 Tue Jan 6 01:29:20 2009
+++ ZendEngine2/zend_operators.h Sun Feb 15 14:31:17 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.h,v 1.94.2.4.2.14 2009/01/06 01:29:20 felipe Exp $ */
+/* $Id: zend_operators.h,v 1.94.2.4.2.15 2009/02/15 14:31:17 iliaa Exp $ */
#ifndef ZEND_OPERATORS_H
#define ZEND_OPERATORS_H
@@ -75,22 +75,6 @@
ZEND_API zend_bool instanceof_function(zend_class_entry *instance_ce, zend_class_entry *ce TSRMLS_DC);
END_EXTERN_C()
-#ifdef _WIN64
-# define DVAL_TO_LVAL(d, l) \
- if ((d) > LONG_MAX) { \
- (l) = (long)(unsigned long)(__int64) (d); \
- } else { \
- (l) = (long) (d); \
- }
-#else
-# define DVAL_TO_LVAL(d, l) \
- if ((d) > LONG_MAX) { \
- (l) = (unsigned long) (d); \
- } else { \
- (l) = (long) (d); \
- }
-#endif
-
#define ZEND_IS_DIGIT(c) ((c) >= '0' && (c) <= '9')
#define ZEND_IS_XDIGIT(c) (((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.59.2.29.2.64&r2=1.59.2.29.2.65&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.64 ZendEngine2/zend_vm_def.h:1.59.2.29.2.65
--- ZendEngine2/zend_vm_def.h:1.59.2.29.2.64 Wed Jan 21 10:15:46 2009
+++ ZendEngine2/zend_vm_def.h Sun Feb 15 14:31:17 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_def.h,v 1.59.2.29.2.64 2009/01/21 10:15:46 dmitry Exp $ */
+/* $Id: zend_vm_def.h,v 1.59.2.29.2.65 2009/02/15 14:31:17 iliaa Exp $ */
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -2726,11 +2726,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.62.2.30.2.67&r2=1.62.2.30.2.68&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.67 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.68
--- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.67 Wed Jan 21 10:15:46 2009
+++ ZendEngine2/zend_vm_execute.h Sun Feb 15 14:31:17 2009
@@ -2810,11 +2810,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -3171,11 +3169,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -3532,11 +3528,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -3627,11 +3621,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -3987,11 +3979,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -5450,11 +5440,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -5897,11 +5885,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -6344,11 +6330,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -6439,11 +6423,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -6883,11 +6865,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -9535,11 +9515,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -11058,11 +11036,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -12629,11 +12605,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -13340,11 +13314,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -14643,11 +14615,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -21699,11 +21669,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -23214,11 +23182,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -24776,11 +24742,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -25482,11 +25446,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL:
@@ -26780,11 +26742,9 @@
}
}
if (offset) {
- long l;
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
- DVAL_TO_LVAL(Z_DVAL_P(offset), l);
- zend_hash_index_update(Z_ARRVAL_P(array_ptr), l, &expr_ptr, sizeof(zval *), NULL);
+ zend_hash_index_update(Z_ARRVAL_P(array_ptr), (long) Z_DVAL_P(offset), &expr_ptr, sizeof(zval *), NULL);
break;
case IS_LONG:
case IS_BOOL: