com php-src: Fixed stepping: phpdbg.h phpdbg_help.c phpdb g_prompt.c
| From: | Bob Weinand | Date: | Sun, 20 Apr 2014 18:20:59 +0000 |
| Subject: | com php-src: Fixed stepping: phpdbg.h phpdbg_help.c phpdb g_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76969@lists.php.net to get a copy of this message | ||
Commit: 577c6ed0ce9983967622d8b7086dab0a4978a148
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 20 Apr 2014 20:20:59 +0200
Parents: 422dc49c0d02f8ff8903d42a91bf8a1316d62211 f96feea00c112bc1bec3e7b677218f4b487d1152
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=577c6ed0ce9983967622d8b7086dab0a4978a148
Log:
Fixed stepping
Changed paths:
MM phpdbg.h
MM phpdbg_help.c
MM phpdbg_prompt.c
Diff:
diff --cc phpdbg.h
index 81a81da,c24c5ea..d25e0be
--- a/phpdbg.h
+++ b/phpdbg.h
@@@ -121,26 -121,26 +121,26 @@@
#define PHPDBG_IN_EVAL (1<<11)
#define PHPDBG_IS_STEPPING (1<<12)
- #define PHPDBG_IS_OPLINE_STEPPING (1<<13)
-#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_STEP_OPCODE (1<<29)
++#define PHPDBG_STEP_OPCODE (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_prompt.c
index fe2d717,b8df289..d93b553
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -1307,11 -1312,6 +1307,11 @@@ zend_vm_enter
phpdbg_print_opline_ex(
execute_data, &vars, 0 TSRMLS_CC);
- if (PHPDBG_G(flags) & PHPDBG_IS_STEPPING && execute_data->opline->lineno !=
PHPDBG_G(last_line)) {
++ if (PHPDBG_G(flags) & PHPDBG_IS_STEPPING && (PHPDBG_G(flags) &
PHPDBG_STEP_OPCODE || execute_data->opline->lineno != PHPDBG_G(last_line))) {
+ PHPDBG_G(flags) &= ~PHPDBG_IS_STEPPING;
+ DO_INTERACTIVE();
+ }
+
/* check if some watchpoint was hit */
{
if (phpdbg_print_changed_zvals(TSRMLS_C) == SUCCESS) {