com php-src: - Moved conditional bp checking: phpdbg_bp.c phpdbg_prompt.c

From: Date: Sun, 24 Nov 2013 11:45:05 +0000
Subject: com php-src: - Moved conditional bp checking: phpdbg_bp.c phpdbg_prompt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74651@lists.php.net to get a copy of this message
Commit: 46c899ba3024546ee4e3acacacfa9bd32d61a226 Author: Felipe Pena <felipensp@gmail.com> Sun, 24 Nov 2013 09:45:05 -0200 Parents: 90ff693d6260c587041dc814310c9cb8639be643 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46c899ba3024546ee4e3acacacfa9bd32d61a226 Log: - Moved conditional bp checking Changed paths: M phpdbg_bp.c M phpdbg_prompt.c Diff: diff --git a/phpdbg_bp.c b/phpdbg_bp.c index 1a0452d..849b8de 100644 --- a/phpdbg_bp.c +++ b/phpdbg_bp.c @@ -449,6 +449,13 @@ int phpdbg_find_conditional_breakpoint(TSRMLS_D) /* {{{ */ int phpdbg_find_breakpoint(zend_execute_data* execute_data TSRMLS_DC) /* {{{ */ { + /* conditions cannot be executed by eval()'d code */ + if (!(PHPDBG_G(flags) & PHPDBG_IN_EVAL) + && (PHPDBG_G(flags) & PHPDBG_HAS_COND_BP) + && phpdbg_find_conditional_breakpoint(TSRMLS_C) == SUCCESS) { + return SUCCESS; + } + if (PHPDBG_G(flags) & PHPDBG_HAS_FILE_BP && phpdbg_find_breakpoint_file(execute_data->op_array TSRMLS_CC) == SUCCESS) { return SUCCESS; diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index 1eaaef7..5c276ab 100644 --- a/phpdbg_prompt..c +++ b/phpdbg_prompt.c @@ -1369,13 +1369,6 @@ zend_vm_enter: phpdbg_print_opline_ex( execute_data, &vars, 0 TSRMLS_CC); - /* conditions cannot be executed by eval()'d code */ - if (!(PHPDBG_G(flags) & PHPDBG_IN_EVAL) - && (PHPDBG_G(flags) & PHPDBG_HAS_COND_BP) - && phpdbg_find_conditional_breakpoint(TSRMLS_C) == SUCCESS) { - DO_INTERACTIVE(); - } - if (PHPDBG_G(flags) & PHPDBG_BP_MASK && phpdbg_find_breakpoint(execute_data TSRMLS_CC) == SUCCESS) { DO_INTERACTIVE();

« previous php.cvs (#74651) next »