{0, 0, 0, 0}
};
-/* エラー番号とエラーメッセージ */
-CERRARRAY cerr[] = {
- { 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 },
+/* comet2のエラー定義 */
+CERRARRAY cerr_comet2[] = {
+ { 201, "Load object file - full of COMET II memory" },
+ { 208, "object file is not specified" },
};
+bool addcerrlist_comet2()
+{
+ return addcerrlist(ARRAYSIZE(cerr_comet2), cerr_comet2);
+}
/* 指定されたファイルからアセンブル結果を読込 */
bool loadassemble(char *file) {
FILE *fp;
+ bool status = true;
+
if((fp = fopen(file, "r")) == NULL) {
perror(file);
return false;
}
- endptr = startptr + fread(memory, sizeof(WORD), memsize, fp);
+ if((endptr = startptr + fread(memory, sizeof(WORD), memsize-startptr, fp)) == memsize) {
+ setcerr(201, NULL); /* Load object file - full of COMET II memory */
+ fprintf(stderr, "Execute error - %d: %s\n", cerrno, cerrmsg);
+ status = false;
+ }
fclose(fp);
- return true;
+ return status;
}
/* comet2コマンド */
int main(int argc, char *argv[])
{
int opt;
- const char *usage = "Usage: %s [-tTdh] [-M <memorysize>] [-C <clocks>] FILE\n";
+ const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
+ addcerrlist_comet2();
while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
switch(opt) {
case 't':
- (&execmode)->trace = true;
+ execmode.trace = true;
break;
case 'T':
- (&execmode)->trace = true;
- (&execmode)->logical = true;
+ execmode.trace = true;
+ execmode.logical = true;
break;
case 'd':
- (&execmode)->dump = true;
+ execmode.dump = true;
break;
case 'M':
memsize = atoi(optarg);
exit(-1);
}
}
+ if(argv[optind] == NULL) {
+ setcerr(208, NULL); /* object file is not specified */
+ fprintf(stderr, "comet2 error - %d: %s\n", cerrno, cerrmsg);
+ goto comet2err;
+ }
reset();
startptr = 0;
if(loadassemble(argv[optind]) == true) {
exec(); /* プログラム実行 */
}
if(cerrno > 0) {
- freecerr();
- exit(-1);
+ goto comet2err;
}
return 0;
+comet2err:
+ freecerr();
+ exit(-1);
}