X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcasl2.c;h=944ed409df5a4c36ad01edcf5deb948b28917f72;hp=85a3ab593e6eac7257239fa1f9d8c40f3ba19d15;hb=22dc7e0f6bc6f0a7ebe6c0b998db13d7e6c7cbbc;hpb=ccc3acda4256e10a822e41e84f6c9991271c2f61 diff --git a/src/casl2.c b/src/casl2.c index 85a3ab5..944ed40 100644 --- a/src/casl2.c +++ b/src/casl2.c @@ -4,8 +4,8 @@ #define _GNU_SOURCE #include -static struct option longopts[] = -{ +/* casl2コマンドのオプション */ +static struct option longopts[] = { {"source", no_argument, NULL, 's'}, {"label", no_argument, NULL, 'l'}, {"labelonly", no_argument, NULL, 'L'}, @@ -23,44 +23,14 @@ static struct option longopts[] = {0, 0, 0, 0}, }; -ASMODE asmode = {false, false, false, false, false}; -EXECMODE execmode = {false, false, false}; - -/* エラー番号とエラーメッセージ */ -CERRARRAY cerr[] = { - { 101, "label already defined" }, - { 102, "label table is full" }, - { 103, "label not found" }, - { 104, "label length is too long" }, - { 105, "no command in the line" }, - { 106, "operand count mismatch" }, - { 107, "no label in START" }, - { 108, "not command of operand \"r\"" }, - { 109, "not command of operand \"r1,r2\"" }, - { 110, "not command of operand \"r,adr[,x]\"" }, - { 111, "not command of operand \"adr[,x]\"" }, - { 112, "not command of no operand" }, - { 113, "command not defined" }, - { 114, "not integer" }, - { 115, "not hex" }, - { 116, "out of hex range" }, - { 117, "operand is too many" }, - { 118, "operand length is too long" }, - { 119, "out of COMET II memory" }, - { 120, "GR0 in operand x" }, - { 121, "cannot get operand token" }, - { 122, "cannot create hash table" }, - { 123, "illegal string" }, - { 124, "more than one character in literal" }, - { 201, "execute - out of COMET II memory" }, - { 202, "SVC input - out of Input memory" }, - { 203, "SVC output - out of COMET II memory" }, - { 204, "Program Register (PR) - out of COMET II memory" }, - { 205, "Stack Pointer (SP) - cannot allocate stack buffer" }, - { 206, "Address - out of COMET II memory" }, - { 207, "Stack Pointer (SP) - out of COMET II memory" }, - { 0, NULL }, +/* casl2のエラー定義 */ +CERRARRAY cerr_casl2[] = { + { 126, "source file is not specified" }, }; +bool addcerrlist_casl2() +{ + return addcerrlist_casl2(ARRAYSIZE(cerr_casl2), cerr_casl2); +} /* 指定されたファイルにアセンブル結果を書込 */ void outassemble(const char *file) { @@ -78,14 +48,14 @@ const char *objfile_name(const char *str) { const char *default_name = "a.o"; - if(optarg == NULL) { + if(str == NULL) { return default_name; } else { return str; } } -/* casl2コマンド */ +/* casl2コマンドのメイン */ int main(int argc, char *argv[]) { int opt, i; @@ -94,43 +64,43 @@ int main(int argc, char *argv[]) WORD beginptr[argc]; char *objfile = NULL; const char *usage = - "Usage: %s [-slLaAtTdh] [-oO] [-M ] [-C ] FILE ...\n"; + "Usage: %s [-slLaAtTdh] [-oO] [-M ] [-C ] FILE ...\n"; while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) { switch(opt) { case 's': - (&asmode)->srcmode = true; + asmode.src = true; break; case 'l': - (&asmode)->labelmode = true; + asmode.label = true; break; case 'L': - (&asmode)->labelmode = true; - (&asmode)->onlylabelmode = true; + asmode.label = true; + asmode.onlylabel = true; break; case 'a': - (&asmode)->asdetailmode = true; + asmode.asdetail = true; break; case 'A': - (&asmode)->asdetailmode = true; - (&asmode)->onlyassemblemode = true; + asmode.asdetail = true; + asmode.onlyassemble = true; break; case 'o': objfile = strdup(objfile_name(optarg)); break; case 'O': - (&asmode)->onlyassemblemode = true; + asmode.onlyassemble = true; objfile = strdup(objfile_name(optarg)); break; case 't': - (&execmode)->tracemode = true; + execmode.trace = true; break; case 'T': - (&execmode)->tracemode = true; - (&execmode)->logicalmode = true; + execmode.trace = true; + execmode.logical = true; break; case 'd': - (&execmode)->dumpmode = true; + execmode.dump = true; break; case 'M': memsize = atoi(optarg); @@ -146,15 +116,22 @@ int main(int argc, char *argv[]) exit(-1); } } + + #if 0 + addcerrlist_casl2(); + #endif /* ソースファイルが指定されていない場合は終了 */ if(argv[optind] == NULL) { - fprintf(stderr, "source file is not specified\n"); - exit(-1); + setcerr(126, NULL); /* source file is not specified */ + goto casl2err; } /* COMET II仮想マシンのリセット */ reset(); /* アセンブル。ラベル表作成のため、2回行う */ for(pass = FIRST; pass <= SECOND; pass++) { + if(pass == FIRST && create_cmdtype_code() == false) { + goto casl2err; + } for(i = optind; i < argc; i++) { /* データの格納開始位置 */ if(pass == FIRST) { @@ -162,34 +139,30 @@ int main(int argc, char *argv[]) } else if(pass == SECOND) { ptr = beginptr[i]; } - if((&execmode)->tracemode == true || (&execmode)->dumpmode == true || - (&asmode)->srcmode == true || (&asmode)->labelmode == true || - (&asmode)->asdetailmode == true) + 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) { - freelabel(); /* ラベル表の解放 */ - if(cerrno > 0) { - freecerr(); /* エラーの解放 */ - } exit(-1); } } - if(pass == FIRST && (&asmode)->labelmode == true) { + if(pass == FIRST && asmode.label == true) { fprintf(stdout, "\nLabel::::\n"); printlabel(); - if((&asmode)->onlylabelmode == true) { + if(asmode.onlylabel == true) { return 0; } } } - freelabel(); /* ラベル表の解放 */ + free_cmdtype_code(); /* 命令表の解放 */ + freelabel(); /* ラベル表の解放 */ if(status == true) { if(objfile != NULL) { outassemble(objfile); } - if((&asmode)->onlyassemblemode == false) { + if(asmode.onlyassemble == false) { exec(); /* プログラム実行 */ } } @@ -198,4 +171,7 @@ int main(int argc, char *argv[]) exit(-1); } return 0; +casl2err: + fprintf(stderr, "CASL2 error - %d: %s\n", cerrno, cerrmsg); + exit(-1); }