From a46594d66972fae37a609506bcf01f6b2bdc865e Mon Sep 17 00:00:00 2001
From: j8takagi <j8takagi@nifty.com>
Date: Fri, 29 Jun 2018 10:07:26 +0900
Subject: [PATCH] =?utf8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC=E3=83=95?=
 =?utf8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97?=
 =?utf8?q?=E3=81=AE=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 include/assemble.h | 9 +++++++++
 include/cerr.h     | 5 +++++
 include/cmem.h     | 5 +++++
 include/exec.h     | 8 ++++++--
 include/struct.h   | 5 +++++
 src/assemble.c     | 8 --------
 src/cerr.c         | 5 -----
 src/cmem.c         | 5 -----
 src/exec.c         | 8 +-------
 src/label.c        | 7 -------
 src/struct.c       | 5 -----
 11 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/include/assemble.h b/include/assemble.h
index 09949d6..468f082 100644
--- a/include/assemble.h
+++ b/include/assemble.h
@@ -1,7 +1,16 @@
 #ifndef YACASL2_ASSEMBLE_INCLUDED
 #define YACASL2_ASSEMBLE_INCLUDED
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <stdbool.h>
+#include <ctype.h>
+#include <assert.h>
+#include <errno.h>
+#include "cerr.h"
+#include "cmem.h"
+#include "hash.h"
 #include "struct.h"
 #include "word.h"
 
diff --git a/include/cerr.h b/include/cerr.h
index 810bf3c..9549de6 100644
--- a/include/cerr.h
+++ b/include/cerr.h
@@ -1,6 +1,11 @@
 #ifndef YACASL2_CERR_H_INCLUDED
 #define YACASL2_CERR_H_INCLUDED
 
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
 #include <stdbool.h>
 #include "cmem.h"
 
diff --git a/include/cmem.h b/include/cmem.h
index 85cb720..c5bb6e8 100644
--- a/include/cmem.h
+++ b/include/cmem.h
@@ -1,6 +1,11 @@
 #ifndef YACASL2_CMEM_H_INCLUDED
 #define YACASL2_CMEM_H_INCLUDED
+
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdbool.h>
 
 /**
  * @brief 配列のサイズを返すマクロ
diff --git a/include/exec.h b/include/exec.h
index f081089..ce729c0 100644
--- a/include/exec.h
+++ b/include/exec.h
@@ -3,9 +3,13 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <assert.h>
+#include <time.h>
 #include "struct.h"
 #include "word.h"
 #include "cmem.h"
+#include "cerr.h"
+#include "monitor.h"
 
 enum {
     INSIZE = 256    /**<IN命令の、入力領域 */
@@ -390,10 +394,10 @@ void dspregister();
 bool disassemble_file(const char *file);
 
 /**
- * @brief COMET IIデバッガーを起動する
+ * @brief COMET IIモニターを起動する
  *
  * @return なし
  */
-void debugger();
+void monitor();
 
 #endif            /* YACASL2_EXEC_INCLUDEDの終端 */
diff --git a/include/struct.h b/include/struct.h
index ee59634..9064d5f 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -1,8 +1,13 @@
 #ifndef YACASL2_CASL2_INCLUDED
 #define YACASL2_CASL2_INCLUDED
 
+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
 #include <time.h>
 #include "word.h"
+#include "cmem.h"
+#include "hash.h"
 
 /**
  * @brief COMET IIの規格値
diff --git a/src/assemble.c b/src/assemble.c
index 68a3457..8318d18 100644
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -1,12 +1,4 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include <errno.h>
-
 #include "assemble.h"
-#include "cerr.h"
 
 /**
  * @brief ファイルストリームの現在行を番号付きで表示する
diff --git a/src/cerr.c b/src/cerr.c
index f1cb09c..cd2ace9 100644
--- a/src/cerr.c
+++ b/src/cerr.c
@@ -1,8 +1,3 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdbool.h>
 #include "cerr.h"
 
 void cerr_init()
diff --git a/src/cmem.c b/src/cmem.c
index 6c6ae12..fb29a71 100644
--- a/src/cmem.c
+++ b/src/cmem.c
@@ -1,8 +1,3 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdbool.h>
 #include "cmem.h"
 
 void *malloc_chk(size_t size, char *tag)
diff --git a/src/exec.c b/src/exec.c
index b920fb1..ca1dfe0 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,10 +1,4 @@
-#include <stdio.h>
-#include <assert.h>
-#include <time.h>
-
 #include "exec.h"
-#include "cerr.h"
-#include "debugger.h"
 
 /**
  * @brief プログラムレジスタ（PR）を表すWORD値を文字列に変換
@@ -813,7 +807,7 @@ void exec()
         }
         /* デバッガーモードの場合、デバッガーを起動 */
         if(execmode.step == true || getbps(sys->cpu->pr) == true) {
-            debugger();
+            monitor();
         }
         /* プログラムレジスタをチェック */
         if(sys->cpu->pr >= sys->memsize) {
diff --git a/src/label.c b/src/label.c
index de37b94..cbb27b8 100644
--- a/src/label.c
+++ b/src/label.c
@@ -1,10 +1,3 @@
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "cerr.h"
-#include "cmem.h"
-#include "hash.h"
 #include "assemble.h"
 
 /**
diff --git a/src/struct.c b/src/struct.c
index f0f705b..0f0ae43 100644
--- a/src/struct.c
+++ b/src/struct.c
@@ -1,9 +1,4 @@
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include "hash.h"
 #include "struct.h"
-#include "cmem.h"
 #include "exec.h"
 
 /**
-- 
2.18.0