X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcasl2.c;h=d47abcd6375a80b1ba2a958c6ab75167e888979f;hp=03c61fc47cab12660682e77c95c2f4b0193a1a1f;hb=755c5127855b776d1a4260f05afc95640045f29d;hpb=e24285f0509319319aef28a188b7c01ba7e22bf1

diff --git a/src/casl2.c b/src/casl2.c
index 03c61fc..d47abcd 100644
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -23,43 +23,14 @@ static struct option longopts[] = {
     {0, 0, 0, 0},
 };
 
-/* エラー番号とエラーメッセージ */
-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" },
+/* casl2のエラー定義 */
+CERRARRAY cerr_casl2[] = {
     { 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" },
-    { 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 },
 };
+bool addcerrlist_casl2()
+{
+    return addcerrlist(sizeof(cerr_casl2), cerr_casl2);
+}
 
 /* 指定されたファイルにアセンブル結果を書込 */
 void outassemble(const char *file) {
@@ -93,7 +64,7 @@ int main(int argc, char *argv[])
     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";
 
     while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
         switch(opt) {
@@ -145,9 +116,12 @@ int main(int argc, char *argv[])
             exit(-1);
         }
     }
+
+    addcerrlist_casl2();
     /* ソースファイルが指定されていない場合は終了 */
     if(argv[optind] == NULL) {
         setcerr(126, NULL);    /* source file is not specified */
+        fprintf(stderr, "CASL2 error - %d: %s\n", cerrno, cerrmsg);
         goto casl2err;
     }
     /* COMET II仮想マシンのリセット */
@@ -170,7 +144,7 @@ int main(int argc, char *argv[])
                 fprintf(stdout, "\nAssemble %s (%d)\n", argv[i], pass);
             }
             if((status = assemble(argv[i], pass)) == false) {
-                exit(-1);
+                goto casl2err;
             }
         }
         if(pass == FIRST && asmode.label == true) {
@@ -181,7 +155,8 @@ int main(int argc, char *argv[])
             }
         }
     }
-    freelabel();    /* ラベル表の解放 */
+    free_cmdtype_code();    /* 命令表の解放 */
+    freelabel();            /* ラベル表の解放 */
     if(status == true) {
         if(objfile != NULL) {
             outassemble(objfile);
@@ -190,12 +165,12 @@ int main(int argc, char *argv[])
             exec();    /* プログラム実行 */
         }
     }
+    shutdown();
     if(cerrno > 0) {
-        freecerr();
-        exit(-1);
+        goto casl2err;
     }
     return 0;
 casl2err:
-    fprintf(stderr, "Casl2 error - %d: %s\n", cerrno, cerrmsg);
+    freecerr();
     exit(-1);
 }