cvs: ZendEngine2 / zend_execute.c

dmitry		Wed Mar 18 14:15:59 2009 UTC

  Modified files:              
    /ZendEngine2	zend_execute.c 
  Log:
  Inline only the most useful code
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.809&r2=1.810&diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.809 ZendEngine2/zend_execute.c:1.810
--- ZendEngine2/zend_execute.c:1.809	Wed Mar 18 12:52:58 2009
+++ ZendEngine2/zend_execute.c	Wed Mar 18 14:15:59 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.c,v 1.809 2009/03/18 12:52:58 dmitry Exp $ */
+/* $Id: zend_execute.c,v 1.810 2009/03/18 14:15:59 dmitry Exp $ */
 
 #define ZEND_INTENSIVE_DEBUGGING 0
 
@@ -66,7 +66,7 @@
 
 #define TEMP_VAR_STACK_LIMIT 2000
 
-static inline void zend_pzval_unlock_func(zval *z, zend_free_op *should_free, int unref TSRMLS_DC) /* {{{ */
+static zend_always_inline void zend_pzval_unlock_func(zval *z, zend_free_op *should_free, int unref TSRMLS_DC) /* {{{ */
 {
 	if (!Z_DELREF_P(z)) {
 		Z_SET_REFCOUNT_P(z, 1);
@@ -83,7 +83,7 @@
 }
 /* }}} */
 
-static inline void zend_pzval_unlock_free_func(zval *z TSRMLS_DC) /* {{{ */
+static zend_always_inline void zend_pzval_unlock_free_func(zval *z TSRMLS_DC) /* {{{ */
 {
 	if (!Z_DELREF_P(z)) {
 		if (z != &EG(uninitialized_zval)) {
@@ -182,7 +182,7 @@
 }
 /* }}} */
 
-static inline zval *_get_zval_ptr_var_string_offset(const znode *node, const temp_variable *Ts, zend_free_op *should_free TSRMLS_DC) /* {{{ */
+static zval *_get_zval_ptr_var_string_offset(const znode *node, const temp_variable *Ts, zend_free_op *should_free TSRMLS_DC) /* {{{ */
 {
 	temp_variable *T = &T(node->u.var);
 	zval *str = T->str_offset.str;
@@ -240,7 +240,7 @@
 }
 /* }}} */
 
-static inline zval **_get_zval_cv_lookup(zval ***ptr, zend_uint var, int type TSRMLS_DC) /* {{{ */
+static zval **_get_zval_cv_lookup(zval ***ptr, zend_uint var, int type TSRMLS_DC) /* {{{ */
 {
 	zend_compiled_variable *cv = &CV_DEF_OF(var);
 	zend_uchar utype = UG(unicode)?IS_UNICODE:IS_STRING;
@@ -313,7 +313,7 @@
 }
 /* }}} */
 
-static inline zval **_get_zval_ptr_ptr_var(const znode *node, const temp_variable *Ts, zend_free_op *should_free TSRMLS_DC) /* {{{ */
+static zend_always_inline zval **_get_zval_ptr_ptr_var(const znode *node, const temp_variable *Ts, zend_free_op *should_free TSRMLS_DC) /* {{{ */
 {
 	zval** ptr_ptr = T(node->u.var).var.ptr_ptr;
 
@@ -352,7 +352,7 @@
 }
 /* }}} */
 
-static inline zval *_get_obj_zval_ptr_unused(TSRMLS_D) /* {{{ */
+static zend_always_inline zval *_get_obj_zval_ptr_unused(TSRMLS_D) /* {{{ */
 {
 	if (EXPECTED(EG(This) != NULL)) {
 		return EG(This);
@@ -379,7 +379,7 @@
 }
 /* }}} */
 
-static inline zval **_get_obj_zval_ptr_ptr_unused(TSRMLS_D) /* {{{ */
+static zend_always_inline zval **_get_obj_zval_ptr_ptr_unused(TSRMLS_D) /* {{{ */
 {
 	if (EXPECTED(EG(This) != NULL)) {
 		return &EG(This);