Rename EX_VAR_2() into ZEND_CALL_VAR() and EX_VAR_NUM_2() into ZEND_CALL_VAR_NUM().

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 2aff386fb6044b17589050faafe3a98340e49a6b..e95276d4c80a265778b08328b196c2c9f82fad86 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -4127,7 +4127,7 @@ ZEND_API void zend_ctor_make_null(zend_execute_data *execute_data) /* {{{ */
                                if (ex->func) {
                                        if (ZEND_USER_CODE(ex->func->type)) {
                                                if (ex->func->op_array.this_var != -1) {
-                                                       zval *this_var = EX_VAR_2(ex, ex->func->op_array.this_var);
+                                                       zval *this_var = ZEND_CALL_VAR(ex, ex->func->op_array.this_var);
                                                        if (this_var != EX(return_value)) {
                                                                zval_ptr_dtor(this_var);
                                                                ZVAL_NULL(this_var);

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 4a435b2ab061e00e25cb84b4bcb8627bb15c33f4..fcf2420ac6139ebc0fe388058bb4730d8ef85256 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -447,7 +447,7 @@ ZEND_FUNCTION(func_get_arg)
                first_extra_arg--;
        }
        if (requested_offset >= first_extra_arg && (ZEND_CALL_NUM_ARGS(ex) > first_extra_arg)) {
-               arg = EX_VAR_NUM_2(ex, ex->func->op_array.last_var + ex->func->op_array.T) + (requested_offset - first_extra_arg);
+               arg = ZEND_CALL_VAR_NUM(ex, ex->func->op_array.last_var + ex->func->op_array.T) + (requested_offset - first_extra_arg);
        } else {
                arg = ZEND_CALL_ARG(ex, requested_offset + 1);
        }
@@ -496,7 +496,7 @@ ZEND_FUNCTION(func_get_args)
                                q++;
                                i++;
                        }
-                       p = EX_VAR_NUM_2(ex, ex->func->op_array.last_var + ex->func->op_array.T);
+                       p = ZEND_CALL_VAR_NUM(ex, ex->func->op_array.last_var + ex->func->op_array.T);
                }
                while (i < arg_count) {
                        q->h = i;
@@ -2070,7 +2070,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array TS
                                        p++;
                                        i++;
                                }
-                               p = EX_VAR_NUM_2(call, call->func->op_array.last_var + call->func->op_array.T);
+                               p = ZEND_CALL_VAR_NUM(call, call->func->op_array.last_var + call->func->op_array.T);
                        }
                }
 

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 4f373e6e73e214496f24dc5b21391b41fd6dcdff..77f1722117964bc99237a72040c7b569f78c08f9 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -273,7 +273,7 @@ static int lookup_cv(zend_op_array *op_array, zend_string* name TSRMLS_DC) /* {{
                     op_array->vars[i]->len == name->len &&
                     memcmp(op_array->vars[i]->val, name->val, name->len) == 0)) {
                        zend_string_release(name);
-                       return (int)(zend_intptr_t)EX_VAR_NUM_2(NULL, i);
+                       return (int)(zend_intptr_t)ZEND_CALL_VAR_NUM(NULL, i);
                }
                i++;
        }
@@ -285,7 +285,7 @@ static int lookup_cv(zend_op_array *op_array, zend_string* name TSRMLS_DC) /* {{
        }
 
        op_array->vars[i] = zend_new_interned_string(name TSRMLS_CC);
-       return (int)(zend_intptr_t)EX_VAR_NUM_2(NULL, i);
+       return (int)(zend_intptr_t)ZEND_CALL_VAR_NUM(NULL, i);
 }
 /* }}} */
 

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 71dd5d1b263d6aa7950c80bd45d495f8d8f17dbc..a885518caf78be12fdd0262739307f8530109b9b 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -403,8 +403,14 @@ struct _zend_execute_data {
 #define ZEND_CALL_FRAME_SLOT \
        ((ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data)) + ZEND_MM_ALIGNED_SIZE(sizeof(zval)) - 1) / ZEND_MM_ALIGNED_SIZE(sizeof(zval)))
 
+#define ZEND_CALL_VAR(call, n) \
+       ((zval*)(((char*)(call)) + ((int)(n))))
+
+#define ZEND_CALL_VAR_NUM(call, n) \
+       (((zval*)(call)) + (ZEND_CALL_FRAME_SLOT + ((int)(n))))
+
 #define ZEND_CALL_ARG(call, n) \
-       (((zval*)(call)) + ((n) + (ZEND_CALL_FRAME_SLOT - 1)))
+       ZEND_CALL_VAR_NUM(call, ((int)(n)) - 1)
 
 #define EX(element)                    ((execute_data)->element)
 
@@ -412,13 +418,10 @@ struct _zend_execute_data {
 #define EX_CALL_KIND()                 ZEND_CALL_KIND(execute_data)
 #define EX_NUM_ARGS()                  ZEND_CALL_NUM_ARGS(execute_data)
 
-#define EX_VAR_2(ex, n)                        ((zval*)(((char*)(ex)) + ((int)(n))))
-#define EX_VAR_NUM_2(ex, n)     (((zval*)(ex)) + (ZEND_CALL_FRAME_SLOT + ((int)(n))))
-
-#define EX_VAR(n)                              EX_VAR_2(execute_data, n)
-#define EX_VAR_NUM(n)                  EX_VAR_NUM_2(execute_data, n)
+#define EX_VAR(n)                              ZEND_CALL_VAR(execute_data, n)
+#define EX_VAR_NUM(n)                  ZEND_CALL_VAR_NUM(execute_data, n)
 
-#define EX_VAR_TO_NUM(n)               (EX_VAR_2(NULL, n) - EX_VAR_NUM_2(NULL, 0))
+#define EX_VAR_TO_NUM(n)               (ZEND_CALL_VAR(NULL, n) - ZEND_CALL_VAR_NUM(NULL, 0))
 
 #define IS_CONST       (1<<0)
 #define IS_TMP_VAR     (1<<1)

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index b1006fe2fd28d052e8ae2d177e2643203b70ba56..ddd736c07e476943a516b66d2705e8f2fe876810 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -232,7 +232,7 @@ static zend_always_inline void zend_vm_stack_free_extra_args(zend_execute_data *
        uint32_t first_extra_arg = call->func->op_array.num_args - ((call->func->common.fn_flags & ZEND_ACC_VARIADIC) != 0);
 
        if (UNEXPECTED(ZEND_CALL_NUM_ARGS(call) > first_extra_arg)) {
-               zval *end = EX_VAR_NUM_2(call, call->func->op_array.last_var + call->func->op_array.T);
+               zval *end = ZEND_CALL_VAR_NUM(call, call->func->op_array.last_var + call->func->op_array.T);
                zval *p = end + (ZEND_CALL_NUM_ARGS(call) - first_extra_arg);
                do {
                        p--;

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 286858f688eea71f1cf9042b35f2e409ff892da6..7d5af4e9aa15088d436a95f0efd8a226147efe18 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1532,7 +1532,7 @@ ZEND_API zend_array *zend_rebuild_symbol_table(TSRMLS_D) /* {{{ */
        for (i = 0; i < ex->func->op_array.last_var; i++) {
                zval zv;
 
-               ZVAL_INDIRECT(&zv, EX_VAR_NUM_2(ex, i));
+               ZVAL_INDIRECT(&zv, ZEND_CALL_VAR_NUM(ex, i));
                zend_hash_add_new(&symbol_table->ht,
                        ex->func->op_array.vars[i], &zv);
        }

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index cd2c60ae5633f43484cfe512300d52723532e2af..3d95cde44da09cf6cd78133e40930b08e2f4772b 100644 (file)
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -58,7 +58,7 @@ static void zend_generator_cleanup_unfinished_execution(zend_generator *generato
                                zend_op *brk_opline = op_array->opcodes + brk_cont->brk;
 
                                if (brk_opline->opcode == ZEND_FREE) {
-                                       zval *var = EX_VAR_2(execute_data, brk_opline->op1.var);
+                                       zval *var = EX_VAR(brk_opline->op1.var);
                                        zval_ptr_dtor_nogc(var);
                                }
                        }
@@ -163,7 +163,7 @@ static void zend_generator_dtor_storage(zend_object *object TSRMLS_DC) /* {{{ */
        /* If a finally block was found we jump directly to it and
         * resume the generator. */
        if (finally_op_num) {
-               zval *fast_call = EX_VAR_2(ex, ex->func->op_array.opcodes[finally_op_end].op1.var);
+               zval *fast_call = ZEND_CALL_VAR(ex, ex->func->op_array.opcodes[finally_op_end].op1.var);
 
                fast_call->u2.lineno = (uint32_t)-1;
                ex->opline = &ex->func->op_array.opcodes[finally_op_num];

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 1bbd35f40fadaa834a83511ce8ff6f9cef8a341a..59e62149f2cd191b02cc4a6c9c6cef0785e41b40 100644 (file)
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -719,20 +719,20 @@ ZEND_API int pass_two(zend_op_array *op_array TSRMLS_DC)
                if (opline->op1_type == IS_CONST) {
                        opline->op1.zv = &op_array->literals[opline->op1.constant];
                } else if (opline->op1_type & (IS_VAR|IS_TMP_VAR)) {
-                       opline->op1.var = (uint32_t)(zend_intptr_t)EX_VAR_NUM_2(NULL, op_array->last_var + opline->op1.var);
+                       opline->op1.var = (uint32_t)(zend_intptr_t)ZEND_CALL_VAR_NUM(NULL, op_array->last_var + opline->op1.var);
                }
                if (opline->op2_type == IS_CONST) {
                        opline->op2.zv = &op_array->literals[opline->op2.constant];
                } else if (opline->op2_type & (IS_VAR|IS_TMP_VAR)) {
-                       opline->op2.var = (uint32_t)(zend_intptr_t)EX_VAR_NUM_2(NULL, op_array->last_var + opline->op2.var);
+                       opline->op2.var = (uint32_t)(zend_intptr_t)ZEND_CALL_VAR_NUM(NULL, op_array->last_var + opline->op2.var);
                }
                if (opline->result_type & (IS_VAR|IS_TMP_VAR)) {
-                       opline->result.var = (uint32_t)(zend_intptr_t)EX_VAR_NUM_2(NULL, op_array->last_var + opline->result.var);
+                       opline->result.var = (uint32_t)(zend_intptr_t)ZEND_CALL_VAR_NUM(NULL, op_array->last_var + opline->result.var);
                }
                switch (opline->opcode) {
                        case ZEND_DECLARE_INHERITED_CLASS:
                        case ZEND_DECLARE_INHERITED_CLASS_DELAYED:
-                               opline->extended_value = (uint32_t)(zend_intptr_t)EX_VAR_NUM_2(NULL, op_array->last_var + opline->extended_value);
+                               opline->extended_value = (uint32_t)(zend_intptr_t)ZEND_CALL_VAR_NUM(NULL, op_array->last_var + opline->extended_value);
                                break;
                        case ZEND_GOTO:
                                if (Z_TYPE_P(opline->op2.zv) != IS_LONG) {

diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index 589028368f1988f67f355da3c4c22b660933fdf8..32009791edd6d129220bfa3ac82d39315fbbf0da 100644 (file)
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -65,7 +65,7 @@ int zend_optimizer_lookup_cv(zend_op_array *op_array, zend_string* name)
                    (op_array->vars[i]->h == hash_value &&
                     op_array->vars[i]->len == name->len &&
                     memcmp(op_array->vars[i]->val, name->val, name->len) == 0)) {
-                       return (int)(zend_intptr_t)EX_VAR_NUM_2(NULL, i);
+                       return (int)(zend_intptr_t)ZEND_CALL_VAR_NUM(NULL, i);
                }
                i++;
        }
@@ -96,7 +96,7 @@ int zend_optimizer_lookup_cv(zend_op_array *op_array, zend_string* name)
                }
        }
        
-       return (int)(zend_intptr_t)EX_VAR_NUM_2(NULL, i);
+       return (int)(zend_intptr_t)ZEND_CALL_VAR_NUM(NULL, i);
 }
 
 int zend_optimizer_add_literal(zend_op_array *op_array, zval *zv TSRMLS_DC)

diff --git a/ext/opcache/Optimizer/zend_optimizer_internal.h b/ext/opcache/Optimizer/zend_optimizer_internal.h
index ba91b147c9f404442464a317f6a0406db75d986d..ee44bf671c4d4fa2efb3b77795060d4bc1a15403 100644 (file)
--- a/ext/opcache/Optimizer/zend_optimizer_internal.h
+++ b/ext/opcache/Optimizer/zend_optimizer_internal.h
@@ -25,7 +25,7 @@
 #include "ZendAccelerator.h"
 
 #define VAR_NUM(v) EX_VAR_TO_NUM(v)
-#define NUM_VAR(v) ((uint32_t)(zend_uintptr_t)EX_VAR_NUM_2(0, v))
+#define NUM_VAR(v) ((uint32_t)(zend_uintptr_t)ZEND_CALL_VAR_NUM(0, v))
 
 #define INV_COND(op)       ((op) == ZEND_JMPZ    ? ZEND_JMPNZ    : ZEND_JMPZ)
 #define INV_EX_COND(op)    ((op) == ZEND_JMPZ_EX ? ZEND_JMPNZ    : ZEND_JMPZ)