housekeeping, moving stuff to appropriate units

diff --git a/phpdbg.c b/phpdbg.c
index 6b219fa7561f7f413d8b53779106f4097c8260c2..d417a89158d27819f4bfb916ed9026b58b20f2e7 100644 (file)
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -434,6 +434,12 @@ static void phpdbg_welcome(zend_bool cleaning TSRMLS_DC) /* {{{ */
        }
 } /* }}} */
 
+static inline void phpdbg_sigint_handler(int signo) /* {{{ */
+{
+       TSRMLS_FETCH();
+       PHPDBG_G(flags) |= PHPDBG_IS_SIGNALED;
+} /* }}} */
+
 int main(int argc, char **argv) /* {{{ */
 {
        sapi_module_struct *phpdbg = &phpdbg_sapi_module;

diff --git a/phpdbg_opcode.c b/phpdbg_opcode.c
index 727f5e4c3de2c28ed6926936dc159d949fef1e05..9fa357c4fa5cf14d8ab4c80cb7d54e54e7b639a0 100644 (file)
--- a/phpdbg_opcode.c
+++ b/phpdbg_opcode.c
@@ -17,9 +17,13 @@
    +----------------------------------------------------------------------+
 */
 
+#include "phpdbg.h"
 #include "zend_vm_opcodes.h"
 #include "zend_compile.h"
 #include "phpdbg_opcode.h"
+#include "phpdbg_utils.h"
+
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
 
 static inline zend_uint phpdbg_decode_literal(zend_op_array *ops, zend_literal *literal TSRMLS_DC) /* {{{ */
 {
@@ -133,6 +137,49 @@ format:
        return decode[0];
 } /* }}} */
 
+void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, zend_bool ignore_flags TSRMLS_DC) /* {{{ */
+{
+    /* force out a line while stepping so the user knows what is happening */
+       if (ignore_flags ||
+               (!(PHPDBG_G(flags) & PHPDBG_IS_QUIET) ||
+               (PHPDBG_G(flags) & PHPDBG_IS_STEPPING) ||
+               (PHPDBG_G(oplog)))) {
+
+               zend_op *opline = execute_data->opline;
+               char *decode = phpdbg_decode_opline(execute_data->op_array, opline, vars TSRMLS_CC);
+               
+               if (ignore_flags ||
+                       (!(PHPDBG_G(flags) & PHPDBG_IS_QUIET) ||
+                       (PHPDBG_G(flags) & PHPDBG_IS_STEPPING))) {
+                       /* output line info */
+                       phpdbg_notice("#%- 5lu %16p %-30s %s %s",
+                          opline->lineno,
+                          opline,
+                          phpdbg_decode_opcode(opline->opcode),
+                          decode,
+                          execute_data->op_array->filename ? execute_data->op_array->filename : "unknown");
+        }
+
+               if (!ignore_flags && PHPDBG_G(oplog)) {
+                       phpdbg_log_ex(PHPDBG_G(oplog), "#%- 5lu %16p %-30s %s %s",
+                               opline->lineno,
+                               opline,
+                               phpdbg_decode_opcode(opline->opcode),
+                               decode,
+                               execute_data->op_array->filename ? execute_data->op_array->filename : "unknown");
+               }
+               
+               if (decode) {
+                       free(decode);
+               }
+    }
+} /* }}} */
+
+void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags TSRMLS_DC) /* {{{ */
+{
+       phpdbg_print_opline_ex(execute_data, NULL, ignore_flags TSRMLS_CC);
+} /* }}} */
+
 const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
 {
 #define CASE(s) case s: return #s

diff --git a/phpdbg_opcode.h b/phpdbg_opcode.h
index 83c0ac5addcfdd205b72839e99ddc7cea5d13bfb..dfa443a064404d5622504b18e17ab6a50c5e60fd 100644 (file)
--- a/phpdbg_opcode.h
+++ b/phpdbg_opcode.h
@@ -24,5 +24,7 @@
 
 const char *phpdbg_decode_opcode(zend_uchar);
 char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRMLS_DC);
+void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags TSRMLS_DC);
+void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, zend_bool ignore_flags TSRMLS_DC);
 
 #endif /* PHPDBG_OPCODE_H */

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 860183b101c820c6fea76e8d81b65da3524d56ca..85222e8c5dcb40b41439b8f010103f3f60dada2d 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -34,7 +34,7 @@
 #include "phpdbg_cmd.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),
@@ -1025,49 +1025,6 @@ out:
        return ret;
 } /* }}} */
 
-void phpdbg_print_opline_ex(zend_execute_data *execute_data, HashTable *vars, zend_bool ignore_flags TSRMLS_DC) /* {{{ */
-{
-    /* force out a line while stepping so the user knows what is happening */
-       if (ignore_flags ||
-               (!(PHPDBG_G(flags) & PHPDBG_IS_QUIET) ||
-               (PHPDBG_G(flags) & PHPDBG_IS_STEPPING) ||
-               (PHPDBG_G(oplog)))) {
-
-               zend_op *opline = execute_data->opline;
-               char *decode = phpdbg_decode_opline(execute_data->op_array, opline, vars TSRMLS_CC);
-               
-               if (ignore_flags ||
-                       (!(PHPDBG_G(flags) & PHPDBG_IS_QUIET) ||
-                       (PHPDBG_G(flags) & PHPDBG_IS_STEPPING))) {
-                       /* output line info */
-                       phpdbg_notice("#%- 5lu %16p %-30s %s %s",
-                          opline->lineno,
-                          opline,
-                          phpdbg_decode_opcode(opline->opcode),
-                          decode,
-                          execute_data->op_array->filename ? execute_data->op_array->filename : "unknown");
-        }
-
-               if (!ignore_flags && PHPDBG_G(oplog)) {
-                       phpdbg_log_ex(PHPDBG_G(oplog), "#%- 5lu %16p %-30s %s %s",
-                               opline->lineno,
-                               opline,
-                               phpdbg_decode_opcode(opline->opcode),
-                               decode,
-                               execute_data->op_array->filename ? execute_data->op_array->filename : "unknown");
-               }
-               
-               if (decode) {
-                       free(decode);
-               }
-    }
-} /* }}} */
-
-void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags TSRMLS_DC) /* {{{ */
-{
-       phpdbg_print_opline_ex(execute_data, NULL, ignore_flags TSRMLS_CC);
-} /* }}} */
-
 void phpdbg_clean(zend_bool full TSRMLS_DC) /* {{{ */
 {
        /* this is implicitly required */
@@ -1084,12 +1041,6 @@ void phpdbg_clean(zend_bool full TSRMLS_DC) /* {{{ */
        }
 } /* }}} */
 
-void phpdbg_sigint_handler(int signo)
-{
-       TSRMLS_FETCH();
-       PHPDBG_G(flags) |= PHPDBG_IS_SIGNALED;
-}
-
 static inline zend_execute_data *phpdbg_create_execute_data(zend_op_array *op_array, zend_bool nested TSRMLS_DC) /* {{{ */
 {
 #if PHP_VERSION_ID >= 50500

diff --git a/phpdbg_prompt.h b/phpdbg_prompt.h
index a410cc4ec4a478f1d2c318e7fbd174006bcbc37a..89623d0835f5881432137b0adb1c87f1cb125835 100644 (file)
--- a/phpdbg_prompt.h
+++ b/phpdbg_prompt.h
@@ -20,21 +20,13 @@
 #ifndef PHPDBG_PROMPT_H
 #define PHPDBG_PROMPT_H
 
+/* {{{ */
 void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default TSRMLS_DC);
 int phpdbg_interactive(TSRMLS_D);
-void phpdbg_print_opline(zend_execute_data *execute_data, zend_bool ignore_flags TSRMLS_DC);
-char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRMLS_DC);
 int phpdbg_compile(TSRMLS_D);
-void phpdbg_clean(zend_bool full TSRMLS_DC);
-void phpdbg_sigint_handler(int signo);
+void phpdbg_clean(zend_bool full TSRMLS_DC); /* }}} */
 
-#if PHP_VERSION_ID >= 50500
-void phpdbg_execute_ex(zend_execute_data *execute_data TSRMLS_DC);
-#else
-void phpdbg_execute_ex(zend_op_array *op_array TSRMLS_DC);
-#endif
-
-/* {{{ */
+/* {{{ phpdbg command handlers */
 PHPDBG_COMMAND(exec);
 PHPDBG_COMMAND(compile);
 PHPDBG_COMMAND(step);
@@ -59,4 +51,14 @@ PHPDBG_COMMAND(oplog);
 PHPDBG_COMMAND(register);
 PHPDBG_COMMAND(quit); /* }}} */
 
+/* {{{ prompt commands */
+extern const phpdbg_command_t phpdbg_prompt_commands[]; /* }}} */
+
+/* {{{ */
+#if PHP_VERSION_ID >= 50500
+void phpdbg_execute_ex(zend_execute_data *execute_data TSRMLS_DC);
+#else
+void phpdbg_execute_ex(zend_op_array *op_array TSRMLS_DC);
+#endif /* }}} */
+
 #endif /* PHPDBG_PROMPT_H */