{0, 0, 0, 0},
};
-/* エラー番号とエラーメッセージ */
-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 mismatch in assemble command" },
- { 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, "operand too many in machine command" },
- { 114, "not integer" },
- { 115, "not hex" },
- { 116, "out of hex range" },
- { 117, "operand too many in DC" },
- { 118, "operand length too long" },
- { 119, "out of COMET II memory" },
- { 120, "GR0 in operand x" },
- { 121, "cannot get operand token" },
- { 122, "cannot create hash table" },
- { 123, "unclosed quote" },
- { 124, "more than one character in literal" },
- { 125, "not GR in operand x" },
+/* casl2のエラー定義 */
+CERR cerr_casl2[] = {
{ 126, "source file is not specified" },
- { 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 },
};
+bool addcerrlist_casl2()
+{
+ return addcerrlist(sizeof(cerr_casl2), cerr_casl2);
+}
/* 指定されたファイルにアセンブル結果を書込 */
void outassemble(const char *file) {
perror(file);
exit(-1);
}
- fwrite(memory, sizeof(WORD), endptr, fp);
+ fwrite(memory, sizeof(WORD), progprop->end, fp);
fclose(fp);
}
/* casl2コマンドのメイン */
int main(int argc, char *argv[])
{
- int opt, i;
+ int opt, i, retval = 0;
PASS pass;
bool status = false;
WORD beginptr[argc];
char *objfile = NULL;
const char *usage =
- "Usage: %s [-slLaAtTdh] [-oO<OUTFILE>] [-M <memorysize>] [-C <clocks>] FILE ...\n";
+ "Usage: %s [-slLaAtTdh] [-oO<OBJECTFILE>] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE ...\n";
+ /* エラーの初期化 */
+ cerr = malloc_chk(sizeof(CERR), "cerr");
+ addcerrlist_casl2();
+ /* オプションの処理 */
while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
switch(opt) {
case 's':
/* ソースファイルが指定されていない場合は終了 */
if(argv[optind] == NULL) {
setcerr(126, NULL); /* source file is not specified */
- goto casl2err;
+ fprintf(stderr, "CASL2 error - %d: %s\n", cerr->num, cerr->msg);
+ exit(-1);
}
/* COMET II仮想マシンのリセット */
reset();
/* アセンブル。ラベル表作成のため、2回行う */
for(pass = FIRST; pass <= SECOND; pass++) {
- if(pass == FIRST && create_cmdtype_code() == false) {
- goto casl2err;
+ if(pass == FIRST) {
+ create_cmdtype_code(); /* 命令と命令タイプがキーのハッシュ表を作成 */
+ asprop = malloc_chk(sizeof(ASPROP), "asprop");
}
for(i = optind; i < argc; i++) {
/* データの格納開始位置 */
if(pass == FIRST) {
- beginptr[i] = ptr;
+ beginptr[i] = asprop->ptr;
} else if(pass == SECOND) {
- ptr = beginptr[i];
+ asprop->ptr = beginptr[i];
}
if(execmode.trace == true || execmode.dump == true || asmode.src == true ||
asmode.label == true || asmode.asdetail == true)
return 0;
}
}
+ if(pass == SECOND) {
+ free_cmdtype_code(); /* 命令と命令タイプがキーのハッシュ表を解放 */
+ freelabel(); /* ラベルハッシュ表を解放 */
+ }
}
- freelabel(); /* ラベル表の解放 */
if(status == true) {
if(objfile != NULL) {
outassemble(objfile);
}
if(asmode.onlyassemble == false) {
- exec(); /* プログラム実行 */
+ create_code_type(); /* 命令と命令タイプがキーのハッシュ表を作成 */
+ status = exec(); /* プログラム実行 */
+ free_code_type(); /* 命令と命令タイプがキーのハッシュ表を解放 */
}
}
- if(cerrno > 0) {
- freecerr();
- exit(-1);
+ /* COMET II仮想マシンのシャットダウン */
+ shutdown();
+ if(cerr->num > 0) {
+ retval = -1;
}
- return 0;
-casl2err:
- fprintf(stderr, "Casl2 error - %d: %s\n", cerrno, cerrmsg);
- exit(-1);
+ /* エラーの解放 */
+ freecerr();
+ return retval;
}