mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-30 13:25:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Renamed breakpoint find functions

Browse Source
This commit is contained in:
Felipe Pena 2013-11-10 18:06:19 -02:00
parent 20f37407e1
commit 5b6982796d
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpdbg_bp.c
View File

@ -103,7 +103,7 @@ void phpdbg_set_breakpoint_symbol(const char *expr, const char *opline_num_pos T
zend_llist_add_element(break_sym_ptr, &new_break);
} /* }}} */
int phpdbg_breakpoint_file(zend_op_array *op_array TSRMLS_DC) /* {{{ */
int phpdbg_find_breakpoint_file(zend_op_array *op_array TSRMLS_DC) /* {{{ */
{
size_t name_len = strlen(op_array->filename);
zend_llist *break_list;
@ -126,7 +126,7 @@ int phpdbg_breakpoint_file(zend_op_array *op_array TSRMLS_DC) /* {{{ */
return FAILURE;
} /* }}} */
int phpdbg_breakpoint_symbol(zend_function *fbc TSRMLS_DC) /* {{{ */
int phpdbg_find_breakpoint_symbol(zend_function *fbc TSRMLS_DC) /* {{{ */
{
const char *fname;
zend_llist *break_list;

3
phpdbg_bp.h
View File

@ -41,4 +41,7 @@ typedef struct _phpdbg_breaksymbol_t {
void phpdbg_set_breakpoint_file(const char*, const char* TSRMLS_DC);
void phpdbg_set_breakpoint_symbol(const char*, const char* TSRMLS_DC);
int phpdbg_find_breakpoint_file(zend_op_array* TSRMLS_DC);
int phpdbg_find_breakpoint_symbol(zend_function* TSRMLS_DC);
#endif /* PHPDBG_BP_H */

9
phpdbg_prompt.c
View File

@ -254,7 +254,7 @@ static PHPDBG_COMMAND(help) /* {{{ */
++help_command;
}
} else {
if (phpdbg_do_cmd(phpdbg_help_commands, expr, expr_len TSRMLS_CC) == FAILURE) {
if (phpdbg_do_cmd(phpdbg_help_commands, (char*)expr, expr_len TSRMLS_CC) == FAILURE) {
printf("failed to find help command: %s\n", expr);
}
}
@ -334,7 +334,8 @@ int phpdbg_interactive(int argc, char **argv TSRMLS_DC) /* {{{ */
return SUCCESS;
} /* }}} */
static void phpdbg_print_opline(zend_execute_data *execute_data TSRMLS_DC) { /* {{{ */
static void phpdbg_print_opline(zend_execute_data *execute_data TSRMLS_DC) /* {{{ */
{
zend_op *opline = execute_data->opline;
printf("[OPLINE: %p:%s]\n", opline, phpdbg_decode_opcode(opline->opcode));
@ -361,7 +362,7 @@ zend_vm_enter:
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;
}
@ -369,7 +370,7 @@ zend_vm_enter:
if (PHPDBG_G(has_sym_bp)
&& (execute_data->opline->opcode == ZEND_DO_FCALL || execute_data->opline->opcode == ZEND_DO_FCALL_BY_NAME)
&& phpdbg_breakpoint_symbol(execute_data->function_state.function TSRMLS_CC) == SUCCESS) {
&& phpdbg_find_breakpoint_symbol(execute_data->function_state.function TSRMLS_CC) == SUCCESS) {
while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
continue;
}