Merge branch 'master' of https://github.com/krakjoe/phpdbg

diff --cc phpdbg_bp.c
Simple merge

diff --cc phpdbg_prompt.c
index a5fa359290d75c539c9035f0d8f0c6dd15ee7d5f,fc559dd2df5021b36d00fd3fa426ea84c47c126b..3f88675357cc47bf975340eff6cb5559a117d82d
--- 1/phpdbg_prompt.c
--- 2/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -531,40 -359,24 +359,25 @@@ zend_vm_enter
                }
  #endif
  
 -        phpdbg_print_opline(execute_data TSRMLS_CC);
 -
          if (PHPDBG_G(has_file_bp)
-                       && phpdbg_breakpoint_file(execute_data->op_array TSRMLS_CC) == SUCCESS) {
+                       && phpdbg_find_breakpoint_file(execute_data->op_array TSRMLS_CC) == SUCCESS) {
                        while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
                                continue;
                        }
                }
  
-         if (PHPDBG_G(has_sym_bp)) {
-             zend_execute_data *previous = execute_data->prev_execute_data;
-             if (previous && (previous != execute_data)) {
-                 if (previous->opline) {
-                     if (previous->opline->opcode == ZEND_DO_FCALL || previous->opline->opcode == ZEND_DO_FCALL_BY_NAME) {
-                         if (phpdbg_breakpoint_symbol(previous->function_state.function TSRMLS_CC) == SUCCESS) {
-                             while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
-                                               continue;
-                                       }
-                         }
-                     }
-                 }
-             } else {
-                 if (execute_data->opline->opcode == ZEND_DO_FCALL || execute_data->opline->opcode == ZEND_DO_FCALL_BY_NAME) {
-                     if (phpdbg_breakpoint_symbol(execute_data->function_state.function TSRMLS_CC) == SUCCESS) {
-                         while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
-                                   continue;
-                           }
-                     }
-                 }
-             }
-         }
-         
 -              if (PHPDBG_G(has_sym_bp)
++        if (PHPDBG_G(has_sym_bp)
+                       && (execute_data->opline->opcode == ZEND_DO_FCALL || execute_data->opline->opcode == ZEND_DO_FCALL_BY_NAME)
+                       && phpdbg_find_breakpoint_symbol(execute_data->function_state.function TSRMLS_CC) == SUCCESS) {
+                       while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
+                               continue;
+                       }
+               }
 -
++              
                PHPDBG_G(vmret) = execute_data->opline->handler(execute_data TSRMLS_CC);
 +              
 +              phpdbg_print_opline(
 +                  execute_data TSRMLS_CC);
  
                if (PHPDBG_G(stepping)) {
                        while (phpdbg_interactive(