X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcomet2.c;h=73669a79bf5ffb2206e68c7dda16cca0dc90a222;hp=8d07715ae386f350828d5b52b0cdf713936798d6;hb=a77e8363f86dfc38838990a174486166b7c5cbf2;hpb=7bcf04ca8bb891da3922776fbb0aa62a0030043c

diff --git a/src/comet2.c b/src/comet2.c
index 8d07715..73669a7 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -1,11 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
-#define _GNU_SOURCE
-#include <getopt.h>
-
+#include "package.h"
 #include "exec.h"
-#include "cmem.h"
-#include "cerr.h"
 
 /**
  * comet2コマンドのオプション
@@ -15,27 +9,35 @@ 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' },
     {"help", no_argument, NULL, 'h'},
     {0, 0, 0, 0},
 };
 
 /**
- * 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 *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
+    const char *version = PACKAGE_VERSION,  *cmdversion = "comet2 of YACASL2 version %s\n";
+    const char *usage = "Usage: %s [-btTdvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
     cerr_init();
     addcerrlist_load();
     addcerrlist_exec();
 
     /* オプションの処理 */
-    while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
+    while((opt = getopt_long(argc, argv, "tTdM:C:vh", longopts, NULL)) != -1) {
         switch(opt) {
         case 't':
             execmode.trace = true;
@@ -47,24 +49,30 @@ int main(int argc, char *argv[])
         case 'd':
             execmode.dump = true;
             break;
+        case 'b':
+            execmode.debugger = true;
+            break;
         case 'M':
             memsize = atoi(optarg);
             break;
         case 'C':
             clocks = atoi(optarg);
             break;
+        case 'v':
+            fprintf(stdout, cmdversion, version);
+            return 0;
         case 'h':
             fprintf(stdout, usage, argv[0]);
             return 0;
         case '?':
             fprintf(stderr, usage, argv[0]);
-            exit(-1);
+            exit(1);
         }
     }
     if(argv[optind] == NULL) {
-        setcerr(211, NULL);    /* object file not specified */
+        setcerr(211, "");    /* object file not specified */
         fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
-        exit(-1);
+        exit(1);
     }
     /* COMET II仮想マシンのリセット */
     reset(memsize, clocks);
@@ -74,7 +82,7 @@ int main(int argc, char *argv[])
     }
     /* COMET II仮想マシンのシャットダウン */
     shutdown();
-    stat = (cerr->num == 0) ? 0 : -1;
+    stat = (cerr->num == 0) ? 0 : 1;
     /* エラーの解放 */
     freecerr();
     return stat;