com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg: phpdbg.h phpdbg_help.c phpdbg_prompt.c phpdbg_set .c phpdbg_set.h
| From: | Bob Weinand | Date: | Sun, 20 Apr 2014 17:55:44 +0000 |
| Subject: | com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg: phpdbg.h phpdbg_help.c phpdbg_prompt.c phpdbg_set .c phpdbg_set.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76968@lists.php.net to get a copy of this message | ||
Commit: 422dc49c0d02f8ff8903d42a91bf8a1316d62211
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 20 Apr 2014 19:55:44 +0200
Parents: 56293fc0dd288f1c1a68880b6055f2eca8dad0e2 373b9ecd05e5c88fd224e9a081680e1109dbb4ed
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=422dc49c0d02f8ff8903d42a91bf8a1316d62211
Log:
Merge branch 'master' of https://github.com/krakjoe/phpdbg
Conflicts:
phpdbg_help.c
phpdbg_prompt.c
Changed paths:
MM phpdbg.h
MM phpdbg_help.c
MM phpdbg_prompt.c
MM phpdbg_set.c
MM phpdbg_set.h
Diff:
diff --cc phpdbg.h
index 615af57,43f26ca..81a81da
--- a/phpdbg.h
+++ b/phpdbg.h
@@@ -121,25 -121,25 +121,26 @@@
#define PHPDBG_IN_EVAL (1<<11)
#define PHPDBG_IS_STEPPING (1<<12)
--#define PHPDBG_IS_QUIET (1<<13)
--#define PHPDBG_IS_QUITTING (1<<14)
--#define PHPDBG_IS_COLOURED (1<<15)
--#define PHPDBG_IS_CLEANING (1<<16)
--
--#define PHPDBG_IN_UNTIL (1<<17)
--#define PHPDBG_IN_FINISH (1<<18)
--#define PHPDBG_IN_LEAVE (1<<19)
--
--#define PHPDBG_IS_REGISTERED (1<<20)
--#define PHPDBG_IS_STEPONEVAL (1<<21)
--#define PHPDBG_IS_INITIALIZING (1<<22)
--#define PHPDBG_IS_SIGNALED (1<<23)
--#define PHPDBG_IS_INTERACTIVE (1<<24)
--#define PHPDBG_IS_BP_ENABLED (1<<25)
--#define PHPDBG_IS_REMOTE (1<<26)
--#define PHPDBG_IS_DISCONNECTED (1<<27)
--
--#define PHPDBG_SHOW_REFCOUNTS (1<<28)
++#define PHPDBG_IS_OPLINE_STEPPING (1<<13)
++#define PHPDBG_IS_QUIET (1<<14)
++#define PHPDBG_IS_QUITTING (1<<15)
++#define PHPDBG_IS_COLOURED (1<<16)
++#define PHPDBG_IS_CLEANING (1<<17)
++
++#define PHPDBG_IN_UNTIL (1<<18)
++#define PHPDBG_IN_FINISH (1<<19)
++#define PHPDBG_IN_LEAVE (1<<20)
++
++#define PHPDBG_IS_REGISTERED (1<<21)
++#define PHPDBG_IS_STEPONEVAL (1<<22)
++#define PHPDBG_IS_INITIALIZING (1<<23)
++#define PHPDBG_IS_SIGNALED (1<<24)
++#define PHPDBG_IS_INTERACTIVE (1<<25)
++#define PHPDBG_IS_BP_ENABLED (1<<26)
++#define PHPDBG_IS_REMOTE (1<<27)
++#define PHPDBG_IS_DISCONNECTED (1<<28)
++
++#define PHPDBG_SHOW_REFCOUNTS (1<<29)
#define PHPDBG_SEEK_MASK (PHPDBG_IN_UNTIL|PHPDBG_IN_FINISH|PHPDBG_IN_LEAVE)
#define PHPDBG_BP_RESOLVE_MASK
(PHPDBG_HAS_FUNCTION_OPLINE_BP|PHPDBG_HAS_METHOD_OPLINE_BP|PHPDBG_HAS_FILE_OPLINE_BP)
diff --cc phpdbg_help.c
index a00f445,4866f1e..74c59df
--- a/phpdbg_help.c
+++ b/phpdbg_help.c
@@@ -325,8 -325,7 +325,8 @@@ phpdbg_help_text_t phpdbg_help_text[]
"**Starting and Stopping Execution**" CR
" **exec** set execution context" CR
" **run** attempt execution" CR
+" **step** continue execution until other line is reached" CR
- " **next** continue execution" CR
+ " **continue** continue execution" CR
" **until** continue execution up to the given location" CR
" **finish** continue up to end of the current execution frame" CR
" **leave** continue up to end of the current execution frame and halt after the calling
instruction" CR
@@@ -807,6 -805,6 +806,7 @@@
" **break** **b** set break **id** <on|off>" CR
" **breaks** **B** set breaks <on|off>" CR
" **quiet** **q** set quiet <on|off>" CR
++" **step** **s** step opcode-by-opcode <on|off>" CR
" **refcount** **r** set refcount <on|off> (refcount display upon hit
watchpoint)" CR CR
"Valid colors are **none**, **white**, **red**, **green**, **yellow**, **blue**, **purple**,
"
diff --cc phpdbg_prompt.c
index 6eb7481,1b1cb25..fe2d717
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -43,8 -43,8 +43,8 @@@ int yyparse(phpdbg_param_t *stack, yysc
/* {{{ command declarations */
const phpdbg_command_t phpdbg_prompt_commands[] = {
PHPDBG_COMMAND_D(exec, "set execution context", 'e',
NULL, "s"),
- PHPDBG_COMMAND_D(step, "step through execution", 's',
NULL, "b"),
+ PHPDBG_COMMAND_D(step, "step through execution", 's',
NULL, 0),
- PHPDBG_COMMAND_D(next, "continue execution", 'n',
NULL, 0),
+ PHPDBG_COMMAND_D(continue,"continue execution", 'c',
NULL, 0),
PHPDBG_COMMAND_D(run, "attempt execution", 'r',
NULL, "|s"),
PHPDBG_COMMAND_D(ev, "evaluate some code", 0, NULL,
"i"),
PHPDBG_COMMAND_D(until, "continue past the current line", 'u',
NULL, 0),
@@@ -424,12 -421,19 +424,12 @@@ int phpdbg_compile(TSRMLS_D) /* {{{ *
PHPDBG_COMMAND(step) /* {{{ */
{
- if (param->num) {
- PHPDBG_G(flags) |= PHPDBG_IS_STEPPING;
- } else {
- PHPDBG_G(flags) &= ~PHPDBG_IS_STEPPING;
- }
-
- phpdbg_notice("Stepping %s",
- (PHPDBG_G(flags) & PHPDBG_IS_STEPPING) ? "on" : "off");
+ PHPDBG_G(flags) |= PHPDBG_IS_STEPPING;
- return SUCCESS;
+ return PHPDBG_NEXT;
} /* }}} */
- PHPDBG_COMMAND(next) /* {{{ */
+ PHPDBG_COMMAND(continue) /* {{{ */
{
return PHPDBG_NEXT;
} /* }}} */
diff --cc phpdbg_set.c
index aeb8826,aeb8826..888da8f
--- a/phpdbg_set.c
+++ b/phpdbg_set.c
@@@ -36,6 -36,6 +36,7 @@@ const phpdbg_command_t phpdbg_set_comma
PHPDBG_SET_COMMAND_D(color, "usage: set color <element> <color>",
'c', set_color, NULL, "ss"),
PHPDBG_SET_COMMAND_D(colors, "usage: set colors [<on|off>]",
'C', set_colors, NULL, "|b"),
#endif
++ PHPDBG_SET_COMMAND_D(step, "usage: set oplog [<on|off]",
's', set_step, NULL, "|b"),
PHPDBG_SET_COMMAND_D(oplog, "usage: set oplog [<output>]",
'O', set_oplog, NULL, "|s"),
PHPDBG_SET_COMMAND_D(break, "usage: set break id [<on|off>]",
'b', set_break, NULL, "l|b"),
PHPDBG_SET_COMMAND_D(breaks, "usage: set breaks [<on|off>]",
'B', set_breaks, NULL, "|b"),
@@@ -100,6 -100,6 +101,20 @@@ PHPDBG_SET(breaks) /* {{{ *
return SUCCESS;
} /* }}} */
++PHPDBG_SET(step) /* {{{ */
++{
++ if (param->num) {
++ PHPDBG_G(flags) |= PHPDBG_IS_OPLINE_STEPPING;
++ } else {
++ PHPDBG_G(flags) &= ~PHPDBG_IS_OPLINE_STEPPING;
++ }
++
++ phpdbg_notice("Stepping opcode-by-opcode %s",
++ (PHPDBG_G(flags) & PHPDBG_IS_STEPPING) ? "on" : "off");
++
++ return SUCCESS;
++} /* }}} */
++
#ifndef _WIN32
PHPDBG_SET(color) /* {{{ */
{
diff --cc phpdbg_set.h
index 67bf4cd,67bf4cd..555a91f
--- a/phpdbg_set.h
+++ b/phpdbg_set.h
@@@ -26,6 -26,6 +26,7 @@@
#define PHPDBG_SET(name) PHPDBG_COMMAND(set_##name)
PHPDBG_SET(prompt);
++PHPDBG_SET(step);
#ifndef _WIN32
PHPDBG_SET(color);
PHPDBG_SET(colors);