projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
casl2、comet2コマンドのエラーや使い方表示を変更
[YACASL2.git]
/
src
/
comet2.c
diff --git
a/src/comet2.c
b/src/comet2.c
index
1c47d19
..
bb07c5f
100644
(file)
--- a/
src/comet2.c
+++ b/
src/comet2.c
@@
-3,6
+3,7
@@
#define _GNU_SOURCE
#include <getopt.h>
#define _GNU_SOURCE
#include <getopt.h>
+/* comet2コマンドのオプション */
static struct option longopts[] = {
{"trace", no_argument, NULL, 't'},
{"tracearithmetic", no_argument, NULL, 't'},
static struct option longopts[] = {
{"trace", no_argument, NULL, 't'},
{"tracearithmetic", no_argument, NULL, 't'},
@@
-14,37
+15,52
@@
static struct option longopts[] = {
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
-EXECMODE execmode = {false, false, false};
+/* 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);
+}
-/* 指定されたファイルから
COMET II仮想メモリ(アセンブル結果)
を読込 */
-bool
in
assemble(char *file) {
+/* 指定されたファイルから
アセンブル結果
を読込 */
+bool
load
assemble(char *file) {
FILE *fp;
FILE *fp;
- reset();
+ bool status = true;
+
if((fp = fopen(file, "r")) == NULL) {
perror(file);
return false;
}
if((fp = fopen(file, "r")) == NULL) {
perror(file);
return false;
}
- 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);
fclose(fp);
- return
true
;
+ return
status
;
}
}
+/* comet2コマンド */
int main(int argc, char *argv[])
{
int opt;
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':
while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
switch(opt) {
case 't':
-
(&execmode)->tracemod
e = true;
+
execmode.trac
e = true;
break;
case 'T':
break;
case 'T':
-
(&execmode)->tracemod
e = true;
-
(&execmode)->logicalmode
= true;
+
execmode.trac
e = true;
+
execmode.logical
= true;
break;
case 'd':
break;
case 'd':
-
(&execmode)->dumpmode
= true;
+
execmode.dump
= true;
break;
case 'M':
memsize = atoi(optarg);
break;
case 'M':
memsize = atoi(optarg);
@@
-60,12
+76,21
@@
int main(int argc, char *argv[])
exit(-1);
}
}
exit(-1);
}
}
- if(inassemble(argv[optind]) == true) {
+ 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) {
exec(); /* プログラム実行 */
}
if(cerrno > 0) {
- freecerr();
- exit(-1);
+ goto comet2err;
}
return 0;
}
return 0;
+comet2err:
+ freecerr();
+ exit(-1);
}
}