Merge branch 'master'

diff --git a/doc_inner/Doxyfile b/doc_inner/Doxyfile
index 644c2c9..981aefc 100644 (file)
--- a/doc_inner/Doxyfile
+++ b/doc_inner/Doxyfile
@@ -1041,6 +1041,35 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files
+# were built. This is equivalent to specifying the "-p" option to a clang tool,
+# such as clang-check. These options will then be passed to the parser.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------

diff --git a/doc_inner/Makefile b/doc_inner/Makefile
index e57591f..5e38a58 100644 (file)
--- a/doc_inner/Makefile
+++ b/doc_inner/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all clean doxygen-clean gnu_global-clean cmetrics-clean
+.PHONY: all clean doxyfile-update doxygen-clean gnu_global-clean cmetrics-clean
 
 CD := cd
 CMETRICS := cmetrics
@@ -34,7 +34,10 @@ $(DOXYGEN_DIR): $(DOXYSRCDIR)/Doxyfile ../src ../include
        $(INSTALL) -d $(DOXYGEN_DIR)
        $(CD) $(DOXYSRCDIR) && $(DOXYGEN)
 
-$(DOXYSRCDIR)/Doxyfile: Doxyfile
+doxyfile-update: Doxyfile
+       $(DOXYGEN) -u $<
+
+$(DOXYSRCDIR)/Doxyfile: doxyfile-update
        @$(CP) -vf Doxyfile $(DOXYSRCDIR)/
 
 # htagsのHTMLドキュメント作成先は、

diff --git a/include/assemble.h b/include/assemble.h
index 154f8e1..e5c1427 100644 (file)
--- a/include/assemble.h
+++ b/include/assemble.h
@@ -9,11 +9,7 @@
 #include <assert.h>
 #include <errno.h>
 #include "cerr.h"
-#include "cmem.h"
-#include "exec.h"
-#include "hash.h"
 #include "struct.h"
-#include "word.h"
 #include "token.h"
 
 /**

diff --git a/include/exec.h b/include/exec.h
index 5794e86..08b4dd1 100644 (file)
--- a/include/exec.h
+++ b/include/exec.h
@@ -16,24 +16,6 @@ enum {
     INSIZE = 256    /**<IN命令の、入力領域 */
 };
 
-/**
- * @brief 実行モードを表すデータ型
- */
-typedef struct {
-    bool trace;           /**<レジストリの内容をステップごとに表示する場合はtrue */
-    bool logical;         /**<レジストリの内容を論理値（0から65535）で表示する場合はtrue */
-    bool dump;            /**<メモリの内容をステップごとに表示する場合はtrue */
-    int dump_start;       /**<メモリの内容をステップごとに表示する場合の開始アドレス */
-    int dump_end;         /**<メモリの内容をステップごとに表示する場合の終了アドレス */
-    bool monitor;         /**<モニターモードの場合はtrue */
-    bool step;            /**<ステップ実行の場合はtrue */
-} EXECMODE;
-
-/**
- * @brief 実行モード: trace, logical, dump, monitor, step
- */
-extern EXECMODE execmode;
-
 /**
  * @brief 実行エラーをエラーリストに追加する
  */

diff --git a/include/monitor.h b/include/monitor.h
index 566230e..e370072 100644 (file)
--- a/include/monitor.h
+++ b/include/monitor.h
@@ -4,13 +4,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include "token.h"
 #include "assemble.h"
-#include "hash.h"
-#include "cmem.h"
-#include "cerr.h"
-#include "disassemble.h"
-#include "word.h"
+#include "exec.h"
 
 /**
  * @brief モニター

diff --git a/include/struct.h b/include/struct.h
index ffc448e..dce1ddf 100644 (file)
--- a/include/struct.h
+++ b/include/struct.h
@@ -134,6 +134,24 @@ typedef struct {
 
 extern EXECPTR *execptr;
 
+/**
+ * @brief 実行モードを表すデータ型
+ */
+typedef struct {
+    bool trace;           /**<レジストリの内容をステップごとに表示する場合はtrue */
+    bool logical;         /**<レジストリの内容を論理値（0から65535）で表示する場合はtrue */
+    bool dump;            /**<メモリの内容をステップごとに表示する場合はtrue */
+    int dump_start;       /**<メモリの内容をステップごとに表示する場合の開始アドレス */
+    int dump_end;         /**<メモリの内容をステップごとに表示する場合の終了アドレス */
+    bool monitor;         /**<モニターモードの場合はtrue */
+    bool step;            /**<ステップ実行の場合はtrue */
+} EXECMODE;
+
+/**
+ * @brief 実行モード: trace, logical, dump, monitor, step
+ */
+extern EXECMODE execmode;
+
 /**
  * @brief 汎用レジスタの番号からレジスタを表す文字列を返す
  *

diff --git a/src/casl2.c b/src/casl2.c
index e64105d..c7ef4f0 100644 (file)
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -1,5 +1,6 @@
 #include "package.h"
 #include "assemble.h"
+#include "exec.h"
 
 /**
  * @brief CASL IIのエラーをエラーリストに追加

diff --git a/src/doxygen.c b/src/doxygen.c
index 37981e8..4de72cf 100644 (file)
--- a/src/doxygen.c
+++ b/src/doxygen.c
@@ -3,6 +3,7 @@
  * \section メイン関数
  * - src/casl2.c
  * - src/comet2.c
+ * - src/comet2monitor.c
  * - src/dumpword.c
  * - src/casl2rev.c
  * - src/comet2monitor.c