X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fassemble.c;h=ee8449d0b33cfb6fee5048529994b2f56a63c510;hp=811f67000589002d288526a573db6d7d33f893c2;hb=b0f981469cdea23225ca5c3ef0ca6759d6a92b43;hpb=ed3225328d7bc0d718fc97dd0b05692b7287667b

diff --git a/src/assemble.c b/src/assemble.c
index 811f670..ee8449d 100644
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -1,6 +1,9 @@
 #include "casl2.h"
 #include "assemble.h"
 
+/* アセンブルモード: src, label, onlylabel, asdetail, onlyassemble */
+ASMODE asmode = {false, false, false, false, false};
+
 /* 値を格納するポインタ */
 WORD ptr;
 
@@ -10,6 +13,38 @@ WORD lptr;
 /* 他のプログラムで参照する入口名 */
 char *prog;
 
+
+/* アセンブルのエラー定義 */
+CERRARRAY cerr_assemble[] = {
+    { 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 COMET II command" },
+    { 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" },
+};
+
+bool addcerrlist_assemble()
+{
+    return addcerrlist(ARRAYSIZE(cerr_assemble), cerr_assemble);
+}
+
 /* 汎用レジスタを表す文字列「GR[0-7]」から、レジスタ番号[0-7]をWORD値で返す */
 /* 文字列が汎用レジスタを表さない場合は、0xFFFFを返す */
 /* is_xがtrueの場合は指標レジスタ。GR0は、COMET IIの仕様により、エラー発生 */
@@ -24,7 +59,7 @@ WORD getgr(const char *str, bool is_x)
         return 0xFFFF;
     }
     r = (WORD)(*(str+2) - '0');
-    /* 指標レジスタとして用いることはできない */
+    /* GR0は指標レジスタとして用いることができない */
     if(is_x == true && r == 0x0) {
         setcerr(120, NULL);    /* GR0 in operand x */
         return 0x0;
@@ -56,13 +91,14 @@ WORD getadr(const char *prog, const char *str, PASS pass)
 bool writememory(WORD word, WORD adr, PASS pass)
 {
     bool status = false;
+
     /* COMET IIメモリオーバーの場合 */
     if(adr >= memsize) {
         setcerr(119, word2n(adr));    /* out of COMET II memory */
     }
     if(cerrno == 0) {
         memory[adr] = word;
-        if(pass == SECOND && (&asmode)->asdetail == true) {
+        if(pass == SECOND && asmode.asdetail == true) {
             fprintf(stdout, "\t#%04X\t#%04X\n", adr, word);
         }
         status = true;
@@ -95,7 +131,7 @@ void writestr(const char *str, bool literal, PASS pass)
     for(; ;) {
         /* 閉じ「'」がないまま文字列が終了した場合 */
         if(*p == '\0') {
-            setcerr(123, str);    /* illegal string */
+            setcerr(123, str);    /* unclosed quote */
             break;
         }
         /* 「'」の場合、次の文字が「'」でない場合は正常終了 */
@@ -143,7 +179,7 @@ bool assemblecmd(const CMDLINE *cmdl, PASS pass)
     CMDARRAY ascmd[] = {
         { START, 0, 1, "START" },
         { END, 0, 0, "END" },
-        { DC, 0, OPDSIZE, "DC" },
+        { DC, 1, OPDSIZE, "DC" },
         { DS, 1, 1, "DS" },
         { 0, 0, 0, NULL }
     };
@@ -314,6 +350,7 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
             /* オペランド数3 */
             if(cmdl->opd->opdc == 3) {
                 if((x = getgr(cmdl->opd->opdv[2], true)) == 0xFFFF) {
+                    setcerr(125, cmdl->cmd);    /* not GR in operand x */
                     return false;
                 }
                 cmd |= x;
@@ -325,7 +362,7 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
                 status = true;
             }
         } else {
-            setcerr(113, cmdl->cmd);    /* command not defined */
+            setcerr(113, cmdl->cmd);    /* operand too many in COMET II command */
             return false;
         }
     }
@@ -385,7 +422,7 @@ bool assembleline(const CMDLINE *cmdl, PASS pass)
         ;
     }
     else if(cerrno == 0) {
-        setcerr(113, cmdl->cmd);    /* command not defined */
+        setcerr(113, cmdl->cmd);    /* operand too many in COMET II command */
     }
     /* エラーが発生していないか確認 */
     if(cerrno == 0) {
@@ -394,6 +431,10 @@ bool assembleline(const CMDLINE *cmdl, PASS pass)
     return status;
 }
 
+void printline(FILE *stream, const char *filename, int lineno, char *line) {
+    fprintf(stream, "%s:%5d:%s", filename, lineno, line);
+}
+
 /* 指定された名前のファイルをアセンブル */
 /* 2回実行される */
 bool assemble(const char *file, PASS pass)
@@ -404,24 +445,22 @@ bool assemble(const char *file, PASS pass)
     char *line;
     FILE *fp;
 
-    if(create_cmdtype_code() == false) {
-        return false;
-    }
+    addcerrlist_assemble();
     if((fp = fopen(file, "r")) == NULL) {
         perror(file);
         return false;
     }
     for(; ;) {
         cmdl = malloc(sizeof(CMDLINE));
-        line = malloc(LINESIZE+1);
+        line = malloc(LINESIZE + 1);
         if((line = fgets(line, LINESIZE, fp)) == NULL) {
             break;
         }
         lineno++;
-        if((pass == FIRST && (&asmode)->src == true) ||
-           (pass == SECOND && (&asmode)->asdetail == true))
+        if((pass == FIRST && asmode.src == true) ||
+           (pass == SECOND && asmode.asdetail == true))
         {
-            fprintf(stdout, "%s:%5d:%s", file, lineno, line);
+            printline(stdout, file, lineno, line);
         }
         if((cmdl = linetok(line)) != NULL) {
             if(pass == FIRST && cmdl->label != NULL) {
@@ -438,7 +477,8 @@ bool assemble(const char *file, PASS pass)
         }
     }
     if(cerrno > 0) {
-        fprintf(stderr, "Assemble error - %d: %s\n %s:%d: %s\n", cerrno, cerrmsg, file, lineno, line);
+        fprintf(stderr, "Assemble error - %d: %s\n", cerrno, cerrmsg);
+        printline(stderr, file, lineno, line);
         status = false;
     }
     fclose(fp);