コマンドハッシュ表を複数回作成していた構造バグを修正

[YACASL2.git] / src / casl2.c

diff --git a/src/casl2.c b/src/casl2.c
index 35f9a80..03c61fc 100644 (file)
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -23,11 +23,6 @@ static struct option longopts[] = {
     {0, 0, 0, 0},
 };
 
-/* アセンブルモード: src, label, onlylabel, asdetail, onlyassemble */
-ASMODE asmode = {false, false, false, false, false};
-/* 実行モード: trace, logical, dump */
-EXECMODE execmode = {false, false, false};
-
 /* エラー番号とエラーメッセージ */
 CERRARRAY cerr[] = {
     { 101, "label already defined" },
@@ -35,25 +30,27 @@ CERRARRAY cerr[] = {
     { 103, "label not found" },
     { 104, "label length is too long" },
     { 105, "no command in the line" },
-    { 106, "operand count mismatch" },
+    { 106, "operand mismatch in assemble command" },
     { 107, "no label in START" },
     { 108, "not command of operand \"r\"" },
     { 109, "not command of operand \"r1,r2\"" },
     { 110, "not command of operand \"r,adr[,x]\"" },
     { 111, "not command of operand \"adr[,x]\"" },
     { 112, "not command of no operand" },
-    { 113, "command not defined" },
+    { 113, "operand too many in machine command" },
     { 114, "not integer" },
     { 115, "not hex" },
     { 116, "out of hex range" },
-    { 117, "operand is too many" },
-    { 118, "operand length is too long" },
+    { 117, "operand too many in DC" },
+    { 118, "operand length too long" },
     { 119, "out of COMET II memory" },
     { 120, "GR0 in operand x" },
     { 121, "cannot get operand token" },
     { 122, "cannot create hash table" },
-    { 123, "illegal string" },
+    { 123, "unclosed quote" },
     { 124, "more than one character in literal" },
+    { 125, "not GR in operand x" },
+    { 126, "source file is not specified" },
     { 201, "execute - out of COMET II memory" },
     { 202, "SVC input - out of Input memory" },
     { 203, "SVC output - out of COMET II memory" },
@@ -80,7 +77,7 @@ const char *objfile_name(const char *str)
 {
     const char *default_name = "a.o";
 
-    if(optarg == NULL) {
+    if(str == NULL) {
         return default_name;
     } else {
         return str;
@@ -101,38 +98,38 @@ int main(int argc, char *argv[])
     while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
         switch(opt) {
         case 's':
-            (&asmode)->src = true;
+            asmode.src = true;
             break;
         case 'l':
-            (&asmode)->label = true;
+            asmode.label = true;
             break;
         case 'L':
-            (&asmode)->label = true;
-            (&asmode)->onlylabel = true;
+            asmode.label = true;
+            asmode.onlylabel = true;
             break;
         case 'a':
-            (&asmode)->asdetail = true;
+            asmode.asdetail = true;
             break;
         case 'A':
-            (&asmode)->asdetail = true;
-            (&asmode)->onlyassemble = true;
+            asmode.asdetail = true;
+            asmode.onlyassemble = true;
             break;
         case 'o':
             objfile = strdup(objfile_name(optarg));
             break;
         case 'O':
-            (&asmode)->onlyassemble = true;
+            asmode.onlyassemble = true;
             objfile = strdup(objfile_name(optarg));
             break;
         case 't':
-            (&execmode)->trace = true;
+            execmode.trace = true;
             break;
         case 'T':
-            (&execmode)->trace = true;
-            (&execmode)->logical = true;
+            execmode.trace = true;
+            execmode.logical = true;
             break;
         case 'd':
-            (&execmode)->dump = true;
+            execmode.dump = true;
             break;
         case 'M':
             memsize = atoi(optarg);
@@ -150,13 +147,16 @@ int main(int argc, char *argv[])
     }
     /* ソースファイルが指定されていない場合は終了 */
     if(argv[optind] == NULL) {
-        fprintf(stderr, "source file is not specified\n");
-        exit(-1);
+        setcerr(126, NULL);    /* source file is not specified */
+        goto casl2err;
     }
     /* COMET II仮想マシンのリセット */
     reset();
     /* アセンブル。ラベル表作成のため、2回行う */
     for(pass = FIRST; pass <= SECOND; pass++) {
+        if(pass == FIRST && create_cmdtype_code() == false) {
+            goto casl2err;
+        }
         for(i = optind; i < argc; i++) {
             /* データの格納開始位置 */
             if(pass == FIRST) {
@@ -164,24 +164,19 @@ int main(int argc, char *argv[])
             } else if(pass == SECOND) {
                 ptr = beginptr[i];
             }
-            if((&execmode)->trace == true || (&execmode)->dump == true ||
-               (&asmode)->src == true || (&asmode)->label == true ||
-               (&asmode)->asdetail == true)
+            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) {
-                freelabel();    /* ラベル表の解放 */
-                if(cerrno > 0) {
-                    freecerr();    /* エラーの解放 */
-                }
                 exit(-1);
             }
         }
-        if(pass == FIRST && (&asmode)->label == true) {
+        if(pass == FIRST && asmode.label == true) {
             fprintf(stdout, "\nLabel::::\n");
             printlabel();
-            if((&asmode)->onlylabel == true) {
+            if(asmode.onlylabel == true) {
                 return 0;
             }
         }
@@ -191,7 +186,7 @@ int main(int argc, char *argv[])
         if(objfile != NULL) {
             outassemble(objfile);
         }
-        if((&asmode)->onlyassemble == false) {
+        if(asmode.onlyassemble == false) {
             exec();    /* プログラム実行 */
         }
     }
@@ -200,4 +195,7 @@ int main(int argc, char *argv[])
         exit(-1);
     }
     return 0;
+casl2err:
+    fprintf(stderr, "Casl2 error - %d: %s\n", cerrno, cerrmsg);
+    exit(-1);
 }