コマンドラインオプションの修正

[YACASL2.git] / src / comet2.c

diff --git a/src/comet2.c b/src/comet2.c
index 73669a7..a3d6ee1 100644 (file)
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -9,10 +9,10 @@ static struct option longopts[] = {
     {"tracearithmetic", no_argument, NULL, 't'},
     {"tracelogical", no_argument, NULL, 'T'},
     {"dump", no_argument, NULL, 'd'},
-    {"debug", no_argument, NULL, 'b'},
+    {"monitor", no_argument, NULL, 'm'},
     {"memorysize", required_argument, NULL, 'M'},
     {"clocks", required_argument, NULL, 'C'},
-    { "version", no_argument, NULL, 'v' },
+    {"version", no_argument, NULL, 'v' },
     {"help", no_argument, NULL, 'h'},
     {0, 0, 0, 0},
 };
@@ -30,14 +30,10 @@ 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 [-btTdvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
-
-    cerr_init();
-    addcerrlist_load();
-    addcerrlist_exec();
+    const char *usage = "Usage: %s [-tTdmvh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
     /* オプションの処理 */
-    while((opt = getopt_long(argc, argv, "tTdM:C:vh", longopts, NULL)) != -1) {
+    while((opt = getopt_long(argc, argv, "tTdmM:C:vh", longopts, NULL)) != -1) {
         switch(opt) {
         case 't':
             execmode.trace = true;
@@ -49,8 +45,8 @@ int main(int argc, char *argv[])
         case 'd':
             execmode.dump = true;
             break;
-        case 'b':
-            execmode.debugger = true;
+        case 'm':
+            execmode.step = true;
             break;
         case 'M':
             memsize = atoi(optarg);
@@ -69,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;
@@ -83,7 +86,6 @@ int main(int argc, char *argv[])
     /* COMET II仮想マシンのシャットダウン */
     shutdown();
     stat = (cerr->num == 0) ? 0 : 1;
-    /* エラーの解放 */
-    freecerr();
+    freecerr();                 /* エラーの解放 */
     return stat;
 }