com php-src: change # for J/L: phpdbg_opcode.c phpdbg_p rint.c
| From: | Bob Weinand | Date: | Sun, 24 Nov 2013 21:34:25 +0000 |
| Subject: | com php-src: change # for J/L: phpdbg_opcode.c phpdbg_p rint.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74606@lists.php.net to get a copy of this message | ||
Commit: 99f32e845e5facb5f94a8620677e833dc845990d
Author: krakjoe <joe.watkins@live.co.uk> Sun, 24 Nov 2013 21:34:25 +0000
Parents: c41ef19c3b5365cab87fa0d9d871fc5328316fd5
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=99f32e845e5facb5f94a8620677e833dc845990d
Log:
change # for J/L
Changed paths:
M phpdbg_opcode.c
M phpdbg_print.c
Diff:
diff --git a/phpdbg_opcode.c b/phpdbg_opcode.c
index fc8bd9a..55816e7 100644
--- a/phpdbg_opcode.c
+++ b/phpdbg_opcode.c
@@ -84,13 +84,13 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM
#ifdef ZEND_FAST_CALL
case ZEND_FAST_CALL:
#endif
- asprintf(&decode[1], "#%lu", op->op1.jmp_addr - ops->opcodes);
+ asprintf(&decode[1], "J%lu", op->op1.jmp_addr - ops->opcodes);
goto format;
case ZEND_JMPZNZ:
decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC);
asprintf(
- &decode[2], "#%u or #%lu", op->op2.opline_num, op->extended_value);
+ &decode[2], "J%u or J%lu", op->op2.opline_num, op->extended_value);
goto result;
case ZEND_JMPZ:
@@ -106,7 +106,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM
#endif
decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC);
asprintf(
- &decode[2], "#%lu", op->op2.jmp_addr - ops->opcodes);
+ &decode[2], "J%lu", op->op2.jmp_addr - ops->opcodes);
goto result;
case ZEND_RECV_INIT:
@@ -152,7 +152,7 @@ void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, ze
(!(PHPDBG_G(flags) & PHPDBG_IS_QUIET) ||
(PHPDBG_G(flags) & PHPDBG_IS_STEPPING))) {
/* output line info */
- phpdbg_notice("#%-5u %16p %-30s %s %s",
+ phpdbg_notice("L%-5u %16p %-30s %s %s",
opline->lineno,
opline,
phpdbg_decode_opcode(opline->opcode),
@@ -161,7 +161,7 @@ void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, ze
}
if (!ignore_flags && PHPDBG_G(oplog)) {
- phpdbg_log_ex(PHPDBG_G(oplog), "#%-5u %16p %-30s %s %s",
+ phpdbg_log_ex(PHPDBG_G(oplog), "L%-5u %16p %-30s %s %s",
opline->lineno,
opline,
phpdbg_decode_opcode(opline->opcode),
diff --git a/phpdbg_print.c b/phpdbg_print.c
index 67a0f33..e4ee5f9 100644
--- a/phpdbg_print.c
+++ b/phpdbg_print.c
@@ -51,14 +51,14 @@ static inline void phpdbg_print_function_helper(zend_function *method TSRMLS_DC)
if (method->common.scope) {
phpdbg_writeln(
- "\t#%d-%d %s::%s() %s",
+ "\tL%d-%d %s::%s() %s",
op_array->line_start, op_array->line_end,
method->common.scope->name,
method->common.function_name,
op_array->filename ? op_array->filename : "unknown");
} else {
phpdbg_writeln(
- "\t#%d-%d %s() %s",
+ "\tL%d-%d %s() %s",
method->common.function_name ? op_array->line_start : 0,
method->common.function_name ? op_array->line_end : 0,
method->common.function_name ? method->common.function_name :
"{main}",
@@ -70,7 +70,7 @@ static inline void phpdbg_print_function_helper(zend_function *method TSRMLS_DC)
char *decode = phpdbg_decode_opline(op_array, opline, &vars TSRMLS_CC);
if (decode != NULL) {
phpdbg_writeln(
- "\t\t#%u\t%p %-30s %s",
+ "\t\tL%u\t%p %-30s %s",
opline->lineno,
opline,
phpdbg_decode_opcode(opline->opcode),