X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fassemble.c;h=0bfc551cc88953f441dccec502c4a38716addf4e;hb=534506a757688db300328b7141bab4d6d0bd4e29;hp=74a6a75984066a8523566673e2f74c3e0c1377cf;hpb=295dbb72582804dbceaa8078c1abe574c9772002;p=YACASL2.git diff --git a/src/assemble.c b/src/assemble.c index 74a6a75..0bfc551 100644 --- a/src/assemble.c +++ b/src/assemble.c @@ -82,7 +82,7 @@ WORD getadr(const char *str, PASS pass) } else if(isdigit(*str) || *str == '-') { adr = getint(str); } else { - if(pass == SECOND && (adr = getlabel(str, prog)) == 0xFFFF) { + if(pass == SECOND && (adr = getlabel(prog, str)) == 0xFFFF) { setcerr(103, str); /* label not found */ } } @@ -164,7 +164,7 @@ void writeDC(const char *str, PASS pass) } else if(isdigit(*str) || *str == '-') { adr = getint(str); } else { - if(pass == SECOND && (adr = getlabel(str, prog)) == 0xFFFF) { + if(pass == SECOND && (adr = getlabel(prog, str)) == 0xFFFF) { setcerr(103, str); /* label not found */ } } @@ -209,7 +209,7 @@ bool assemblecmd(const CMDLINE *cmdl, PASS pass) prog = strdup(cmdl->label); /* オペランドがある場合、実行開始番地を設定 */ if(pass == SECOND && cmdl->opd->opdc == 1) { - if((startptr = getlabel(cmdl->opd->opdv[0], prog)) == 0xFFFF) { + if((startptr = getlabel(prog, cmdl->opd->opdv[0])) == 0xFFFF) { setcerr(103, cmdl->opd->opdv[0]); /* label not found */ } }