X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcomet2.c;h=a8135c35e9b440738a228835f326da9c86fc823a;hp=36060d3ab60ddd7934a632f36f1793e62ab40d60;hb=48d861758d64e7c662067fa89a9df41328f7af04;hpb=8b76a2371ab7fc325f11b9164a73e899f98072f0

diff --git a/src/comet2.c b/src/comet2.c
index 36060d3..a8135c3 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -1,12 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
-#define _GNU_SOURCE
-#include <getopt.h>
-
-#include "exec.h"
-#include "cmem.h"
-#include "cerr.h"
 #include "package.h"
+#include "exec.h"
 
 /**
  * comet2コマンドのオプション
@@ -16,6 +9,7 @@ static struct option longopts[] = {
     {"tracearithmetic", no_argument, NULL, 't'},
     {"tracelogical", no_argument, NULL, 'T'},
     {"dump", no_argument, NULL, 'd'},
+    {"debug", no_argument, NULL, 'b'},
     {"memorysize", required_argument, NULL, 'M'},
     {"clocks", required_argument, NULL, 'C'},
     { "version", no_argument, NULL, 'v' },
@@ -24,18 +18,19 @@ static struct option longopts[] = {
 };
 
 /**
- * comet2コマンドのメイン
+ * @brief comet2コマンドのメイン
+ *
+ * @return 正常終了時は0、異常終了時は1
+ *
+ * @param argc コマンドライン引数の数
+ * @param *argv[] コマンドライン引数の配列
  */
 int main(int argc, char *argv[])
 {
     int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
     int opt, stat = 0;
     const char *version = PACKAGE_VERSION,  *cmdversion = "comet2 of YACASL2 version %s\n";
-    const char *usage = "Usage: %s [-tTdvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
-
-    cerr_init();
-    addcerrlist_load();
-    addcerrlist_exec();
+    const char *usage = "Usage: %s [-btTdvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
     /* オプションの処理 */
     while((opt = getopt_long(argc, argv, "tTdM:C:vh", longopts, NULL)) != -1) {
@@ -50,6 +45,9 @@ int main(int argc, char *argv[])
         case 'd':
             execmode.dump = true;
             break;
+        case 'm':
+            execmode.step = true;
+            break;
         case 'M':
             memsize = atoi(optarg);
             break;
@@ -67,11 +65,18 @@ int main(int argc, char *argv[])
             exit(1);
         }
     }
+    /* エラーの定義 */
+    cerr_init();
+    addcerrlist_load();
+    addcerrlist_exec();
+
     if(argv[optind] == NULL) {
         setcerr(211, "");    /* object file not specified */
         fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
+        freecerr();             /* エラーの解放 */
         exit(1);
     }
+
     /* COMET II仮想マシンのリセット */
     reset(memsize, clocks);
     execptr->start = 0;
@@ -80,8 +85,7 @@ int main(int argc, char *argv[])
     }
     /* COMET II仮想マシンのシャットダウン */
     shutdown();
-    stat = (cerr->num == 0) ? 0 : -1;
-    /* エラーの解放 */
-    freecerr();
+    stat = (cerr->num == 0) ? 0 : 1;
+    freecerr();                 /* エラーの解放 */
     return stat;
 }