From 8b2bb3013733fd465f8dbe24ffac8418e737463b Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 7 Apr 2014 10:57:58 +0400 Subject: [PATCH] Use macros --- Zend/zend_execute.h | 5 +++++ Zend/zend_vm_def.h | 6 ++---- Zend/zend_vm_execute.h | 12 ++++-------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 67bce39748..34df179780 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -220,6 +220,11 @@ static zend_always_inline zval *zend_vm_stack_top(TSRMLS_D) return EG(argument_stack)->top; } +static zend_always_inline zval *zend_vm_stack_top_inc(TSRMLS_D) +{ + return EG(argument_stack)->top++; +} + static zend_always_inline void zend_vm_stack_push(zval *ptr TSRMLS_DC) { ZVAL_COPY_VALUE(EG(argument_stack)->top, ptr); diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index e03950634d..27c2ecf07e 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2941,8 +2941,7 @@ ZEND_VM_HANDLER(65, ZEND_SEND_VAL, CONST|TMP, ANY) zend_free_op free_op1; value = GET_OP1_ZVAL_PTR(BP_VAR_R); - top = EG(argument_stack)->top; - EG(argument_stack)->top++; + top = zend_vm_stack_top_inc(TSRMLS_C); ZVAL_COPY_VALUE(top, value); if (!IS_OP1_TMP_FREE()) { zval_opt_copy_ctor(top); @@ -2960,8 +2959,7 @@ ZEND_VM_HELPER(zend_send_by_var_helper, VAR|CV, ANY) zend_free_op free_op1; varptr = GET_OP1_ZVAL_PTR(BP_VAR_R); - top = EG(argument_stack)->top; - EG(argument_stack)->top++; + top = zend_vm_stack_top_inc(TSRMLS_C); if (Z_ISREF_P(varptr)) { //??? if (OP1_TYPE == IS_CV || //??? (OP1_TYPE == IS_VAR && Z_REFCOUNT_P(varptr) > 2)) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 8a6faab932..433fd5afc4 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2670,8 +2670,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A value = opline->op1.zv; - top = EG(argument_stack)->top; - EG(argument_stack)->top++; + top = zend_vm_stack_top_inc(TSRMLS_C); ZVAL_COPY_VALUE(top, value); if (!0) { zval_opt_copy_ctor(top); @@ -7726,8 +7725,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_free_op free_op1; value = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); - top = EG(argument_stack)->top; - EG(argument_stack)->top++; + top = zend_vm_stack_top_inc(TSRMLS_C); ZVAL_COPY_VALUE(top, value); if (!1) { zval_opt_copy_ctor(top); @@ -12691,8 +12689,7 @@ static int ZEND_FASTCALL zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_AR zend_free_op free_op1; varptr = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); - top = EG(argument_stack)->top; - EG(argument_stack)->top++; + top = zend_vm_stack_top_inc(TSRMLS_C); if (Z_ISREF_P(varptr)) { //??? if (IS_VAR == IS_CV || //??? (IS_VAR == IS_VAR && Z_REFCOUNT_P(varptr) > 2)) { @@ -29279,8 +29276,7 @@ static int ZEND_FASTCALL zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARG varptr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC); - top = EG(argument_stack)->top; - EG(argument_stack)->top++; + top = zend_vm_stack_top_inc(TSRMLS_C); if (Z_ISREF_P(varptr)) { //??? if (IS_CV == IS_CV || //??? (IS_CV == IS_VAR && Z_REFCOUNT_P(varptr) > 2)) { -- 2.40.0