X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcasl2.c;h=989bbe76661ab2fabf27f13fdbeb706e3b2a4c90;hp=2d17acd23ee8e287e047f4a5d3dde2413d9ae9e2;hb=6bb1b8168d68db8d5ff001e0bccc86a95bcb14ba;hpb=44cde08e6cf148928a219593c78a57abfd89b424

diff --git a/src/casl2.c b/src/casl2.c
index 2d17acd..989bbe7 100644
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -4,31 +4,58 @@
 #define _GNU_SOURCE
 #include <getopt.h>
 
-/* 指定されたファイルにCOMET II仮想メモリ（アセンブル結果）を書込 */
-void outassemble(char *file) {
+/* 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},
+};
+
+/* casl2のエラー定義 */
+CERRARRAY cerr_casl2[] = {
+    { 126, "source file is not specified" },
+};
+bool addcerrlist_casl2()
+{
+    return addcerrlist(sizeof(cerr_casl2), cerr_casl2);
+}
+
+/* 指定されたファイルにアセンブル結果を書込 */
+void outassemble(const char *file) {
     FILE *fp;
     if((fp = fopen(file, "w")) == NULL) {
         perror(file);
-        return;
+        exit(-1);
     }
     fwrite(memory, sizeof(WORD), endptr, fp);
     fclose(fp);
 }
 
-static struct option longopts[] = {
-    {"trace", no_argument, NULL, 't'},
-    {"tracearithmetic", no_argument, NULL, 't'},
-    {"tracelogical", no_argument, NULL, 'T'},
-    {"dump", no_argument, NULL, 'd'},
-    {"source", no_argument, NULL, 's'},
-    {"label", no_argument, NULL, 'l'},
-    {"assembledetail", no_argument, NULL, 'a'},    
-    {"onlyassemble", optional_argument, NULL, 'o'},
-    {"assembledetailonly", no_argument, NULL, 'A'},
-    {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0}
-};
+/* アセンブル結果を書き込むファイルの名前 */
+const char *objfile_name(const char *str)
+{
+    const char *default_name = "a.o";
+
+    if(str == NULL) {
+        return default_name;
+    } else {
+        return str;
+    }
+}
 
+/* casl2コマンドのメイン */
 int main(int argc, char *argv[])
 {
     int opt, i;
@@ -36,50 +63,73 @@ int main(int argc, char *argv[])
     bool status = false;
     WORD beginptr[argc];
     char *objfile = NULL;
-    const char *usage = "Usage: %s [-tTdslaAh] [-o <OUTFILE>] FILE ...\n";
+    const char *usage =
+        "Usage: %s [-slLaAtTdh] [-oO<OBJECTFILE>] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE ...\n";
 
-    while((opt = getopt_long(argc, argv, "tTdslao:Ah", longopts, NULL)) != -1) {
+    while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
         switch(opt) {
-        case 't':
-            tracemode = true;
-            break;
-        case 'T':
-            tracemode = true;
-            logicalmode = true;
-            break;
-        case 'd':
-            dumpmode = true;
-            break;
         case 's':
-            srcmode = true;
+            asmode.src = true;
             break;
         case 'l':
-            labelmode = true;
+            asmode.label = true;
+            break;
+        case 'L':
+            asmode.label = true;
+            asmode.onlylabel = true;
             break;
         case 'a':
-            asdetailmode = true;
+            asmode.asdetail = true;
+            break;
+        case 'A':
+            asmode.asdetail = true;
+            asmode.onlyassemble = true;
             break;
         case 'o':
-            onlyassemblemode = true;
-            if(optarg != NULL) {
-                objfile = strdup(optarg);
-            }
+            objfile = strdup(objfile_name(optarg));
             break;
-        case 'A':
-            onlyassemblemode = true;
-            objfile = NULL;
-            asdetailmode = true;
+        case 'O':
+            asmode.onlyassemble = true;
+            objfile = strdup(objfile_name(optarg));
+            break;
+        case 't':
+            execmode.trace = true;
+            break;
+        case 'T':
+            execmode.trace = true;
+            execmode.logical = true;
+            break;
+        case 'd':
+            execmode.dump = true;
+            break;
+        case 'M':
+            memsize = atoi(optarg);
+            break;
+        case 'C':
+            clocks = atoi(optarg);
             break;
         case 'h':
             fprintf(stdout, usage, argv[0]);
-            exit(-1);
+            return 0;
         case '?':
             fprintf(stderr, usage, argv[0]);
             exit(-1);
         }
     }
+
+    addcerrlist_casl2();
+    /* ソースファイルが指定されていない場合は終了 */
+    if(argv[optind] == NULL) {
+        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) {
@@ -87,30 +137,30 @@ int main(int argc, char *argv[])
             } else if(pass == SECOND) {
                 ptr = beginptr[i];
             }
-            if(tracemode == true || dumpmode == true || srcmode == true ||
-               labelmode == true || asdetailmode == 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 && labelmode == true) {
+        if(pass == FIRST && asmode.label == true) {
             fprintf(stdout, "\nLabel::::\n");
             printlabel();
+            if(asmode.onlylabel == true) {
+                return 0;
+            }
         }
     }
-    freelabel();    /* ラベル表の解放 */
+    free_cmdtype_code();    /* 命令表の解放 */
+    freelabel();            /* ラベル表の解放 */
     if(status == true) {
-        if(onlyassemblemode) {
-            if(objfile != NULL) {
-                outassemble(objfile);
-            }
-        } else {
+        if(objfile != NULL) {
+            outassemble(objfile);
+        }
+        if(asmode.onlyassemble == false) {
             exec();    /* プログラム実行 */
         }
     }
@@ -119,4 +169,7 @@ int main(int argc, char *argv[])
         exit(-1);
     }
     return 0;
+casl2err:
+    fprintf(stderr, "CASL2 error - %d: %s\n", cerrno, cerrmsg);
+    exit(-1);
 }