X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcomet2.c;h=82336133842284504213d9c8ff8ada42afb23209;hp=be09f10254bf6f0c2b84483664b2864ac561a449;hb=4ee27a568fb9222907a566e59aaefe248f08a8e4;hpb=406fd6490ad76b4573b6ce9f8d322d92f13d27d8

diff --git a/src/comet2.c b/src/comet2.c
index be09f10..8233613 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -16,8 +16,9 @@ static struct option longopts[] = {
 };
 
 /* comet2のエラー定義 */
-CERRARRAY cerr_comet2[] = {
-    { 201, "Load object file - full of COMET II memory" },
+CERR cerr_comet2[] = {
+    { 201, "load object file - full of COMET II memory" },
+    { 208, "object file is not specified" },
 };
 bool addcerrlist_comet2()
 {
@@ -27,27 +28,33 @@ bool addcerrlist_comet2()
 /* 指定されたファイルからアセンブル結果を読込 */
 bool loadassemble(char *file) {
     FILE *fp;
+    bool status = true;
 
     if((fp = fopen(file, "r")) == NULL) {
         perror(file);
         return false;
     }
-    if((endptr = startptr + fread(memory, sizeof(WORD), memsize-startptr, fp)) == memsize) {
+    progprop->end = progprop->start +
+        fread(memory, sizeof(WORD), memsize-progprop->start, fp);
+    if(progprop->end == memsize) {
         setcerr(201, NULL);    /* Load object file - full of COMET II memory */
-        fprintf(stderr, "Execute error - %d: %s\n", cerrno, cerrmsg);
-        return false;
+        fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);
+        status = false;
     }
     fclose(fp);
-    return true;
+    return status;
 }
 
 /* comet2コマンド */
 int main(int argc, char *argv[])
 {
-    int opt;
-    const char *usage = "Usage: %s [-tTdh] [-M <memorysize>] [-C <clocks>] FILE\n";
+    int opt, retval = 0;
+    const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
+    /* エラーの初期化 */
+    cerr = malloc_chk(sizeof(CERR), "cerr");
     addcerrlist_comet2();
+    /* オプションの処理 */
     while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
         switch(opt) {
         case 't':
@@ -74,14 +81,24 @@ int main(int argc, char *argv[])
             exit(-1);
         }
     }
+    if(argv[optind] == NULL) {
+        setcerr(208, NULL);    /* object file is not specified */
+        fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
+        exit(-1);
+    }
     reset();
-    startptr = 0;
+    progprop->start = 0;
     if(loadassemble(argv[optind]) == true) {
-        exec();    /* プログラム実行 */
+        create_code_type();    /* 命令と命令タイプがキーのハッシュ表を作成 */
+        exec();                /* プログラム実行 */
+        free_code_type();      /* 命令と命令タイプがキーのハッシュ表を解放 */
     }
-    if(cerrno > 0) {
-        freecerr();
-        exit(-1);
+    /* COMET II仮想マシンのシャットダウン */
+    shutdown();
+    if(cerr->num > 0) {
+        retval = -1;
     }
-    return 0;
+    /* エラーの解放 */
+    freecerr();
+    return retval;
 }