Skip to content

Commit 4d6d0d8

Browse files
committed
improve print conditional breaks
1 parent 8f83506 commit 4d6d0d8

File tree

1 file changed

+41
-3
lines changed

1 file changed

+41
-3
lines changed

phpdbg_bp.c

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,9 +1069,47 @@ PHPDBG_API void phpdbg_print_breakpoints(zend_ulong type TSRMLS_DC) /* {{{ */
10691069
for (zend_hash_internal_pointer_reset_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position);
10701070
zend_hash_get_current_data_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], (void**) &brake, &position) == SUCCESS;
10711071
zend_hash_move_forward_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position)) {
1072-
phpdbg_writeln("#%d\t\t%s%s",
1073-
brake->id, brake->code,
1074-
((phpdbg_breakbase_t*)brake)->disabled ? " [disabled]" : "");
1072+
if (brake->paramed) {
1073+
switch (brake->param.type) {
1074+
case STR_PARAM:
1075+
phpdbg_writeln("#%d\t\tat %s if %s%s",
1076+
brake->id,
1077+
brake->param.str,
1078+
brake->code,
1079+
((phpdbg_breakbase_t*)brake)->disabled ? " [disabled]" : "");
1080+
break;
1081+
1082+
case METHOD_PARAM:
1083+
phpdbg_writeln("#%d\t\tat %s::%s if %s%s",
1084+
brake->id,
1085+
brake->param.method.class,
1086+
brake->param.method.name,
1087+
brake->code,
1088+
((phpdbg_breakbase_t*)brake)->disabled ? " [disabled]" : "");
1089+
break;
1090+
1091+
case FILE_PARAM:
1092+
phpdbg_writeln("#%d\t\tat %s:%lu if %s%s",
1093+
brake->id,
1094+
brake->param.file.name,
1095+
brake->param.file.line,
1096+
brake->code,
1097+
((phpdbg_breakbase_t*)brake)->disabled ? " [disabled]" : "");
1098+
break;
1099+
1100+
case ADDR_PARAM:
1101+
phpdbg_writeln("#%d\t\tat #%lx if %s%s",
1102+
brake->id,
1103+
brake->param.addr,
1104+
brake->code,
1105+
((phpdbg_breakbase_t*)brake)->disabled ? " [disabled]" : "");
1106+
break;
1107+
}
1108+
} else {
1109+
phpdbg_writeln("#%d\t\tif %s%s",
1110+
brake->id, brake->code,
1111+
((phpdbg_breakbase_t*)brake)->disabled ? " [disabled]" : "");
1112+
}
10751113
}
10761114
} break;
10771115

0 commit comments

Comments
 (0)