Add -e (ZEND_EXT_* generation) option to phpdbg

diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index d594601f2901fdbbb7c749c73fb119b4bfa33abd..83425fe531a41edb80bd68cc2d40798dd83710e1 100644 (file)
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -966,6 +966,7 @@ const opt_struct OPTIONS[] = { /* {{{ */
        {'I', 0, "ignore init"},
        {'O', 1, "opline log"},
        {'r', 0, "run"},
+       {'e', 0, "generate ext_stmt opcodes"},
        {'E', 0, "step-through-eval"},
        {'S', 1, "sapi-name"},
 #ifndef _WIN32
@@ -1242,6 +1243,7 @@ int main(int argc, char **argv) /* {{{ */
        int socket = -1;
        FILE* stream = NULL;
        char *print_opline_func;
+       zend_bool ext_stmt = 0;
 
 #ifdef ZTS
        void ***tsrm_ls;
@@ -1382,6 +1384,10 @@ phpdbg_main:
                                flags &= ~PHPDBG_IS_QUIET;
                        break;
 
+                       case 'e':
+                               ext_stmt = 1;
+                       break;
+
                        case 'E': /* stepping through eval on */
                                flags |= PHPDBG_IS_STEPONEVAL;
                        break;
@@ -1693,6 +1699,10 @@ phpdbg_main:
 
                cleaning = -1;
 
+               if (ext_stmt) {
+                       CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
+               }
+
                /* initialize from file */
                PHPDBG_G(flags) |= PHPDBG_IS_INITIALIZING;
                zend_try {

diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c
index c2744b9b68a3c3f6afc22360c26e1ae34f7f2c61..ea3df17c0137eec9a0f7f046f0719935478c0957 100644 (file)
--- a/sapi/phpdbg/phpdbg_help.c
+++ b/sapi/phpdbg/phpdbg_help.c
@@ -384,6 +384,7 @@ phpdbg_help_text_t phpdbg_help_text[] = {
 "  **-O**      **-O**my.oplog          Sets oplog output file" CR
 "  **-r**                          Run execution context" CR
 "  **-rr**                         Run execution context and quit after execution" CR
+"  **-e**                          Generate extended information for debugger/profiler" CR
 "  **-E**                          Enable step through eval, careful!" CR
 "  **-S**      **-S**cli               Override SAPI name, careful!" CR
 "  **-l**      **-l**4000              Setup remote console ports" CR