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
343aa52
..
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 }
};
/**
};
/**
@@
-257,7
+257,7
@@
void assemble_start(const CMDLINE *cmdl, PASS pass)
setcerr(106, ""); /* operand count mismatch */
return;
}
setcerr(106, ""); /* operand count mismatch */
return;
}
- if(
cmdl->label == NULL
) {
+ if(
*(cmdl->label) == '\0'
) {
setcerr(107, ""); /* no label in START */
return;
}
setcerr(107, ""); /* no label in START */
return;
}
@@
-468,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);
@@
-575,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;
}
/* アセンブラ命令またはマクロ命令の書込 */
@@
-604,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]);