X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fassemble.c;h=8c1c436a4ef0d0255deb25e760f9a76d5179a438;hb=4c1bb1f12ad0f10aafbdaa59fbc43247784e5096;hp=0e29454e5f4224f04bc9c46f9d821dcce3d7e48f;hpb=6eb54846c27b216d7602a5107d9383f8f4324d71;p=YACASL2.git

diff --git a/src/assemble.c b/src/assemble.c
index 0e29454..8c1c436 100644
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -13,7 +13,7 @@
 ASMODE asmode = {false, false, false, false, false};
 
 /**
- * アセンブルのプロパティ: ptr, lptr, *prog
+ * アセンブル時の、現在およびリテラルのアドレスとプログラム入口名: ptr, lptr, prog
  */
 ASPTR *asptr;
 
@@ -59,7 +59,7 @@ void writeRPOP(PASS pass);
 
 bool cometcmd(const CMDLINE *cmdl, PASS pass);
 
-bool writememory(WORD word, WORD adr, PASS pass);
+void writememory(WORD word, WORD adr, PASS pass);
 
 void writestr(const char *str, bool literal, PASS pass);
 
@@ -80,6 +80,7 @@ WORD getgr(const char *str, bool is_x)
 {
     assert(str != NULL);
     WORD r;
+
     /* 「GR[0-7]」以外の文字列では、0xFFFFを返して終了 */
     if(!(strlen(str) == 3 && strncmp(str, "GR", 2) == 0 &&
          (*(str+2) >= '0' && *(str+2) <= '0' + (GRSIZE - 1))))
@@ -101,8 +102,9 @@ WORD getgr(const char *str, bool is_x)
  */
 WORD getliteral(const char *str, PASS pass)
 {
-    WORD adr = asptr->lptr;
     assert(*str == '=');
+    WORD adr = asptr->lptr;
+
     if(*(++str) == '\'') {    /* 文字定数 */
         writestr(str, true, pass);
     } else {
@@ -119,7 +121,6 @@ bool assemblecmd(const CMDLINE *cmdl, PASS pass)
 {
     int i = 0;
     ASCMDID cmdid = 0;
-    bool status = false;
     ASCMD ascmd[] = {
         { START, 0, 1, "START" },
         { END, 0, 0, "END" },
@@ -154,7 +155,6 @@ bool assemblecmd(const CMDLINE *cmdl, PASS pass)
                 setcerr(103, cmdl->opd->opdv[0]);    /* label not found */
             }
         }
-        status = true;
         break;
     case END:
         /* 1回目のアセンブルの場合は、リテラル領域開始アドレスを設定 */
@@ -166,33 +166,27 @@ bool assemblecmd(const CMDLINE *cmdl, PASS pass)
             execptr->end = asptr->lptr;
         }
         FREE(asptr->prog);
-        status = true;
         break;
     case DS:
         for(i = 0; i < atoi(cmdl->opd->opdv[0]); i++) {
             writememory(0x0, (asptr->ptr)++, pass);
             if(cerr->num > 0) {
-                return false;
+                break;
             }
         }
-        status = true;
         break;
     case DC:
         for(i = 0; i < cmdl->opd->opdc; i++) {
             writeDC(cmdl->opd->opdv[i], pass);
             if(cerr->num > 0) {
-                return false;
+                break;
             }
         }
-        status = true;
         break;
     default:
         return false;
     }
-    if(cerr->num > 0) {
-        status = false;
-    }
-    return status;
+    return (cerr->num == 0) ? true : false;
 }
 
 /**
@@ -204,7 +198,7 @@ bool macrocmd(const CMDLINE *cmdl, PASS pass)
 {
     int i = 0;
     MACROCMDID cmdid = 0;
-     MACROCMD macrocmd[] = {
+    MACROCMD macrocmd[] = {
         { IN, 2, 2, "IN" },
         { OUT, 2, 2, "OUT" },
         { RPUSH, 0, 0, "RPUSH" },
@@ -255,7 +249,7 @@ bool macrocmd(const CMDLINE *cmdl, PASS pass)
  */
 void writeIN(const char *ibuf, const char *len, PASS pass)
 {
-    char *line = malloc_chk(LINESIZE+1, "writeIN.line");
+    char *line = malloc_chk(LINESIZE + 1, "writeIN.line");
 
     assembleline("    PUSH 0,GR1", pass);
     assembleline("    PUSH 0,GR2", pass);
@@ -285,7 +279,7 @@ void writeIN(const char *ibuf, const char *len, PASS pass)
  */
 void writeOUT(const char *obuf, const char *len, PASS pass)
 {
-    char *line = malloc_chk(LINESIZE+1, "writeOUT.line");
+    char *line = malloc_chk(LINESIZE + 1, "writeOUT.line");
 
     assembleline("    PUSH 0,GR1", pass);
     assembleline("    PUSH 0,GR2", pass);
@@ -314,7 +308,7 @@ void writeOUT(const char *obuf, const char *len, PASS pass)
 void writeRPUSH(PASS pass)
 {
     int i;
-    char *line = malloc_chk(LINESIZE+1, "writeRPUSH.line");
+    char *line = malloc_chk(LINESIZE + 1, "writeRPUSH.line");
 
     for(i = 1; i <= GRSIZE-1; i++) {
         sprintf(line, "    PUSH 0,GR%d", i);
@@ -337,7 +331,7 @@ void writeRPUSH(PASS pass)
 void writeRPOP(PASS pass)
 {
     int i;
-    char *line = malloc_chk(LINESIZE+1, "writeRPOP.line");
+    char *line = malloc_chk(LINESIZE + 1, "writeRPOP.line");
 
     for(i = GRSIZE-1; i >= 1; i--) {
         sprintf(line, "    POP GR%d", i);
@@ -352,8 +346,7 @@ void writeRPOP(PASS pass)
  */
 bool cometcmd(const CMDLINE *cmdl, PASS pass)
 {
-    WORD cmd, adr, r1, r2, x;
-    bool status = false;
+    WORD cmd, r_r1, x_r2, adr;
 
     /* オペランドなし */
     if(cmdl->opd->opdc == 0) {
@@ -361,58 +354,48 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
             setcerr(112, cmdl->cmd);    /* not command of no operand */
             return false;
         }
-        if(writememory(cmd, (asptr->ptr)++, pass) == true) {
-            status = true;
-        }
+        writememory(cmd, (asptr->ptr)++, pass);
     }
     /* 第1オペランドは汎用レジスタ */
-    else if((r1 = getgr(cmdl->opd->opdv[0], false)) != 0xFFFF) {
+    else if((r_r1 = getgr(cmdl->opd->opdv[0], false)) != 0xFFFF) {
         /* オペランド数1 */
         if(cmdl->opd->opdc == 1) {
             if((cmd = getcmdcode(cmdl->cmd, R_)) == 0xFFFF) {
                 setcerr(108, cmdl->cmd);    /* not command of operand "r" */
                 return false;
             }
-            cmd |= (r1 << 4);
-            if(writememory(cmd, (asptr->ptr)++, pass) == true) {
-                status = true;
-            }
+            cmd |= (r_r1 << 4);
+            writememory(cmd, (asptr->ptr)++, pass);
         }
         /* オペランド数2。第2オペランドは汎用レジスタ */
-        else if(cmdl->opd->opdc == 2 && (r2 = getgr(cmdl->opd->opdv[1], false)) != 0xFFFF) {
+        else if(cmdl->opd->opdc == 2 && (x_r2 = getgr(cmdl->opd->opdv[1], false)) != 0xFFFF) {
             if((cmd = getcmdcode(cmdl->cmd, R1_R2)) == 0xFFFF) {
                 setcerr(109, cmdl->cmd);    /* not command of operand "r1,r2" */
                 return false;
             }
-            cmd |= ((r1 << 4) | r2);
-            if(cerr->num == 0 && writememory(cmd, (asptr->ptr)++, pass) == true) {
-                status = true;
-            }
+            cmd |= ((r_r1 << 4) | x_r2);               /* 第1オペランド、第2オペランドともに汎用レジスタ */
+            /* メモリへの書き込み */
+            writememory(cmd, (asptr->ptr)++, pass);
         }
-        /* オペランド数2または3。第2オペランドはアドレス、 */
-        /* 第3オペランドは指標レジスタとして用いる汎用レジスタ */
+        /* オペランド数2または3 */
         else if(cmdl->opd->opdc == 2 || cmdl->opd->opdc == 3) {
-            if((cmd = getcmdcode(cmdl->cmd, R_ADR_X_)) == 0xFFFF &&
-               (cmd = getcmdcode(cmdl->cmd, R_ADR_X)) == 0xFFFF)
-            {
+            if((cmd = getcmdcode(cmdl->cmd, R_ADR_X)) == 0xFFFF) {
                 setcerr(110, cmdl->cmd);    /* not command of operand "r,adr[,x]" */
                 return false;
             }
-            cmd |= (r1 << 4);
-            /* オペランド数3 */
-            if(cmdl->opd->opdc == 3) {
-                if((x = getgr(cmdl->opd->opdv[2], true)) == 0xFFFF) {
+            cmd |= (r_r1 << 4);                    /* 第1オペランドは汎用レジスタ */
+            /* オペランド数3の場合 */
+            if(cmdl->opd->opdc == 3) {             /* 第3オペランドは指標レジスタとして用いる汎用レジスタ */
+                if((x_r2 = getgr(cmdl->opd->opdv[2], true)) == 0xFFFF) {
                     setcerr(125, cmdl->cmd);    /* not GR in operand x */
                     return false;
                 }
-                cmd |= x;
+                cmd |= x_r2;
             }
-            adr = getadr(asptr->prog, cmdl->opd->opdv[1], pass);
+            adr = getadr(asptr->prog, cmdl->opd->opdv[1], pass); /* 第2オペランドはアドレス */
+            /* メモリへの書き込み */
             writememory(cmd, (asptr->ptr)++, pass);
             writememory(adr, (asptr->ptr)++, pass);
-            if(cerr->num == 0) {
-                status = true;
-            }
         } else {
             setcerr(113, cmdl->cmd);    /* operand too many in COMET II command */
             return false;
@@ -424,13 +407,13 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
             setcerr(111, cmdl->cmd);    /* not command of operand "adr[,x]" */
             return false;
         }
-        /* オペランド数2の場合、第2オペランドは指標レジスタとして用いる汎用レジスタ */
-        if(cmdl->opd->opdc == 2) {
-            x = getgr(cmdl->opd->opdv[1], true);
+        /* オペランド数2の場合 */
+        if(cmdl->opd->opdc == 2) {             /* 第2オペランドは指標レジスタとして用いる汎用レジスタ */
+            x_r2 = getgr(cmdl->opd->opdv[1], true);
             if(cerr->num > 0) {
                 return false;
             }
-            cmd |= x;
+            cmd |= x_r2;
         }
         /* CALLの場合はプログラムの入口名を表すラベルを取得 */
         /* CALL以外の命令の場合と、プログラムの入口名を取得できない場合は、 */
@@ -441,34 +424,27 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
         if(cmd != 0x8000 || (pass == SECOND && adr == 0xFFFF)) {
             adr = getadr(asptr->prog, cmdl->opd->opdv[0], pass);
         }
+        /* メモリへの書き込み */
         writememory(cmd, (asptr->ptr)++, pass);
         writememory(adr, (asptr->ptr)++, pass);
-        if(cerr->num == 0) {
-            status = true;
-        }
     }
-    return status;
+    return (cerr->num == 0) ? true : false;
 }
 
 /**
  * COMET IIのメモリにアドレス値を書き込む
  */
-bool writememory(WORD word, WORD adr, PASS pass)
+void writememory(WORD word, WORD adr, PASS pass)
 {
-    bool status = false;
-
-    /* COMET IIメモリオーバーの場合 */
+    /* COMET IIメモリオーバーの場合、エラー発生 */
     if(adr >= sys->memsize) {
         setcerr(119, word2n(adr));    /* out of COMET II memory */
+        return;
     }
-    if(cerr->num == 0) {
-        (sys->memory)[adr] = word;
-        if(pass == SECOND && asmode.asdetail == true) {
-            fprintf(stdout, "\t#%04X\t#%04X\n", adr, word);
-        }
-        status = true;
+    (sys->memory)[adr] = word;
+    if(pass == SECOND && asmode.asdetail == true) {
+        fprintf(stdout, "\t#%04X\t#%04X\n", adr, word);
     }
-    return status;
 }
 
 /**
@@ -476,7 +452,7 @@ bool writememory(WORD word, WORD adr, PASS pass)
  */
 void writestr(const char *str, bool literal, PASS pass)
 {
-    assert(cerr->num == 0 && *str == '\'');
+    assert(*str == '\'');
     const char *p = str + 1;
     bool lw = false;
 
@@ -509,6 +485,7 @@ void writestr(const char *str, bool literal, PASS pass)
 void writeDC(const char *str, PASS pass)
 {
     WORD adr = 0x0;
+
     if(*str == '\'') {
         writestr(str, false, pass);
     } else {
@@ -571,6 +548,7 @@ void printline(FILE *stream, const char *filename, int lineno, char *line)
 WORD getadr(const char *prog, const char *str, PASS pass)
 {
     WORD adr = 0x0;
+
     if(*str == '=') {
         adr = getliteral(str, pass);
     } else if(isdigit(*str) || *str == '-' || *str == '#') {
@@ -588,22 +566,23 @@ WORD getadr(const char *prog, const char *str, PASS pass)
 
 /**
  * 1行をアセンブル
+ * passが1の場合はラベルを登録し、2の場合はラベルからアドレスを読み込む
  */
 bool assembleline(const char *line, PASS pass)
 {
     CMDLINE *cmdl;
-    bool status = true;
+    bool stat = true;
     int i;
 
     cmdl = linetok(line);
-    status = (cerr->num == 0) ? true : false;
+    stat = (cerr->num == 0) ? true : false;
     if(cmdl != NULL) {
-        if(status == true) {
+        if(stat == true) {
             if(pass == FIRST && cmdl->label != NULL) {
-                status = addlabel(asptr->prog, cmdl->label, asptr->ptr);
+                stat = addlabel(asptr->prog, cmdl->label, asptr->ptr);
             }
-            if(status == true) {
-                status = assembletok(cmdl, pass);
+            if(stat == true) {
+                stat = assembletok(cmdl, pass);
             }
             FREE(cmdl->label);
         }
@@ -616,7 +595,7 @@ bool assembleline(const char *line, PASS pass)
         FREE(cmdl->cmd);
     }
     FREE(cmdl);
-    return status;
+    return stat;
 }
 
 /**
@@ -626,29 +605,26 @@ void addcerrlist_assemble()
 {
     addcerrlist_tok();
     addcerrlist_word();
+    addcerrlist_label();
     addcerrlist(ARRAYSIZE(cerr_assemble), cerr_assemble);
 }
 
 /**
  * 指定された名前のファイルをアセンブル
- * 2回実行される
+ * アセンブル完了時はtrue、エラー発生時はfalseを返す
  */
-bool assemble(const char *file, PASS pass)
+bool assemblefile(const char *file, PASS pass)
 {
-    int lineno = 0;
-    bool status = true;
-    char *line = malloc_chk(LINESIZE + 1, "line");
+    int lineno = 1;
+    char *line;
     FILE *fp;
 
     if((fp = fopen(file, "r")) == NULL) {
         perror(file);
         return false;
     }
-    while(fgets(line, LINESIZE, fp)) {
-        lineno++;
-        if((pass == FIRST && asmode.src == true) ||
-           (pass == SECOND && asmode.asdetail == true))
-        {
+    for(line = malloc_chk(LINESIZE + 1, "assemble.line"); fgets(line, LINESIZE, fp); lineno++) {
+        if((pass == FIRST && asmode.src == true) || (pass == SECOND && asmode.asdetail == true)) {
             printline(stdout, file, lineno, line);
         }
         if(assembleline(line, pass) == false) {
@@ -658,11 +634,10 @@ bool assemble(const char *file, PASS pass)
     if(cerr->num > 0) {
         fprintf(stderr, "Assemble error - %d: %s\n", cerr->num, cerr->msg);
         printline(stderr, file, lineno, line);
-        status = false;
     }
     FREE(line);
     fclose(fp);
-    return status;
+    return (cerr->num == 0) ? true : false;
 }
 
 /**