casl2、comet2コマンドのエラーや使い方表示を変更

[YACASL2.git] / src / comet2.c

diff --git a/src/comet2.c b/src/comet2.c
index e51b0e0..bb07c5f 100644 (file)
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -15,20 +15,21 @@ static struct option longopts[] = {
     {0, 0, 0, 0}
 };
 
-/* エラー番号とエラーメッセージ */
+/* comet2のエラー定義 */
 CERRARRAY cerr_comet2[] = {
     { 201, "Load object file - full 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" },
+    { 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;
@@ -36,18 +37,19 @@ bool loadassemble(char *file) {
     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);
-        return false;
+        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':
@@ -74,16 +76,21 @@ int main(int argc, char *argv[])
             exit(-1);
         }
     }
-    /* エラーリストにerr_comet2を追加 */
-    addcerrlist(ARRAYSIZE(cerr_comet2), cerr_comet2);
+    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);
 }