/* casl2コマンドのオプション */
static struct option longopts[] = {
- {"source", no_argument, NULL, 's'},
- {"label", no_argument, NULL, 'l'},
- {"labelonly", no_argument, NULL, 'L'},
- {"assembledetail", no_argument, NULL, 'a'},
- {"assembledetailonly", no_argument, NULL, 'A'},
- {"assembleout", optional_argument, NULL, 'o'},
- {"assembleoutonly", optional_argument, NULL, 'O'},
- {"trace", no_argument, NULL, 't'},
- {"tracearithmetic", no_argument, NULL, 't'},
- {"tracelogical", no_argument, NULL, 'T'},
- {"dump", no_argument, NULL, 'd'},
- {"memorysize", required_argument, NULL, 'M'},
- {"clocks", required_argument, NULL, 'C'},
- {"help", no_argument, NULL, 'h'},
- {0, 0, 0, 0},
+ { "source", no_argument, NULL, 's' },
+ { "label", no_argument, NULL, 'l' },
+ { "labelonly", no_argument, NULL, 'L' },
+ { "assembledetail", no_argument, NULL, 'a' },
+ { "assembledetailonly", no_argument, NULL, 'A' },
+ { "assembleout", optional_argument, NULL, 'o' },
+ { "assembleoutonly", optional_argument, NULL, 'O' },
+ { "trace", no_argument, NULL, 't' },
+ { "tracearithmetic", no_argument, NULL, 't' },
+ { "tracelogical", no_argument, NULL, 'T' },
+ { "dump", no_argument, NULL, 'd' },
+ { "memorysize", required_argument, NULL, 'M' },
+ { "clocks", required_argument, NULL, 'C' },
+ { "help", no_argument, NULL, 'h' },
+ { 0, 0, 0, 0 },
};
/* casl2のエラー定義 */
CERR cerr_casl2[] = {
- { 126, "source file is not specified" },
+ { 126, "no source file" },
};
bool addcerrlist_casl2()
{
/* 指定されたファイルにアセンブル結果を書込 */
void outassemble(const char *file) {
FILE *fp;
+
if((fp = fopen(file, "w")) == NULL) {
perror(file);
exit(-1);
}
- fwrite(memory, sizeof(WORD), progprop->end, fp);
+ fwrite(sys->memory, sizeof(WORD), prog->end, fp);
fclose(fp);
}
const char *objfile_name(const char *str)
{
const char *default_name = "a.o";
-
- if(str == NULL) {
- return default_name;
- } else {
- return str;
- }
+ return (str == NULL) ? default_name : str;
}
/* casl2コマンドのメイン */
int main(int argc, char *argv[])
{
- int opt, i, retval = 0;
+ int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
+ int status = 0, opt, i;
PASS pass;
- bool status = false;
+ bool res = false;
WORD beginptr[argc];
char *objfile = NULL;
const char *usage =
- "Usage: %s [-slLaAtTdh] [-oO<OBJECTFILE>] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE ...\n";
+ "Usage: %s [-slLaAtTdh] [-oO[<OBJECTFILE>]] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE1[ FILE2 ...]\n";
- /* エラーの初期化 */
- cerr = malloc_chk(sizeof(CERR), "cerr");
+ cerr_init();
addcerrlist_casl2();
/* オプションの処理 */
while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
asmode.onlyassemble = true;
break;
case 'o':
- objfile = strdup(objfile_name(optarg));
+ objfile = strdup_chk(objfile_name(optarg), "objfile");
break;
case 'O':
asmode.onlyassemble = true;
- objfile = strdup(objfile_name(optarg));
+ objfile = strdup_chk(objfile_name(optarg), "objfile");
break;
case 't':
execmode.trace = true;
}
/* ソースファイルが指定されていない場合は終了 */
if(argv[optind] == NULL) {
- setcerr(126, NULL); /* source file is not specified */
+ setcerr(126, NULL); /* no source file */
fprintf(stderr, "CASL2 error - %d: %s\n", cerr->num, cerr->msg);
exit(-1);
}
/* COMET II仮想マシンのリセット */
- reset();
+ reset(memsize, clocks);
/* アセンブル。ラベル表作成のため、2回行う */
for(pass = FIRST; pass <= SECOND; pass++) {
if(pass == FIRST) {
} else if(pass == SECOND) {
asprop->ptr = beginptr[i];
}
+ asprop->prog = NULL;
if(execmode.trace == true || execmode.dump == true || asmode.src == true ||
asmode.label == true || asmode.asdetail == true)
{
fprintf(stdout, "\nAssemble %s (%d)\n", argv[i], pass);
}
- if((status = assemble(argv[i], pass)) == false) {
+ if((res = assemble(argv[i], pass)) == false) {
exit(-1);
}
}
freelabel(); /* ラベルハッシュ表を解放 */
}
}
- if(status == true) {
+ if(res == true) {
if(objfile != NULL) {
outassemble(objfile);
}
if(asmode.onlyassemble == false) {
create_code_type(); /* 命令と命令タイプがキーのハッシュ表を作成 */
- status = exec(); /* プログラム実行 */
+ res = exec(); /* プログラム実行 */
free_code_type(); /* 命令と命令タイプがキーのハッシュ表を解放 */
}
}
/* COMET II仮想マシンのシャットダウン */
shutdown();
if(cerr->num > 0) {
- retval = -1;
+ status = -1;
}
/* エラーの解放 */
freecerr();
- return retval;
+ return status;
}