diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-24 15:53:20 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-24 15:53:20 +0400 |
| commit | 65e2ed6e50d210adb50de47ef7ac3b75af069f62 (patch) | |
| tree | 1112548c6645313e7a9a04ad839614beeeed7fae /sapi/phpdbg/phpdbg_frame.c | |
| parent | d2e45b05c7734181ece641d8cb20f165c3122ddc (diff) | |
| download | php-git-65e2ed6e50d210adb50de47ef7ac3b75af069f62.tar.gz | |
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.
Diffstat (limited to 'sapi/phpdbg/phpdbg_frame.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_frame.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); |