projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of dragon:/home/dav/yacasl2
[YACASL2.git]
/
src
/
comet2.c
diff --git
a/src/comet2.c
b/src/comet2.c
index
be09f10
..
fedf895
100644
(file)
--- a/
src/comet2.c
+++ b/
src/comet2.c
@@
-16,8
+16,9
@@
static struct option longopts[] = {
};
/* comet2のエラー定義 */
};
/* comet2のエラー定義 */
-CERRARRAY cerr_comet2[] = {
- { 201, "Load object file - full of COMET II memory" },
+CERR cerr_comet2[] = {
+ { 201, "load object file - full of COMET II memory" },
+ { 208, "object file is not specified" },
};
bool addcerrlist_comet2()
{
};
bool addcerrlist_comet2()
{
@@
-27,27
+28,33
@@
bool addcerrlist_comet2()
/* 指定されたファイルからアセンブル結果を読込 */
bool loadassemble(char *file) {
FILE *fp;
/* 指定されたファイルからアセンブル結果を読込 */
bool loadassemble(char *file) {
FILE *fp;
+ bool status = true;
if((fp = fopen(file, "r")) == NULL) {
perror(file);
return false;
}
if((fp = fopen(file, "r")) == NULL) {
perror(file);
return false;
}
- if((endptr = startptr + fread(memory, sizeof(WORD), memsize-startptr, fp)) == memsize) {
+ prog->end = prog->start +
+ fread(sys->memory, sizeof(WORD), sys->memsize - prog->start, fp);
+ if(prog->end == sys->memsize) {
setcerr(201, NULL); /* Load object file - full of COMET II memory */
setcerr(201, NULL); /* Load object file - full of COMET II memory */
- fprintf(stderr, "Execute error - %d: %s\n", cerr
no, cerr
msg);
-
return
false;
+ fprintf(stderr, "Execute error - %d: %s\n", cerr
->num, cerr->
msg);
+
status =
false;
}
fclose(fp);
}
fclose(fp);
- return
true
;
+ return
status
;
}
/* comet2コマンド */
int main(int argc, char *argv[])
{
}
/* comet2コマンド */
int main(int argc, char *argv[])
{
- int opt;
- const char *usage = "Usage: %s [-tTdh] [-M <memorysize>] [-C <clocks>] FILE\n";
+ int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
+ int opt, status = 0;
+ const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
+ cerr_init();
addcerrlist_comet2();
addcerrlist_comet2();
+ /* オプションの処理 */
while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
switch(opt) {
case 't':
while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
switch(opt) {
case 't':
@@
-74,14
+81,25
@@
int main(int argc, char *argv[])
exit(-1);
}
}
exit(-1);
}
}
- reset();
- startptr = 0;
+ if(argv[optind] == NULL) {
+ setcerr(208, NULL); /* object file is not specified */
+ fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
+ exit(-1);
+ }
+ /* COMET II仮想マシンのリセット */
+ reset(memsize, clocks);
+ prog->start = 0;
if(loadassemble(argv[optind]) == true) {
if(loadassemble(argv[optind]) == true) {
- exec(); /* プログラム実行 */
+ create_code_type(); /* 命令と命令タイプがキーのハッシュ表を作成 */
+ exec(); /* プログラム実行 */
+ free_code_type(); /* 命令と命令タイプがキーのハッシュ表を解放 */
}
}
- if(cerrno > 0) {
- freecerr();
- exit(-1);
+ /* COMET II仮想マシンのシャットダウン */
+ shutdown();
+ if(cerr->num > 0) {
+ status = -1;
}
}
- return 0;
+ /* エラーの解放 */
+ freecerr();
+ return status;
}
}