X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fassemble.c;h=d6cb4f226ed416326c4bad6f252c2b9b5a22efac;hp=563431c4086a112382858858265936f682054982;hb=a639337a9aa30a059c1695ab1701b8714fd26193;hpb=7f7bde5dd1305cfc598fe09030c69aad0dc01368

diff --git a/src/assemble.c b/src/assemble.c
index 563431c..d6cb4f2 100644
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -15,7 +15,7 @@ ASMODE asmode = {false, false, false, false, false};
 /**
  * アセンブルのプロパティ: ptr, lptr, *prog
  */
-ASPROP *asprop;
+ASPTR *asptr;
 
 /**
  * アセンブルのエラー定義
@@ -49,13 +49,13 @@ bool assemblecmd(const CMDLINE *cmdl, PASS pass);
 
 bool macrocmd(const CMDLINE *cmdl, PASS pass);
 
-bool writeIN(const char *ibuf, const char *len, PASS pass);
+void writeIN(const char *ibuf, const char *len, PASS pass);
 
-bool writeOUT(const char *obuf, const char *len, PASS pass);
+void writeOUT(const char *obuf, const char *len, PASS pass);
 
-bool writeRPUSH(PASS pass);
+void writeRPUSH(PASS pass);
 
-bool writeRPOP(PASS pass);
+void writeRPOP(PASS pass);
 
 bool cometcmd(const CMDLINE *cmdl, PASS pass);
 
@@ -65,7 +65,9 @@ void writestr(const char *str, bool literal, PASS pass);
 
 void writeDC(const char *str, PASS pass);
 
-bool assembleline(const CMDLINE *cmdl, PASS pass);
+bool assembletok(const CMDLINE *cmdl, PASS pass);
+
+bool assembleline(const char *line, PASS pass);
 
 void printline(FILE *stream, const char *filename, int lineno, char *line);
 
@@ -99,12 +101,12 @@ WORD getgr(const char *str, bool is_x)
  */
 WORD getliteral(const char *str, PASS pass)
 {
-    WORD adr = asprop->lptr;
+    WORD adr = asptr->lptr;
     assert(*str == '=');
     if(*(++str) == '\'') {    /* 文字定数 */
         writestr(str, true, pass);
     } else {
-        writememory(nh2word(str), (asprop->lptr)++, pass);
+        writememory(nh2word(str), (asptr->lptr)++, pass);
     }
     return adr;
 }
@@ -145,30 +147,31 @@ bool assemblecmd(const CMDLINE *cmdl, PASS pass)
             return false;
         }
         /* プログラム名の設定 */
-        asprop->prog = strdup_chk(cmdl->label, "asprop.prog");
+        asptr->prog = strdup_chk(cmdl->label, "asptr.prog");
         /* オペランドがある場合、実行開始番地を設定 */
         if(pass == SECOND && cmdl->opd->opdc == 1) {
-            if((prog->start = getlabel(asprop->prog, cmdl->opd->opdv[0])) == 0xFFFF) {
+            if((execptr->start = getlabel(asptr->prog, cmdl->opd->opdv[0])) == 0xFFFF) {
                 setcerr(103, cmdl->opd->opdv[0]);    /* label not found */
             }
         }
         status = true;
         break;
     case END:
-        /* リテラル領域の設定 */
+        /* 1回目のアセンブルの場合は、リテラル領域開始番地を設定 */
         if(pass == FIRST) {
-            asprop->lptr = asprop->ptr;
+            asptr->lptr = asptr->ptr;
         }
-        /* 実行終了番地と次のプログラムの実行開始番地を設定 */
+        /* 2回目のアセンブルの場合は、リテラル領域終了番地を実行終了番地として設定 */
         else if(pass == SECOND) {
-            prog->end = asprop->lptr;
+            execptr->end = asptr->lptr;
         }
-        asprop->prog = NULL;
+        /* プログラム名のクリア */
+        asptr->prog = NULL;
         status = true;
         break;
     case DS:
         for(i = 0; i < atoi(cmdl->opd->opdv[0]); i++) {
-            writememory(0x0, (asprop->ptr)++, pass);
+            writememory(0x0, (asptr->ptr)++, pass);
             if(cerr->num > 0) {
                 return false;
             }
@@ -202,8 +205,7 @@ bool macrocmd(const CMDLINE *cmdl, PASS pass)
 {
     int i = 0;
     MACROCMDID cmdid;
-    bool status = false;
-    MACROCMD macrocmd[] = {
+     MACROCMD macrocmd[] = {
         { IN, 2, 2, "IN" },
         { OUT, 2, 2, "OUT" },
         { RPUSH, 0, 0, "RPUSH" },
@@ -226,21 +228,20 @@ bool macrocmd(const CMDLINE *cmdl, PASS pass)
     switch(cmdid)
     {
     case IN:
-        status = writeIN(cmdl->opd->opdv[0], cmdl->opd->opdv[1], pass);
-        break;
+        writeIN(cmdl->opd->opdv[0], cmdl->opd->opdv[1], pass);
+        return true;
     case OUT:
-        status = writeOUT(cmdl->opd->opdv[0], cmdl->opd->opdv[1], pass);
-        break;
+        writeOUT(cmdl->opd->opdv[0], cmdl->opd->opdv[1], pass);
+        return true;
     case RPUSH:
-        status = writeRPUSH(pass);
-        break;
+        writeRPUSH(pass);
+        return true;
     case RPOP:
-        status = writeRPOP(pass);
-        break;
+        writeRPOP(pass);
+        return true;
     default:
         return false;
     }
-    return status;
 }
 
 /**
@@ -253,33 +254,21 @@ bool macrocmd(const CMDLINE *cmdl, PASS pass)
  *      POP GR2
  *      POP GR1
  */
-bool writeIN(const char *ibuf, const char *len, PASS pass)
+void writeIN(const char *ibuf, const char *len, PASS pass)
 {
-    bool status = false;
-
-    /* PUSH 0,GR1 */
-    writememory(0x7001, (asprop->ptr)++, pass);
-    writememory(0x0, (asprop->ptr)++, pass);
-    /* PUSH 0,GR2 */
-    writememory(0x7002, (asprop->ptr)++, pass);
-    writememory(0x0, (asprop->ptr)++, pass);
-    /* LAD GR1,IBUF */
-    writememory(0x1210, (asprop->ptr)++, pass);
-    writememory(getadr(asprop->prog, ibuf, pass), (asprop->ptr)++, pass);
-    /* LAD GR2,LEN */
-    writememory(0x1220, (asprop->ptr)++, pass);
-    writememory(getadr(asprop->prog, len, pass), (asprop->ptr)++, pass);
-    /* SVC 1 */
-    writememory(0xF000, (asprop->ptr)++, pass);
-    writememory(0x0001, (asprop->ptr)++, pass);
-    /* POP GR2 */
-    writememory(0x7120, (asprop->ptr)++, pass);
-    /* POP GR1 */
-    writememory(0x7110, (asprop->ptr)++, pass);
-    if(cerr->num == 0) {
-        status = true;
-    }
-    return status;
+    char *line = malloc_chk(LINESIZE+1, "writeIN.line");
+
+    assembleline("    PUSH 0,GR1", pass);
+    assembleline("    PUSH 0,GR2", pass);
+    sprintf(line, "    LAD GR1,%s", ibuf);
+    assembleline(line, pass);
+    sprintf(line, "    LAD GR2,%s", len);
+    assembleline(line, pass);
+    assembleline("    SVC 1", pass);
+    assembleline("    POP GR2", pass);
+    assembleline("    POP GR1", pass);
+
+    free_chk(line, "writeIN.line");
 }
 
 /**
@@ -290,57 +279,28 @@ bool writeIN(const char *ibuf, const char *len, PASS pass)
  *      LAD GR2,LEN
  *      SVC 2
  *      LAD GR1,=#A
- *      LAD GR2,1
+ *      LAD GR2,=1
  *      SVC 2
  *      POP GR2
  *      POP GR1
  */
-bool writeOUT(const char *obuf, const char *len, PASS pass)
+void writeOUT(const char *obuf, const char *len, PASS pass)
 {
-    bool status = false;
-
-    /* PUSH 0,GR1 */
-    writememory(0x7001, (asprop->ptr)++, pass);
-    writememory(0x0, (asprop->ptr)++, pass);
-    /* PUSH 0,GR2 */
-    writememory(0x7002, (asprop->ptr)++, pass);
-    writememory(0x0, (asprop->ptr)++, pass);
-    /* LAD GR1,OBUF */
-    writememory(0x1210, (asprop->ptr)++, pass);
-    writememory(getadr(asprop->prog, obuf, pass), (asprop->ptr)++, pass);
-    /* LAD GR2,OLEN */
-    writememory(0x1220, (asprop->ptr)++, pass);
-    writememory(getadr(asprop->prog, len, pass), (asprop->ptr)++, pass);
-    /* SVC 2 */
-    writememory(0xF000, (asprop->ptr)++, pass);
-    writememory(0x0002, (asprop->ptr)++, pass);
-    /* LAD GR1,=#A */
-    writememory(0x1210, (asprop->ptr)++, pass);
-    if(pass == FIRST) {
-        (asprop->ptr)++;
-    } else {
-        writememory(asprop->lptr, (asprop->ptr)++, pass);    /* リテラルのアドレスを書込 */
-    }
-    writememory(0xA, (asprop->lptr)++, pass);
-    /* LAD GR2,=1 */
-    writememory(0x1220, (asprop->ptr)++, pass);
-    if(pass == FIRST) {
-        (asprop->ptr)++;
-    } else {
-        writememory(asprop->lptr, (asprop->ptr)++, pass);    /* リテラルのアドレスを書込 */
-    }
-    writememory(0x1, (asprop->lptr)++, pass);
-    /* SVC 2 */
-    writememory(0xF000, (asprop->ptr)++, pass);
-    writememory(0x0002, (asprop->ptr)++, pass);
-    /* POP GR2 */
-    writememory(0x7120, (asprop->ptr)++, pass);
-    /* POP GR1 */
-    writememory(0x7110, (asprop->ptr)++, pass);
-    if(cerr->num == 0) {
-        status = true;
-    }
-    return status;
+    char *line = malloc_chk(LINESIZE+1, "writeOUT.line");
+
+    assembleline("    PUSH 0,GR1", pass);
+    assembleline("    PUSH 0,GR2", pass);
+    sprintf(line, "    LAD GR1,%s", obuf);
+    assembleline(line, pass);
+    sprintf(line, "    LAD GR2,%s", len);
+    assembleline(line, pass);
+    assembleline("    SVC 2", pass);
+    assembleline("    LAD GR1,=#A", pass);
+    assembleline("    LAD GR2,=1", pass);
+    assembleline("    SVC 2", pass);
+    assembleline("    POP GR2", pass);
+    assembleline("    POP GR1", pass);
+    free_chk(line, "writeOUT.line");
 }
 
 /** マクロ命令「RPUSH」をメモリに書き込む
@@ -352,19 +312,16 @@ bool writeOUT(const char *obuf, const char *len, PASS pass)
  *       PUSH 0,GR6
  *       PUSH 0,GR7
  */
-bool writeRPUSH(PASS pass)
+void writeRPUSH(PASS pass)
 {
     int i;
-    bool status = false;
+    char *line = malloc_chk(LINESIZE+1, "writeRPUSH.line");
 
-    for(i = 1; i <= 7; i++) {
-        writememory(0x7000 + i, (asprop->ptr)++, pass);   /* PUSH GRn */
-        writememory(0x0, (asprop->ptr)++, pass);
-    }
-    if(cerr->num == 0) {
-        status = true;
+    for(i = 1; i <= GRSIZE-1; i++) {
+        sprintf(line, "    PUSH 0,GR%d", i);
+        assembleline(line, pass);
     }
-    return status;
+    free_chk(line, "writeRPUSH.line");
 }
 
 /**
@@ -378,22 +335,21 @@ bool writeRPUSH(PASS pass)
  *      POP GR2
  *      POP GR1
  */
-bool writeRPOP(PASS pass)
+void writeRPOP(PASS pass)
 {
     int i;
-    bool status = false;
-    for(i = 7; i >= 1; i--) {
-        writememory((0x7100 + (i << 4)), (asprop->ptr)++, pass);  /* POP GRn */
-    }
-    if(cerr->num == 0) {
-        status = true;
+    char *line = malloc_chk(LINESIZE+1, "writeRPOP.line");
+
+    for(i = GRSIZE-1; i >= 1; i--) {
+        sprintf(line, "    POP GR%d", i);
+        assembleline(line, pass);
     }
-    return status;
+    free_chk(line, "writeRPOP.line");
 }
 
 /**
  * 機械語命令をメモリに書込
- * 書込に成功した場合はtrue、それ以外の場合はfalseを返す
+ * 書込に、成功した場合はtrue、失敗した場合はfalse、を返す
  */
 bool cometcmd(const CMDLINE *cmdl, PASS pass)
 {
@@ -406,7 +362,7 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
             setcerr(112, cmdl->cmd);    /* not command of no operand */
             return false;
         }
-        if(writememory(cmd, (asprop->ptr)++, pass) == true) {
+        if(writememory(cmd, (asptr->ptr)++, pass) == true) {
             status = true;
         }
     }
@@ -419,7 +375,7 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
                 return false;
             }
             cmd |= (r1 << 4);
-            if(writememory(cmd, (asprop->ptr)++, pass) == true) {
+            if(writememory(cmd, (asptr->ptr)++, pass) == true) {
                 status = true;
             }
         }
@@ -430,11 +386,11 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
                 return false;
             }
             cmd |= ((r1 << 4) | r2);
-            if(cerr->num == 0 && writememory(cmd, (asprop->ptr)++, pass) == true) {
+            if(cerr->num == 0 && writememory(cmd, (asptr->ptr)++, pass) == true) {
                 status = true;
             }
         }
-        /* オペランド数2〜3。第2オペランドはアドレス、 */
+        /* オペランド数2または3。第2オペランドはアドレス、 */
         /* 第3オペランドは指標レジスタとして用いる汎用レジスタ */
         else if(cmdl->opd->opdc == 2 || cmdl->opd->opdc == 3) {
             if((cmd = getcmdcode(cmdl->cmd, R_ADR_X_)) == 0xFFFF &&
@@ -452,9 +408,9 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
                 }
                 cmd |= x;
             }
-            adr = getadr(asprop->prog, cmdl->opd->opdv[1], pass);
-            writememory(cmd, (asprop->ptr)++, pass);
-            writememory(adr, (asprop->ptr)++, pass);
+            adr = getadr(asptr->prog, cmdl->opd->opdv[1], pass);
+            writememory(cmd, (asptr->ptr)++, pass);
+            writememory(adr, (asptr->ptr)++, pass);
             if(cerr->num == 0) {
                 status = true;
             }
@@ -463,7 +419,7 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
             return false;
         }
     }
-    /* オペランド数1〜2。第1オペランドはアドレス */
+    /* オペランド数1または2。第1オペランドはアドレス */
     else if(cmdl->opd->opdc == 1 || cmdl->opd->opdc == 2) {
         if((cmd = getcmdcode(cmdl->cmd, ADR_X)) == 0xFFFF) {
             setcerr(111, cmdl->cmd);    /* not command of operand "adr[,x]" */
@@ -484,10 +440,10 @@ bool cometcmd(const CMDLINE *cmdl, PASS pass)
             adr = getlabel(NULL, cmdl->opd->opdv[0]);
         }
         if(cmd != 0x8000 || (pass == SECOND && adr == 0xFFFF)) {
-            adr = getadr(asprop->prog, cmdl->opd->opdv[0], pass);
+            adr = getadr(asptr->prog, cmdl->opd->opdv[0], pass);
         }
-        writememory(cmd, (asprop->ptr)++, pass);
-        writememory(adr, (asprop->ptr)++, pass);
+        writememory(cmd, (asptr->ptr)++, pass);
+        writememory(adr, (asptr->ptr)++, pass);
         if(cerr->num == 0) {
             status = true;
         }
@@ -540,10 +496,10 @@ void writestr(const char *str, bool literal, PASS pass)
         }
         /*リテラルの場合はリテラル領域に書込 */
         if(literal == true) {
-            writememory(*(p++), (asprop->lptr)++, pass);
+            writememory(*(p++), (asptr->lptr)++, pass);
             lw = true;
         } else {
-            writememory(*(p++), (asprop->ptr)++, pass);
+            writememory(*(p++), (asptr->ptr)++, pass);
         }
     }
 }
@@ -560,18 +516,18 @@ void writeDC(const char *str, PASS pass)
         if(*str == '#' || isdigit(*str) || *str == '-') {
             adr = nh2word(str);
         } else {
-            if(pass == SECOND && (adr = getlabel(asprop->prog, str)) == 0xFFFF) {
+            if(pass == SECOND && (adr = getlabel(asptr->prog, str)) == 0xFFFF) {
                 setcerr(103, str);    /* label not found */
             }
         }
-        writememory(adr, (asprop->ptr)++, pass);
+        writememory(adr, (asptr->ptr)++, pass);
     }
 }
 
 /**
  * 1行をアセンブル
  */
-bool assembleline(const CMDLINE *cmdl, PASS pass)
+bool assembletok(const CMDLINE *cmdl, PASS pass)
 {
     bool status = false;
     /* 命令がない場合 */
@@ -632,6 +588,37 @@ WORD getadr(const char *prog, const char *str, PASS pass)
     return adr;
 }
 
+
+/**
+ * 1行をアセンブル
+ */
+bool assembleline(const char *line, PASS pass)
+{
+    CMDLINE *cmdl;
+
+    if((cmdl = linetok(line)) != NULL) {
+        if(pass == FIRST && cmdl->label != NULL) {
+            if(addlabel(asptr->prog, cmdl->label, asptr->ptr) == false) {
+                return false;
+            }
+        }
+        if(assembletok(cmdl, pass) == false) {
+            return false;
+        }
+    }
+    return true;
+}
+
+/**
+ * アセンブルのエラーをエラーリストに追加
+ */
+void addcerrlist_assemble()
+{
+    addcerrlist_tok();
+    addcerrlist_word();
+    addcerrlist(ARRAYSIZE(cerr_assemble), cerr_assemble);
+}
+
 /**
  * 指定された名前のファイルをアセンブル
  * 2回実行される
@@ -644,7 +631,6 @@ bool assemble(const char *file, PASS pass)
     char *line;
     FILE *fp;
 
-    addcerrlist(ARRAYSIZE(cerr_assemble), cerr_assemble);
     if((fp = fopen(file, "r")) == NULL) {
         perror(file);
         return false;
@@ -661,15 +647,8 @@ bool assemble(const char *file, PASS pass)
         {
             printline(stdout, file, lineno, line);
         }
-        if((cmdl = linetok(line)) != NULL) {
-            if(pass == FIRST && cmdl->label != NULL) {
-                if(addlabel(asprop->prog, cmdl->label, asprop->ptr) == false) {
-                    break;
-                }
-            }
-            if(assembleline(cmdl, pass) == false) {
-                break;
-            }
+        if(assembleline(line, pass) == false) {
+            break;
         }
         if(cerr->num > 0) {
             break;
@@ -697,6 +676,6 @@ void outassemble(const char *file)
         perror(file);
         exit(-1);
     }
-    fwrite(sys->memory, sizeof(WORD), prog->end, fp);
+    fwrite(sys->memory, sizeof(WORD), execptr->end, fp);
     fclose(fp);
 }