dmitry Fri, 22 Oct 2010 14:51:07 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=304626
Log:
reduced size of temp_variariable
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/Zend/zend_execute.c
U php/php-src/trunk/Zend/zend_execute.h
U php/php-src/trunk/Zend/zend_vm_def.h
U php/php-src/trunk/Zend/zend_vm_execute.h
Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS 2010-10-22 14:34:33 UTC (rev 304625)
+++ php/php-src/trunk/NEWS 2010-10-22 14:51:07 UTC (rev 304626)
@@ -91,6 +91,7 @@
. the size of zend_class_entry is reduced by sharing the same memory space
by different information for internal and user classes.
See zend_class_inttry.info union.
+ . reduced size of temp_variariable
- Improved CLI Interactive readline shell (Johannes)
. Added cli.pager ini setting to set a pager for output.
. Added cli.prompt ini settingto configure the shell prompt.
Modified: php/php-src/trunk/Zend/zend_execute.c
===================================================================
--- php/php-src/trunk/Zend/zend_execute.c 2010-10-22 14:34:33 UTC (rev
304625)
+++ php/php-src/trunk/Zend/zend_execute.c 2010-10-22 14:51:07 UTC (rev
304626)
@@ -1144,8 +1144,7 @@
result->str_offset.str = container;
PZVAL_LOCK(container);
result->str_offset.offset = Z_LVAL_P(dim);
- result->var.ptr_ptr = NULL;
- result->var.ptr = NULL;
+ result->str_offset.ptr_ptr = NULL;
return;
}
break;
Modified: php/php-src/trunk/Zend/zend_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_execute.h 2010-10-22 14:34:33 UTC (rev
304625)
+++ php/php-src/trunk/Zend/zend_execute.h 2010-10-22 14:51:07 UTC (rev
304626)
@@ -35,16 +35,13 @@
zend_bool fcall_returned_reference;
} var;
struct {
- zval **ptr_ptr;
- zval *ptr;
- zend_bool fcall_returned_reference;
+ zval **ptr_ptr; /* shared with var.ptr_ptr */
zval *str;
zend_uint offset;
} str_offset;
struct {
- zval **ptr_ptr;
- zval *ptr;
- zend_bool fcall_returned_reference;
+ zval **ptr_ptr; /* shared with var.ptr_ptr */
+ zval *ptr; /* shared with var.ptr */
HashPointer fe_pos;
} fe;
zend_class_entry *class_entry;
Modified: php/php-src/trunk/Zend/zend_vm_def.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_def.h 2010-10-22 14:34:33 UTC (rev
304625)
+++ php/php-src/trunk/Zend/zend_vm_def.h 2010-10-22 14:51:07 UTC (rev
304626)
@@ -4039,7 +4039,7 @@
}
}
- AI_SET_PTR(&EX_T(opline->result.var), array_ptr);
+ EX_T(opline->result.var).fe.ptr = array_ptr;
if (iter) {
iter->index = 0;
@@ -4097,7 +4097,7 @@
{
USE_OPLINE
zend_free_op free_op1;
- zval *array = EX_T(opline->op1.var).var.ptr;
+ zval *array = EX_T(opline->op1.var).fe.ptr;
zval **value;
char *str_key;
uint str_key_len;
Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_execute.h 2010-10-22 14:34:33 UTC (rev
304625)
+++ php/php-src/trunk/Zend/zend_vm_execute.h 2010-10-22 14:51:07 UTC (rev
304626)
@@ -2542,7 +2542,7 @@
}
}
- AI_SET_PTR(&EX_T(opline->result.var), array_ptr);
+ EX_T(opline->result.var).fe.ptr = array_ptr;
if (iter) {
iter->index = 0;
@@ -6805,7 +6805,7 @@
}
}
- AI_SET_PTR(&EX_T(opline->result.var), array_ptr);
+ EX_T(opline->result.var).fe.ptr = array_ptr;
if (iter) {
iter->index = 0;
@@ -11094,7 +11094,7 @@
}
}
- AI_SET_PTR(&EX_T(opline->result.var), array_ptr);
+ EX_T(opline->result.var).fe.ptr = array_ptr;
if (iter) {
iter->index = 0;
@@ -11152,7 +11152,7 @@
{
USE_OPLINE
- zval *array = EX_T(opline->op1.var).var.ptr;
+ zval *array = EX_T(opline->op1.var).fe.ptr;
zval **value;
char *str_key;
uint str_key_len;
@@ -26765,7 +26765,7 @@
}
}
- AI_SET_PTR(&EX_T(opline->result.var), array_ptr);
+ EX_T(opline->result.var).fe.ptr = array_ptr;
if (iter) {
iter->index = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
