X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcasl2.c;h=d75650de5246a6c18a90a30f6fc3279150d44ce3;hp=8ae34959ffd3cc06a9acdd84a17a56aad7e96a33;hb=4ee27a568fb9222907a566e59aaefe248f08a8e4;hpb=20ef96d09cd596ca0f243f2e18a6766c93974674

diff --git a/src/casl2.c b/src/casl2.c
index 8ae3495..d75650d 100644
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -23,47 +23,14 @@ 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" },
-    { 102, "label table is full" },
-    { 103, "label not found" },
-    { 104, "label length is too long" },
-    { 105, "no command in the line" },
-    { 106, "operand count mismatch" },
-    { 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" },
-    { 114, "not integer" },
-    { 115, "not hex" },
-    { 116, "out of hex range" },
-    { 117, "operand is too many" },
-    { 118, "operand length is 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 },
+/* casl2のエラー定義 */
+CERR cerr_casl2[] = {
+    { 126, "source file is not specified" },
 };
+bool addcerrlist_casl2()
+{
+    return addcerrlist(sizeof(cerr_casl2), cerr_casl2);
+}
 
 /* 指定されたファイルにアセンブル結果を書込 */
 void outassemble(const char *file) {
@@ -72,7 +39,7 @@ void outassemble(const char *file) {
         perror(file);
         exit(-1);
     }
-    fwrite(memory, sizeof(WORD), endptr, fp);
+    fwrite(memory, sizeof(WORD), progprop->end, fp);
     fclose(fp);
 }
 
@@ -81,7 +48,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;
@@ -91,49 +58,53 @@ const char *objfile_name(const char *str)
 /* casl2コマンドのメイン */
 int main(int argc, char *argv[])
 {
-    int opt, i;
+    int opt, i, retval = 0;
     PASS pass;
     bool status = 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>] FILE ...\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':
-            (&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);
@@ -151,54 +122,62 @@ int main(int argc, char *argv[])
     }
     /* ソースファイルが指定されていない場合は終了 */
     if(argv[optind] == NULL) {
-        fprintf(stderr, "source file is not specified\n");
+        setcerr(126, NULL);    /* source file is not specified */
+        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();        /* 命令と命令タイプがキーのハッシュ表を作成 */
+            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)
+            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;
             }
         }
+        if(pass == SECOND) {
+            free_cmdtype_code();    /* 命令と命令タイプがキーのハッシュ表を解放 */
+            freelabel();            /* ラベルハッシュ表を解放 */
+        }
     }
-    freelabel();    /* ラベル表の解放 */
     if(status == true) {
         if(objfile != NULL) {
             outassemble(objfile);
         }
-        if((&asmode)->onlyassemble == false) {
-            exec();    /* プログラム実行 */
+        if(asmode.onlyassemble == false) {
+            create_code_type();    /* 命令と命令タイプがキーのハッシュ表を作成 */
+            status = exec();       /* プログラム実行 */
+            free_code_type();      /* 命令と命令タイプがキーのハッシュ表を解放 */
         }
     }
-    if(cerrno > 0) {
-        freecerr();
-        exit(-1);
+    /* COMET II仮想マシンのシャットダウン */
+    shutdown();
+    if(cerr->num > 0) {
+        retval = -1;
     }
-    return 0;
+    /* エラーの解放 */
+    freecerr();
+    return retval;
 }