モードを構造体に記述するように内部構造を変更

[YACASL2.git] / src / assemble.c

diff --git a/src/assemble.c b/src/assemble.c
index 3297041..d46caef 100644 (file)
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -61,7 +61,7 @@ bool writememory(WORD word, WORD adr, PASS pass)
     }
     if(cerrno == 0) {
         memory[adr] = word;
-        if(pass == SECOND && asdetailmode == true) {
+        if(pass == SECOND && (&asmode)->asdetailmode == true) {
             fprintf(stdout, "\t#%04X\t#%04X\n", adr, word);
         }
         status = true;
@@ -409,7 +409,9 @@ bool assemble(const char *file, PASS pass)
             break;
         }
         lineno++;
-        if((pass == FIRST && srcmode == true) || (pass == SECOND && asdetailmode == true)) {
+        if((pass == FIRST && (&asmode)->srcmode == true) ||
+           (pass == SECOND && (&asmode)->asdetailmode == true))
+        {
             fprintf(stdout, "%s:%5d:%s", file, lineno, line);
         }
         if((cmdl = linetok(line)) != NULL) {