cvs: ZendEngine2(PHP_5_3) / zend_execute.c

dmitry		Wed Mar 18 14:15:28 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_execute.c 
  Log:
  Inline only the most useful code
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.716.2.12.2.24.2.40&r2=1.716.2.12.2.24.2.41&diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.40 ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.41
--- ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.40	Wed Mar 18 12:53:14 2009
+++ ZendEngine2/zend_execute.c	Wed Mar 18 14:15:28 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.40 2009/03/18 12:53:14 dmitry Exp $ */
+/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.41 2009/03/18 14:15:28 dmitry Exp $ */
 
 #define ZEND_INTENSIVE_DEBUGGING 0
 
@@ -65,7 +65,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);
@@ -81,7 +81,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)) {
@@ -177,7 +177,7 @@
 	return should_free->var = &T(node->u.var).tmp_var;
 }
 
-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;
@@ -215,7 +215,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);
 
@@ -284,7 +284,7 @@
 	return NULL;
 }
 
-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;
 
@@ -320,7 +320,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);
@@ -345,7 +345,7 @@
 	return get_zval_ptr_ptr(op, Ts, should_free, type);
 }
 
-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);