ASMODE asmode = {false, false, false, false, false};
/**
- * アセンブルのプロパティ: ptr, lptr, *prog
+ * アセンブル時の、現在およびリテラルのアドレスとプログラム入口名: ptr, lptr, prog
*/
-ASPROP *asprop;
+ASPTR *asptr;
/**
* アセンブルのエラー定義
{
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))))
*/
WORD getliteral(const char *str, PASS pass)
{
- WORD adr = asprop->lptr;
assert(*str == '=');
+ WORD adr = asptr->lptr;
+
if(*(++str) == '\'') { /* 文字定数 */
writestr(str, true, pass);
} else {
- writememory(nh2word(str), (asprop->lptr)++, pass);
+ writememory(nh2word(str), (asptr->lptr)++, pass);
}
return adr;
}
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;
}
bool macrocmd(const CMDLINE *cmdl, PASS pass)
{
int i = 0;
- MACROCMDID cmdid;
- MACROCMD macrocmd[] = {
+ MACROCMDID cmdid = 0;
+ MACROCMD macrocmd[] = {
{ IN, 2, 2, "IN" },
{ OUT, 2, 2, "OUT" },
{ RPUSH, 0, 0, "RPUSH" },
*/
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);
assembleline(" POP GR2", pass);
assembleline(" POP GR1", pass);
- free_chk(line, "writeIN.line");
+ FREE(line);
}
/**
*/
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);
assembleline(" SVC 2", pass);
assembleline(" POP GR2", pass);
assembleline(" POP GR1", pass);
- free_chk(line, "writeOUT.line");
+ FREE(line);
}
/** マクロ命令「RPUSH」をメモリに書き込む
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);
assembleline(line, pass);
}
- free_chk(line, "writeRPUSH.line");
+ FREE(line);
}
/**
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);
assembleline(line, pass);
}
- free_chk(line, "writeRPOP.line");
+ FREE(line);
}
/**
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;
}
}
return false;
}
cmd |= (r1 << 4);
- if(writememory(cmd, (asprop->ptr)++, pass) == true) {
+ if(writememory(cmd, (asptr->ptr)++, pass) == true) {
status = true;
}
}
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オペランドはアドレス、 */
/* 第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 |= 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;
}
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;
}
*/
void writestr(const char *str, bool literal, PASS pass)
{
- assert(cerr->num == 0 && *str == '\'');
+ assert(*str == '\'');
const char *p = str + 1;
bool lw = false;
}
/*リテラルの場合はリテラル領域に書込 */
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);
}
}
}
void writeDC(const char *str, PASS pass)
{
WORD adr = 0x0;
+
if(*str == '\'') {
writestr(str, false, pass);
} else {
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) {
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 == '#') {
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;
}
/**
{
addcerrlist_tok();
addcerrlist_word();
+ addcerrlist_label();
addcerrlist(ARRAYSIZE(cerr_assemble), cerr_assemble);
}
/**
* 指定された名前のファイルをアセンブル
- * 2回実行される
+ * 1回目ではラベルを登録し、2回目ではラベルからアドレスを読み込む
+ * アセンブル完了時はtrue、エラー発生時はfalseを返す
*/
-bool assemble(const char *file, PASS pass)
+bool assemblefile(const char *file, PASS pass)
{
int lineno = 0;
- bool status = true;
- CMDLINE *cmdl;
char *line;
FILE *fp;
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;
- }
+ line = malloc_chk(LINESIZE + 1, "assemble.line");
+ while(fgets(line, LINESIZE, fp)) {
lineno++;
if((pass == FIRST && asmode.src == true) ||
(pass == SECOND && asmode.asdetail == true))
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;
+ return (cerr->num == 0) ? true : false;
}
/**
perror(file);
exit(-1);
}
- fwrite(sys->memory, sizeof(WORD), prog->end, fp);
+ fwrite(sys->memory, sizeof(WORD), execptr->end, fp);
fclose(fp);
}
projects / YACASL2.git / blobdiff