diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-11-28 10:33:03 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-11-28 10:33:03 +0300 |
| commit | 1da14c9f81084e3b740e2d2d770292386b95a38a (patch) | |
| tree | 7a49f4bb7875977f57b7d77c89a7275595f7c582 /Zend/zend_execute.h | |
| parent | 11384ba77b9ee58beff7a08d230ed277153bb8f4 (diff) | |
| download | php-git-1da14c9f81084e3b740e2d2d770292386b95a38a.tar.gz | |
Pack EX(frame_info) into EX(This).u1.v.reserved. Rename "frame"kind" into "call_kind" and VM_FRAME_... into ZEND_CALL_...
Diffstat (limited to 'Zend/zend_execute.h')
| -rw-r--r-- | Zend/zend_execute.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 0fca6c8a12..b1006fe2fd 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -209,7 +209,7 @@ static zend_always_inline zval* zend_vm_stack_alloc(size_t size TSRMLS_DC) return (zval*)top; } -static zend_always_inline zend_execute_data *zend_vm_stack_push_call_frame(uint32_t frame_info, zend_function *func, uint32_t num_args, zend_class_entry *called_scope, zend_object *object, zend_execute_data *prev TSRMLS_DC) +static zend_always_inline zend_execute_data *zend_vm_stack_push_call_frame(uint32_t call_info, zend_function *func, uint32_t num_args, zend_class_entry *called_scope, zend_object *object, zend_execute_data *prev TSRMLS_DC) { uint32_t used_stack = ZEND_CALL_FRAME_SLOT + num_args; zend_execute_data *call; @@ -219,11 +219,11 @@ static zend_always_inline zend_execute_data *zend_vm_stack_push_call_frame(uint3 } call = (zend_execute_data*)zend_vm_stack_alloc(used_stack * sizeof(zval) TSRMLS_CC); call->func = func; - ZVAL_OBJ(&call->This, object); + Z_OBJ(call->This) = object; + ZEND_SET_CALL_INFO(call, call_info); + ZEND_CALL_NUM_ARGS(call) = 0; call->called_scope = called_scope; call->prev_execute_data = prev; - call->frame_info = frame_info; - ZEND_CALL_NUM_ARGS(call) = 0; return call; } |