X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcasl2.c;h=f66decdba0c72933cb9880092f5aa4e455f94bfa;hp=5ae4825b8d5c7eccfcdc77606dd893eebe58c6fc;hb=df686f409d06eaac1e8909cbe453f256d56ae14f;hpb=406fd6490ad76b4573b6ce9f8d322d92f13d27d8

diff --git a/src/casl2.c b/src/casl2.c
index 5ae4825..f66decd 100644
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -6,40 +6,41 @@
 
 /* casl2コマンドのオプション */
 static struct option longopts[] = {
-    {"source", no_argument, NULL, 's'},
-    {"label", no_argument, NULL, 'l'},
-    {"labelonly", no_argument, NULL, 'L'},
-    {"assembledetail", no_argument, NULL, 'a'},
-    {"assembledetailonly", no_argument, NULL, 'A'},
-    {"assembleout", optional_argument, NULL, 'o'},
-    {"assembleoutonly", optional_argument, NULL, 'O'},
-    {"trace", no_argument, NULL, 't'},
-    {"tracearithmetic", no_argument, NULL, 't'},
-    {"tracelogical", no_argument, NULL, 'T'},
-    {"dump", no_argument, NULL, 'd'},
-    {"memorysize", required_argument, NULL, 'M'},
-    {"clocks", required_argument, NULL, 'C'},
-    {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0},
+    { "source", no_argument, NULL, 's' },
+    { "label", no_argument, NULL, 'l' },
+    { "labelonly", no_argument, NULL, 'L' },
+    { "assembledetail", no_argument, NULL, 'a' },
+    { "assembledetailonly", no_argument, NULL, 'A' },
+    { "assembleout", optional_argument, NULL, 'o' },
+    { "assembleoutonly", optional_argument, NULL, 'O' },
+    { "trace", no_argument, NULL, 't' },
+    { "tracearithmetic", no_argument, NULL, 't' },
+    { "tracelogical", no_argument, NULL, 'T' },
+    { "dump", no_argument, NULL, 'd' },
+    { "memorysize", required_argument, NULL, 'M' },
+    { "clocks", required_argument, NULL, 'C' },
+    { "help", no_argument, NULL, 'h' },
+    { 0, 0, 0, 0 },
 };
 
 /* casl2のエラー定義 */
-CERRARRAY cerr_casl2[] = {
-    { 126, "source file is not specified" },
+CERR cerr_casl2[] = {
+    { 126, "no source file" },
 };
 bool addcerrlist_casl2()
 {
-    return addcerrlist_casl2(ARRAYSIZE(cerr_casl2), cerr_casl2);
+    return addcerrlist(sizeof(cerr_casl2), cerr_casl2);
 }
 
 /* 指定されたファイルにアセンブル結果を書込 */
 void outassemble(const char *file) {
     FILE *fp;
+
     if((fp = fopen(file, "w")) == NULL) {
         perror(file);
         exit(-1);
     }
-    fwrite(memory, sizeof(WORD), endptr, fp);
+    fwrite(memory, sizeof(WORD), progprop->end, fp);
     fclose(fp);
 }
 
@@ -47,25 +48,24 @@ void outassemble(const char *file) {
 const char *objfile_name(const char *str)
 {
     const char *default_name = "a.o";
-
-    if(str == NULL) {
-        return default_name;
-    } else {
-        return str;
-    }
+    return (str == NULL) ? default_name : str;
 }
 
 /* casl2コマンドのメイン */
 int main(int argc, char *argv[])
 {
-    int opt, i;
+    int opt, i, status = 0;
     PASS pass;
-    bool status = false;
+    bool res = false;
     WORD beginptr[argc];
     char *objfile = NULL;
     const char *usage =
-        "Usage: %s [-slLaAtTdh] [-oO<OUTFILE>] [-M <memorysize>] [-C <clocks>] FILE ...\n";
+        "Usage: %s [-slLaAtTdh] [-oO[<OBJECTFILE>]] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE1[ FILE2  ...]\n";
 
+    /* エラーの初期化 */
+    cerr = malloc_chk(sizeof(CERR), "cerr");
+    addcerrlist_casl2();
+    /* オプションの処理 */
     while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
         switch(opt) {
         case 's':
@@ -86,11 +86,11 @@ int main(int argc, char *argv[])
             asmode.onlyassemble = true;
             break;
         case 'o':
-            objfile = strdup(objfile_name(optarg));
+            objfile = strdup_chk(objfile_name(optarg), "objfile");
             break;
         case 'O':
             asmode.onlyassemble = true;
-            objfile = strdup(objfile_name(optarg));
+            objfile = strdup_chk(objfile_name(optarg), "objfile");
             break;
         case 't':
             execmode.trace = true;
@@ -116,35 +116,33 @@ int main(int argc, char *argv[])
             exit(-1);
         }
     }
-
-    #if 0
-    addcerrlist_casl2();
-    #endif
     /* ソースファイルが指定されていない場合は終了 */
     if(argv[optind] == NULL) {
-        setcerr(126, NULL);    /* source file is not specified */
-        goto casl2err;
+        setcerr(126, NULL);    /* no source file */
+        fprintf(stderr, "CASL2 error - %d: %s\n", cerr->num, cerr->msg);
+        exit(-1);
     }
     /* COMET II仮想マシンのリセット */
     reset();
     /* アセンブル。ラベル表作成のため、2回行う */
     for(pass = FIRST; pass <= SECOND; pass++) {
-        if(pass == FIRST && create_cmdtype_code() == false) {
-            goto casl2err;
+        if(pass == FIRST) {
+            create_cmdtype_code();        /* 命令と命令タイプがキーのハッシュ表を作成 */
+            asprop = malloc_chk(sizeof(ASPROP), "asprop");
         }
         for(i = optind; i < argc; i++) {
             /* データの格納開始位置 */
             if(pass == FIRST) {
-                beginptr[i] = ptr;
+                beginptr[i] = asprop->ptr;
             } else if(pass == SECOND) {
-                ptr = beginptr[i];
+                asprop->ptr = beginptr[i];
             }
             if(execmode.trace == true || execmode.dump == true || asmode.src == true ||
                asmode.label == true || asmode.asdetail == true)
             {
                 fprintf(stdout, "\nAssemble %s (%d)\n", argv[i], pass);
             }
-            if((status = assemble(argv[i], pass)) == false) {
+            if((res = assemble(argv[i], pass)) == false) {
                 exit(-1);
             }
         }
@@ -155,23 +153,27 @@ int main(int argc, char *argv[])
                 return 0;
             }
         }
+        if(pass == SECOND) {
+            free_cmdtype_code();    /* 命令と命令タイプがキーのハッシュ表を解放 */
+            freelabel();            /* ラベルハッシュ表を解放 */
+        }
     }
-    free_cmdtype_code();    /* 命令表の解放 */
-    freelabel();            /* ラベル表の解放 */
-    if(status == true) {
+    if(res == true) {
         if(objfile != NULL) {
             outassemble(objfile);
         }
         if(asmode.onlyassemble == false) {
-            exec();    /* プログラム実行 */
+            create_code_type();    /* 命令と命令タイプがキーのハッシュ表を作成 */
+            res = exec();          /* プログラム実行 */
+            free_code_type();      /* 命令と命令タイプがキーのハッシュ表を解放 */
         }
     }
-    if(cerrno > 0) {
-        freecerr();
-        exit(-1);
+    /* COMET II仮想マシンのシャットダウン */
+    shutdown();
+    if(cerr->num > 0) {
+        status = -1;
     }
-    return 0;
-casl2err:
-    fprintf(stderr, "CASL2 error - %d: %s\n", cerrno, cerrmsg);
-    exit(-1);
+    /* エラーの解放 */
+    freecerr();
+    return status;
 }