X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcasl2.c;h=c3a555015a77009bb2c56ded13fe22fd7e18d61f;hp=e2d8cc5d1f0b567098209a8a133eac1fe37c044f;hb=80ce7950a164d14c61db94dc6d6d1eccef8b32cc;hpb=712486afe58b10ef37c5fa915de889ab8d1dd6cd

diff --git a/src/casl2.c b/src/casl2.c
index e2d8cc5..c3a5550 100644
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -4,8 +4,8 @@
 #define _GNU_SOURCE
 #include <getopt.h>
 
-static struct option longopts[] =
-{
+/* casl2コマンドのオプション */
+static struct option longopts[] = {
     {"source", no_argument, NULL, 's'},
     {"label", no_argument, NULL, 'l'},
     {"labelonly", no_argument, NULL, 'L'},
@@ -23,11 +23,45 @@ static struct option longopts[] =
     {0, 0, 0, 0},
 };
 
-ASMODE asmode = {false, false, false, false, false};
-EXECMODE execmode = {false, false, false};
+/* エラー番号とエラーメッセージ */
+CERRARRAY cerr[] = {
+    { 101, "label already defined" },
+    { 102, "label table is full" },
+    { 103, "label not found" },
+    { 104, "label length is too long" },
+    { 105, "no command in the line" },
+    { 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, "operand too many in machine command" },
+    { 114, "not integer" },
+    { 115, "not hex" },
+    { 116, "out of hex range" },
+    { 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, "unclosed quote" },
+    { 124, "more than one character in literal" },
+    { 125, "not GR in operand x" },
+    { 201, "execute - out of COMET II memory" },
+    { 202, "SVC input - out of Input memory" },
+    { 203, "SVC output - out of COMET II memory" },
+    { 204, "Program Register (PR) - out of COMET II memory" },
+    { 205, "Stack Pointer (SP) - cannot allocate stack buffer" },
+    { 206, "Address - out of COMET II memory" },
+    { 207, "Stack Pointer (SP) - out of COMET II memory" },
+    { 0, NULL },
+};
 
-/* 指定されたファイルにCOMET II仮想メモリ（アセンブル結果）を書込 */
-void outassemble(char *file) {
+/* 指定されたファイルにアセンブル結果を書込 */
+void outassemble(const char *file) {
     FILE *fp;
     if((fp = fopen(file, "w")) == NULL) {
         perror(file);
@@ -37,6 +71,19 @@ void outassemble(char *file) {
     fclose(fp);
 }
 
+/* アセンブル結果を書き込むファイルの名前 */
+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;
@@ -44,53 +91,44 @@ int main(int argc, char *argv[])
     bool status = false;
     WORD beginptr[argc];
     char *objfile = NULL;
-    const char *default_objfile = "a.o";
     const char *usage =
         "Usage: %s [-slLaAtTdh] [-oO<OUTFILE>] [-M <memorysize>] [-C <clocks>] FILE ...\n";
 
     while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
         switch(opt) {
         case 's':
-            (&asmode)->srcmode = true;
+            (&asmode)->src = true;
             break;
         case 'l':
-            (&asmode)->labelmode = true;
+            (&asmode)->label = true;
             break;
         case 'L':
-            (&asmode)->labelmode = true;
-            (&asmode)->onlylabelmode = true;
+            (&asmode)->label = true;
+            (&asmode)->onlylabel = true;
             break;
         case 'a':
-            (&asmode)->asdetailmode = true;
+            (&asmode)->asdetail = true;
             break;
         case 'A':
-            (&asmode)->onlyassemblemode = true;
-            (&asmode)->asdetailmode = true;
+            (&asmode)->asdetail = true;
+            (&asmode)->onlyassemble = true;
             break;
         case 'o':
-            if(optarg == NULL) {
-                objfile = strdup(default_objfile);
-            } else {
-                objfile = strdup(optarg);
-            }
+            objfile = strdup(objfile_name(optarg));
             break;
         case 'O':
-            (&asmode)->onlyassemblemode = true;
-            if(optarg == NULL) {
-                objfile = strdup(default_objfile);
-            } else {
-                objfile = strdup(optarg);
-            }
+            (&asmode)->onlyassemble = true;
+            objfile = strdup(objfile_name(optarg));
             break;
         case 't':
-            (&execmode)->tracemode = true;
+            (&execmode)->trace = true;
             break;
         case 'T':
-            (&execmode)->tracemode = true;
-            (&execmode)->logicalmode = true;
+            (&execmode)->trace = true;
+            (&execmode)->logical = true;
             break;
         case 'd':
-            (&execmode)->dumpmode = true;
+            (&execmode)->dump = true;
             break;
         case 'M':
             memsize = atoi(optarg);
@@ -106,11 +144,12 @@ int main(int argc, char *argv[])
             exit(-1);
         }
     }
+    /* ソースファイルが指定されていない場合は終了 */
     if(argv[optind] == NULL) {
         fprintf(stderr, "source file is not specified\n");
         exit(-1);
     }
-    /* ソースファイルが指定されていない場合は終了 */
+    /* COMET II仮想マシンのリセット */
     reset();
     /* アセンブル。ラベル表作成のため、2回行う */
     for(pass = FIRST; pass <= SECOND; pass++) {
@@ -121,9 +160,9 @@ int main(int argc, char *argv[])
             } else if(pass == SECOND) {
                 ptr = beginptr[i];
             }
-            if((&execmode)->tracemode == true || (&execmode)->dumpmode == true ||
-               (&asmode)->srcmode == true || (&asmode)->labelmode == true ||
-               (&asmode)->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);
             }
@@ -135,10 +174,10 @@ int main(int argc, char *argv[])
                 exit(-1);
             }
         }
-        if(pass == FIRST && (&asmode)->labelmode == true) {
+        if(pass == FIRST && (&asmode)->label == true) {
             fprintf(stdout, "\nLabel::::\n");
             printlabel();
-            if((&asmode)->onlylabelmode == true) {
+            if((&asmode)->onlylabel == true) {
                 return 0;
             }
         }
@@ -148,7 +187,7 @@ int main(int argc, char *argv[])
         if(objfile != NULL) {
             outassemble(objfile);
         }
-        if((&asmode)->onlyassemblemode == false) {
+        if((&asmode)->onlyassemble == false) {
             exec();    /* プログラム実行 */
         }
     }