X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcomet2.c;h=1bdc3e9430b16a27f505b709e55c2205ca8594e6;hb=refs%2Ftags%2Fv0.1p45;hp=138382af7fa9b33cd00ed9d6c7227217eb8874ac;hpb=d1f82970bf7d41db2fea11b08cd8e308f6cb8138;p=YACASL2.git

diff --git a/src/comet2.c b/src/comet2.c
index 138382a..1bdc3e9 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -18,14 +18,7 @@ static struct option longopts[] = {
     {"memorysize", required_argument, NULL, 'M'},
     {"clocks", required_argument, NULL, 'C'},
     {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0}
-};
-
-/**
- * comet2コマンドのエラー
- */
-static CERR cerr_comet2[] = {
-    { 208, "object file is not specified" },
+    {0, 0, 0, 0},
 };
 
 /**
@@ -34,11 +27,12 @@ static CERR cerr_comet2[] = {
 int main(int argc, char *argv[])
 {
     int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
-    int opt, status = 0;
+    int opt, stat = 0;
     const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
     cerr_init();
-    addcerrlist(ARRAYSIZE(cerr_comet2), cerr_comet2);	/* エラーリスト作成 */
+    addcerrlist_load();
+    addcerrlist_exec();
 
     /* オプションの処理 */
     while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
@@ -64,28 +58,24 @@ int main(int argc, char *argv[])
             return 0;
         case '?':
             fprintf(stderr, usage, argv[0]);
-            exit(-1);
+            exit(1);
         }
     }
     if(argv[optind] == NULL) {
-        setcerr(208, NULL);    /* object file is 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);
-    prog->start = 0;
+    execptr->start = 0;
     if(loadassemble(argv[optind]) == true) {
-        create_code_type();    /* タイプがキーの命令ハッシュ表を作成 */
         exec();                /* プログラム実行 */
-        free_code_type();      /* タイプがキーの命令ハッシュ表を解放 */
     }
     /* COMET II仮想マシンのシャットダウン */
     shutdown();
-    if(cerr->num > 0) {
-        status = -1;
-    }
+    stat = (cerr->num == 0) ? 0 : -1;
     /* エラーの解放 */
     freecerr();
-    return status;
+    return stat;
 }