X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fassemble.c;h=35c3e9f15a15e897583f38e751a877dcf906d4a7;hp=c86334f6df104bf9554ca5462c2b95601804e0e0;hb=8775c998e3144243a87b3a574a1afae087dec54c;hpb=4866d13fcff241efb18d16b33fb007c5beed21de

diff --git a/src/assemble.c b/src/assemble.c
index c86334f..35c3e9f 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;
 
 /**
  * アセンブルのエラー定義
@@ -101,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;
 }
@@ -147,31 +147,30 @@ 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回目のアセンブルの場合は、リテラル領域開始番地を設定 */
+        /* 1回目のアセンブルの場合は、リテラル領域開始アドレスを設定 */
         if(pass == FIRST) {
-            asprop->lptr = asprop->ptr;
+            asptr->lptr = asptr->ptr;
         }
-        /* 2回目のアセンブルの場合は、リテラル領域終了番地を実行終了番地として設定 */
+        /* 2回目のアセンブルの場合は、リテラル領域終了アドレスを実行終了アドレスとして設定 */
         else if(pass == SECOND) {
-            prog->end = asprop->lptr;
+            execptr->end = asptr->lptr;
         }
-        /* プログラム名のクリア */
-        asprop->prog = NULL;
+        FREE(asptr->prog);
         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;
             }
@@ -204,7 +203,7 @@ bool assemblecmd(const CMDLINE *cmdl, PASS pass)
 bool macrocmd(const CMDLINE *cmdl, PASS pass)
 {
     int i = 0;
-    MACROCMDID cmdid;
+    MACROCMDID cmdid = 0;
      MACROCMD macrocmd[] = {
         { IN, 2, 2, "IN" },
         { OUT, 2, 2, "OUT" },
@@ -268,7 +267,7 @@ void writeIN(const char *ibuf, const char *len, PASS pass)
     assembleline("    POP GR2", pass);
     assembleline("    POP GR1", pass);
 
-    free_chk(line, "writeIN.line");
+    FREE(line);
 }
 
 /**
@@ -300,7 +299,7 @@ void writeOUT(const char *obuf, const char *len, PASS pass)
     assembleline("    SVC 2", pass);
     assembleline("    POP GR2", pass);
     assembleline("    POP GR1", pass);
-    free_chk(line, "writeOUT.line");
+    FREE(line);
 }
 
 /** マクロ命令「RPUSH」をメモリに書き込む
@@ -321,7 +320,7 @@ void writeRPUSH(PASS pass)
         sprintf(line, "    PUSH 0,GR%d", i);
         assembleline(line, pass);
     }
-    free_chk(line, "writeRPUSH.line");
+    FREE(line);
 }
 
 /**
@@ -344,7 +343,7 @@ void writeRPOP(PASS pass)
         sprintf(line, "    POP GR%d", i);
         assembleline(line, pass);
     }
-    free_chk(line, "writeRPOP.line");
+    FREE(line);
 }
 
 /**
@@ -362,7 +361,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;
         }
     }
@@ -375,7 +374,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;
             }
         }
@@ -386,7 +385,7 @@ 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;
             }
         }
@@ -408,9 +407,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;
             }
@@ -440,10 +439,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;
         }
@@ -496,10 +495,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);
         }
     }
 }
@@ -516,26 +515,24 @@ 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 assembletok(const CMDLINE *cmdl, PASS pass)
 {
     bool status = false;
+
     /* 命令がない場合 */
     if(cmdl->cmd == NULL){
-        /* ラベルが定義されていて命令がない場合はエラー */
-        if(cmdl->label != NULL) {
-            setcerr(105, NULL);    /* no command in the line */
-        }
+        ;
     }
     /* アセンブラ命令の処理 */
     else if(cerr->num == 0 && assemblecmd(cmdl, pass) == true) {
@@ -595,18 +592,42 @@ WORD getadr(const char *prog, const char *str, PASS pass)
 bool assembleline(const char *line, PASS pass)
 {
     CMDLINE *cmdl;
+    bool status = true;
+    int i;
 
-    if((cmdl = linetok(line)) != NULL) {
-        if(pass == FIRST && cmdl->label != NULL) {
-            if(addlabel(asprop->prog, cmdl->label, asprop->ptr) == false) {
-                return false;
+    cmdl = linetok(line);
+    status = (cerr->num == 0) ? true : false;
+    if(cmdl != NULL) {
+        if(status == true) {
+            if(pass == FIRST && cmdl->label != NULL) {
+                status = addlabel(asptr->prog, cmdl->label, asptr->ptr);
+            }
+            if(status == true) {
+                status = assembletok(cmdl, pass);
             }
+            FREE(cmdl->label);
         }
-        if(assembletok(cmdl, pass) == false) {
-            return false;
+        if(cmdl->opd != NULL) {
+            for(i = 0; i < cmdl->opd->opdc; i++) {
+                FREE(cmdl->opd->opdv[i]);
+            }
         }
+        FREE(cmdl->opd);
+        FREE(cmdl->cmd);
     }
-    return true;
+    FREE(cmdl);
+    return status;
+}
+
+/**
+ * アセンブルのエラーをエラーリストに追加
+ */
+void addcerrlist_assemble()
+{
+    addcerrlist_tok();
+    addcerrlist_word();
+    addcerrlist_label();
+    addcerrlist(ARRAYSIZE(cerr_assemble), cerr_assemble);
 }
 
 /**
@@ -617,21 +638,14 @@ bool assemble(const char *file, PASS pass)
 {
     int lineno = 0;
     bool status = true;
-    CMDLINE *cmdl;
-    char *line;
+    char *line = malloc_chk(LINESIZE + 1, "line");
     FILE *fp;
 
-    addcerrlist(ARRAYSIZE(cerr_assemble), cerr_assemble);
     if((fp = fopen(file, "r")) == NULL) {
         perror(file);
         return false;
     }
-    for(; ;) {
-        cmdl = malloc_chk(sizeof(CMDLINE), "cmdl");
-        line = malloc_chk(LINESIZE + 1, "line");
-        if((line = fgets(line, LINESIZE, fp)) == NULL) {
-            break;
-        }
+    while(fgets(line, LINESIZE, fp)) {
         lineno++;
         if((pass == FIRST && asmode.src == true) ||
            (pass == SECOND && asmode.asdetail == true))
@@ -641,17 +655,13 @@ bool assemble(const char *file, PASS pass)
         if(assembleline(line, pass) == false) {
             break;
         }
-        if(cerr->num > 0) {
-            break;
-        }
-        free_chk(line, "line");
-        free_chk(cmdl, "cmdl");
     }
     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;
 }
@@ -667,6 +677,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);
 }