From 65e2ed6e50d210adb50de47ef7ac3b75af069f62 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 24 Apr 2014 15:53:20 +0400 Subject: Redesigned zend_execute_data layout now EX(object), EX(scope) and EX(called_scope) arr properties of the current function execution co ntext. They are set during zend_execute_data initialization and never changed. --- sapi/phpdbg/phpdbg_frame.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sapi/phpdbg/phpdbg_frame.c') diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c index 965e9bc2e2..2c2d9e6177 100644 --- a/sapi/phpdbg/phpdbg_frame.c +++ b/sapi/phpdbg/phpdbg_frame.c @@ -40,9 +40,9 @@ void phpdbg_restore_frame(TSRMLS_D) /* {{{ */ EG(opline_ptr) = &PHPDBG_EX(opline); EG(active_op_array) = PHPDBG_EX(op_array); EG(active_symbol_table) = PHPDBG_EX(symbol_table); - Z_OBJ(EG(This)) = PHPDBG_EX(current_this); - EG(scope) = PHPDBG_EX(current_scope); - EG(called_scope) = PHPDBG_EX(current_called_scope); + Z_OBJ(EG(This)) = PHPDBG_EX(object); + EG(scope) = PHPDBG_EX(scope); + EG(called_scope) = PHPDBG_EX(called_scope); } /* }}} */ void phpdbg_switch_frame(int frame TSRMLS_DC) /* {{{ */ @@ -82,9 +82,9 @@ void phpdbg_switch_frame(int frame TSRMLS_DC) /* {{{ */ EG(opline_ptr) = &PHPDBG_EX(opline); EG(active_op_array) = PHPDBG_EX(op_array); EG(active_symbol_table) = PHPDBG_EX(symbol_table); - Z_OBJ(EG(This)) = PHPDBG_EX(current_this); - EG(scope) = PHPDBG_EX(current_scope); - EG(called_scope) = PHPDBG_EX(current_called_scope); + Z_OBJ(EG(This)) = PHPDBG_EX(object); + EG(scope) = PHPDBG_EX(scope); + EG(called_scope) = PHPDBG_EX(called_scope); } phpdbg_notice("Switched to frame #%d", frame); -- cgit v1.2.1