projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
アセンブルのソースを整理
[YACASL2.git]
/
src
/
comet2.c
diff --git
a/src/comet2.c
b/src/comet2.c
index
138382a
..
8d07715
100644
(file)
--- a/
src/comet2.c
+++ b/
src/comet2.c
@@
-18,14
+18,7
@@
static struct option longopts[] = {
{"memorysize", required_argument, NULL, 'M'},
{"clocks", required_argument, NULL, 'C'},
{"help", no_argument, NULL, 'h'},
{"memorysize", required_argument, NULL, 'M'},
{"clocks", required_argument, NULL, 'C'},
{"help", no_argument, NULL, 'h'},
- {0, 0, 0, 0}
-};
-
-/**
- * comet2コマンドのエラー
- */
-static CERR cerr_comet2[] = {
- { 208, "object file is not specified" },
+ {0, 0, 0, 0},
};
/**
};
/**
@@
-34,11
+27,12
@@
static CERR cerr_comet2[] = {
int main(int argc, char *argv[])
{
int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
int main(int argc, char *argv[])
{
int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
- int opt, stat
us
= 0;
+ int opt, stat = 0;
const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
cerr_init();
const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
cerr_init();
- addcerrlist(ARRAYSIZE(cerr_comet2), cerr_comet2); /* エラーリスト作成 */
+ addcerrlist_load();
+ addcerrlist_exec();
/* オプションの処理 */
while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
/* オプションの処理 */
while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
@@
-68,24
+62,20
@@
int main(int argc, char *argv[])
}
}
if(argv[optind] == NULL) {
}
}
if(argv[optind] == NULL) {
- setcerr(2
08, NULL); /* object file is
not specified */
+ setcerr(2
11, NULL); /* object file
not specified */
fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
exit(-1);
}
/* COMET II仮想マシンのリセット */
reset(memsize, clocks);
fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
exit(-1);
}
/* COMET II仮想マシンのリセット */
reset(memsize, clocks);
-
prog
->start = 0;
+
execptr
->start = 0;
if(loadassemble(argv[optind]) == true) {
if(loadassemble(argv[optind]) == true) {
- create_code_type(); /* タイプがキーの命令ハッシュ表を作成 */
exec(); /* プログラム実行 */
exec(); /* プログラム実行 */
- free_code_type(); /* タイプがキーの命令ハッシュ表を解放 */
}
/* COMET II仮想マシンのシャットダウン */
shutdown();
}
/* COMET II仮想マシンのシャットダウン */
shutdown();
- if(cerr->num > 0) {
- status = -1;
- }
+ stat = (cerr->num == 0) ? 0 : -1;
/* エラーの解放 */
freecerr();
/* エラーの解放 */
freecerr();
- return stat
us
;
+ return stat;
}
}