com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg into frames: phpdbg.c phpdbg.h phpdbg_prompt.c phpdbg_p rompt.h
| From: | Bob Weinand | Date: | Fri, 22 Nov 2013 17:32:00 +0000 |
| Subject: | com php-src: Merge branch 'master' of https://github.com/krakjoe/phpdbg into frames: phpdbg.c phpdbg.h phpdbg_prompt.c phpdbg_p rompt.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74713@lists.php.net to get a copy of this message | ||
Commit: c46a4136976fe3645e34b18659460dd495bc6088
Author: Bob Weinand <bobwei9@hotmail.com> Fri, 22 Nov 2013 18:32:00 +0100
Parents: 5b51fb40e91f3dd73854c22701c644124c0a16f8 022eb18d1de326fe5a5f8ea4c42b414c14d7ff7a
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c46a4136976fe3645e34b18659460dd495bc6088
Log:
Merge branch 'master' of https://github.com/krakjoe/phpdbg into frames
Conflicts:
phpdbg.h
phpdbg_prompt.c
Changed paths:
MM phpdbg.c
MM phpdbg.h
MM phpdbg_prompt.c
MM phpdbg_prompt.h
Diff:
diff --cc phpdbg.c
index 4b9d39b,f15f49f..235660f
--- a/phpdbg.c
+++ b/phpdbg.c
@@@ -44,8 -44,10 +44,11 @@@ static inline void php_phpdbg_globals_c
pg->lcmd = NULL;
pg->flags = PHPDBG_DEFAULT_FLAGS;
pg->oplog = NULL;
+ pg->io[PHPDBG_STDIN] = NULL;
+ pg->io[PHPDBG_STDOUT] = NULL;
+ pg->io[PHPDBG_STDERR] = NULL;
memset(&pg->lparam, 0, sizeof(phpdbg_param_t));
+ pg->frame.num = 0;
} /* }}} */
static PHP_MINIT_FUNCTION(phpdbg) /* {{{ */
diff --cc phpdbg.h
index 98c0070,aa6c7ca..3e25965
--- a/phpdbg.h
+++ b/phpdbg.h
@@@ -127,7 -132,7 +133,8 @@@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg
HashTable seek; /* seek oplines */
zend_ulong flags; /* phpdbg flags */
HashTable registered; /* registered */
+ phpdbg_frame frame; /* frame */
+ FILE *io[3]; /* stdin/stdout/stderr */
ZEND_END_MODULE_GLOBALS(phpdbg) /* }}} */
#endif /* PHPDBG_H */
diff --cc phpdbg_prompt.c
index 3a7ebac,fdd6044..27f0b73
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -32,10 -32,9 +32,10 @@@
#include "phpdbg_utils.h"
#include "phpdbg_prompt.h"
#include "phpdbg_cmd.h"
+#include "phpdbg_frame.h"
/* {{{ command declarations */
- static const phpdbg_command_t phpdbg_prompt_commands[] = {
+ const phpdbg_command_t phpdbg_prompt_commands[] = {
PHPDBG_COMMAND_D(exec, "set execution context", 'e',
NULL, 1),
PHPDBG_COMMAND_D(compile, "attempt compilation", 'c', NULL, 0),
PHPDBG_COMMAND_D(step, "step through execution", 's',
NULL, 1),