projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefileを修正
[YACASL2.git]
/
src
/
assemble.c
diff --git
a/src/assemble.c
b/src/assemble.c
index
989173f
..
9227114
100644
(file)
--- a/
src/assemble.c
+++ b/
src/assemble.c
@@
-82,7
+82,7
@@
static CMD ascmd[] = {
{ "END", assemble_end },
{ "DS", assemble_ds },
{ "DC", assemble_dc },
{ "END", assemble_end },
{ "DS", assemble_ds },
{ "DC", assemble_dc },
- {
NULL
, NULL }
+ {
""
, NULL }
};
/**
};
/**
@@
-93,7
+93,7
@@
static CMD macrocmd[] = {
{ "IN", assemble_in },
{ "RPUSH", assemble_rpush },
{ "RPOP", assemble_rpop },
{ "IN", assemble_in },
{ "RPUSH", assemble_rpush },
{ "RPOP", assemble_rpop },
- {
NULL
, NULL }
+ {
""
, NULL }
};
/**
};
/**
@@
-128,8
+128,8
@@
WORD getadr(const char *prog, const char *str, PASS pass)
} else if(isdigit(*str) || *str == '-' || *str == '#') {
adr = nh2word(str);
} else {
} else if(isdigit(*str) || *str == '-' || *str == '#') {
adr = nh2word(str);
} else {
- if(pass == SECOND
&& (adr = getlabel(prog, str)) == 0xFFFF
) {
- if(
prog != NULL
) {
+ if(pass == SECOND) {
+ if(
(adr = getlabel(prog, str)) == 0xFFFF
) {
setcerr(103, str); /* label not found */
}
}
setcerr(103, str); /* label not found */
}
}
@@
-144,7
+144,6
@@
WORD getadr(const char *prog, const char *str, PASS pass)
*/
WORD getgr(const char *str, bool is_x)
{
*/
WORD getgr(const char *str, bool is_x)
{
- assert(str != NULL);
WORD r;
/* "GR[0-7]" 以外の文字列では、0xFFFFを返して終了 */
WORD r;
/* "GR[0-7]" 以外の文字列では、0xFFFFを返して終了 */
@@
-156,7
+155,7
@@
WORD getgr(const char *str, bool is_x)
r = (WORD)(*(str+2) - '0');
/* GR0は指標レジスタとして用いることができない */
if(is_x == true && r == 0x0) {
r = (WORD)(*(str+2) - '0');
/* GR0は指標レジスタとして用いることができない */
if(is_x == true && r == 0x0) {
- setcerr(120,
NULL
); /* GR0 in operand x */
+ setcerr(120,
""
); /* GR0 in operand x */
return 0x0;
}
return r;
return 0x0;
}
return r;
@@
-255,15
+254,15
@@
void writedc(const char *str, PASS pass)
void assemble_start(const CMDLINE *cmdl, PASS pass)
{
if(cmdl->opd->opdc > 1) {
void assemble_start(const CMDLINE *cmdl, PASS pass)
{
if(cmdl->opd->opdc > 1) {
- setcerr(106,
NULL
); /* operand count mismatch */
+ setcerr(106,
""
); /* operand count mismatch */
return;
}
return;
}
- if(
cmdl->label == NULL
) {
- setcerr(107,
NULL
); /* no label in START */
+ if(
*(cmdl->label) == '\0'
) {
+ setcerr(107,
""
); /* no label in START */
return;
}
/* プログラム名の設定 */
return;
}
/* プログラム名の設定 */
-
asptr->prog = strdup_chk(cmdl->label, "asptr.prog"
);
+
strcpy(asptr->prog, cmdl->label
);
/* オペランドがある場合、実行開始アドレスを設定 */
if(pass == SECOND && cmdl->opd->opdv[0] != NULL) {
if((execptr->start = getlabel(asptr->prog, cmdl->opd->opdv[0])) == 0xFFFF) {
/* オペランドがある場合、実行開始アドレスを設定 */
if(pass == SECOND && cmdl->opd->opdv[0] != NULL) {
if((execptr->start = getlabel(asptr->prog, cmdl->opd->opdv[0])) == 0xFFFF) {
@@
-279,7
+278,7
@@
void assemble_start(const CMDLINE *cmdl, PASS pass)
void assemble_end(const CMDLINE *cmdl, PASS pass)
{
if(cmdl->opd->opdc > 0) {
void assemble_end(const CMDLINE *cmdl, PASS pass)
{
if(cmdl->opd->opdc > 0) {
- setcerr(106,
NULL
); /* operand count mismatch */
+ setcerr(106,
""
); /* operand count mismatch */
return;
}
/* 1回目のアセンブルの場合は、リテラル領域開始アドレスを設定 */
return;
}
/* 1回目のアセンブルの場合は、リテラル領域開始アドレスを設定 */
@@
-290,7
+289,7
@@
void assemble_end(const CMDLINE *cmdl, PASS pass)
else if(pass == SECOND) {
execptr->end = asptr->lptr;
}
else if(pass == SECOND) {
execptr->end = asptr->lptr;
}
-
FREE(asptr->prog)
;
+
*(asptr->prog) = '\0'
;
}
/**
}
/**
@@
-301,7
+300,7
@@
void assemble_ds(const CMDLINE *cmdl, PASS pass)
{
int i;
if(cmdl->opd->opdc != 1) {
{
int i;
if(cmdl->opd->opdc != 1) {
- setcerr(106,
NULL
); /* operand count mismatch */
+ setcerr(106,
""
); /* operand count mismatch */
return;
}
for(i = 0; i < atoi(cmdl->opd->opdv[0]); i++) {
return;
}
for(i = 0; i < atoi(cmdl->opd->opdv[0]); i++) {
@@
-320,7
+319,7
@@
void assemble_dc(const CMDLINE *cmdl, PASS pass)
{
int i;
if(cmdl->opd->opdc == 0 || cmdl->opd->opdc >= OPDSIZE) {
{
int i;
if(cmdl->opd->opdc == 0 || cmdl->opd->opdc >= OPDSIZE) {
- setcerr(106,
NULL
); /* operand count mismatch */
+ setcerr(106,
""
); /* operand count mismatch */
return;
}
for(i = 0; i < cmdl->opd->opdc; i++) {
return;
}
for(i = 0; i < cmdl->opd->opdc; i++) {
@@
-348,7
+347,7
@@
void assemble_in(const CMDLINE *cmdl, PASS pass)
{
char *line = malloc_chk(LINESIZE + 1, "assemble_in.line");
if(cmdl->opd->opdc == 0 || cmdl->opd->opdc > 2) {
{
char *line = malloc_chk(LINESIZE + 1, "assemble_in.line");
if(cmdl->opd->opdc == 0 || cmdl->opd->opdc > 2) {
- setcerr(106,
NULL
); /* operand count mismatch */
+ setcerr(106,
""
); /* operand count mismatch */
return;
}
assembleline(" PUSH 0,GR1", pass);
return;
}
assembleline(" PUSH 0,GR1", pass);
@@
-383,7
+382,7
@@
void assemble_out(const CMDLINE *cmdl, PASS pass)
{
char *line = malloc_chk(LINESIZE + 1, "assemble_out.line");
if(cmdl->opd->opdc == 0 || cmdl->opd->opdc > 2) {
{
char *line = malloc_chk(LINESIZE + 1, "assemble_out.line");
if(cmdl->opd->opdc == 0 || cmdl->opd->opdc > 2) {
- setcerr(106,
NULL
); /* operand count mismatch */
+ setcerr(106,
""
); /* operand count mismatch */
return;
}
assembleline(" PUSH 0,GR1", pass);
return;
}
assembleline(" PUSH 0,GR1", pass);
@@
-419,7
+418,7
@@
void assemble_rpush(const CMDLINE *cmdl, PASS pass)
int i;
char *line = malloc_chk(LINESIZE + 1, "assemble_rpush.line");
if(cmdl->opd->opdc > 0) {
int i;
char *line = malloc_chk(LINESIZE + 1, "assemble_rpush.line");
if(cmdl->opd->opdc > 0) {
- setcerr(106,
NULL
); /* operand count mismatch */
+ setcerr(106,
""
); /* operand count mismatch */
return;
}
for(i = 1; i <= GRSIZE-1; i++) {
return;
}
for(i = 1; i <= GRSIZE-1; i++) {
@@
-448,7
+447,7
@@
void assemble_rpop(const CMDLINE *cmdl, PASS pass)
int i;
char *line = malloc_chk(LINESIZE + 1, "assemble_rpop.line");
if(cmdl->opd->opdc > 0) {
int i;
char *line = malloc_chk(LINESIZE + 1, "assemble_rpop.line");
if(cmdl->opd->opdc > 0) {
- setcerr(106,
NULL
); /* operand count mismatch */
+ setcerr(106,
""
); /* operand count mismatch */
return;
}
for(i = GRSIZE-1; i >= 1; i--) {
return;
}
for(i = GRSIZE-1; i >= 1; i--) {
@@
-469,7
+468,7
@@
bool casl2cmd(CMD *cmdtbl, const CMDLINE *cmdl, PASS pass)
{
int i;
void (*cmdptr)();
{
int i;
void (*cmdptr)();
- for(i = 0;
cmdtbl[i].name != NULL
; i++) {
+ for(i = 0;
*(cmdtbl[i].name) != '\0'
; i++) {
if(strcmp(cmdl->cmd, cmdtbl[i].name) == 0) {
cmdptr = cmdtbl[i].ptr;
(*cmdptr)(cmdl, pass);
if(strcmp(cmdl->cmd, cmdtbl[i].name) == 0) {
cmdptr = cmdtbl[i].ptr;
(*cmdptr)(cmdl, pass);
@@
-558,7
+557,7
@@
bool assemble_comet2cmd(const CMDLINE *cmdl, PASS pass)
/* CALL以外の命令の場合と、プログラムの入口名を取得できない場合は、 */
/* 同一プログラム内のラベルを取得 */
if(pass == SECOND && cmd == 0x8000) { /* CALL命令 */
/* CALL以外の命令の場合と、プログラムの入口名を取得できない場合は、 */
/* 同一プログラム内のラベルを取得 */
if(pass == SECOND && cmd == 0x8000) { /* CALL命令 */
- adr = getlabel(
NULL
, cmdl->opd->opdv[0]);
+ adr = getlabel(
""
, cmdl->opd->opdv[0]);
}
if(cmd != 0x8000 || (pass == SECOND && adr == 0xFFFF)) {
adr = getadr(asptr->prog, cmdl->opd->opdv[0], pass);
}
if(cmd != 0x8000 || (pass == SECOND && adr == 0xFFFF)) {
adr = getadr(asptr->prog, cmdl->opd->opdv[0], pass);
@@
-576,7
+575,7
@@
bool assemble_comet2cmd(const CMDLINE *cmdl, PASS pass)
bool assembletok(const CMDLINE *cmdl, PASS pass)
{
/* 命令がない場合 */
bool assembletok(const CMDLINE *cmdl, PASS pass)
{
/* 命令がない場合 */
- if(
cmdl->cmd == NULL
) {
+ if(
*(cmdl->cmd) == '\0'
) {
return true;
}
/* アセンブラ命令またはマクロ命令の書込 */
return true;
}
/* アセンブラ命令またはマクロ命令の書込 */
@@
-605,14
+604,14
@@
bool assembleline(const char *line, PASS pass)
stat = (cerr->num == 0) ? true : false;
if(cmdl != NULL) {
if(stat == true) {
stat = (cerr->num == 0) ? true : false;
if(cmdl != NULL) {
if(stat == true) {
- if(pass == FIRST &&
cmdl->label != NULL
) {
+ if(pass == FIRST &&
*(cmdl->label) != '\0'
) {
stat = addlabel(asptr->prog, cmdl->label, asptr->ptr);
}
stat = addlabel(asptr->prog, cmdl->label, asptr->ptr);
}
- if(stat == true) {
- stat = assembletok(cmdl, pass);
- }
- FREE(cmdl->label);
}
}
+ if(stat == true) {
+ stat = assembletok(cmdl, pass);
+ }
+ FREE(cmdl->label);
if(cmdl->opd != NULL) {
for(i = 0; i < cmdl->opd->opdc; i++) {
FREE(cmdl->opd->opdv[i]);
if(cmdl->opd != NULL) {
for(i = 0; i < cmdl->opd->opdc; i++) {
FREE(cmdl->opd->opdv[i]);