オペランドに文字定数が指定された場合の動作を修正

[YACASL2.git] / src / comet2.c

diff --git a/src/comet2.c b/src/comet2.c
index 24040b3..1c47d19 100644 (file)
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -3,6 +3,19 @@
 #define _GNU_SOURCE
 #include <getopt.h>
 
+static struct option longopts[] = {
+    {"trace", no_argument, NULL, 't'},
+    {"tracearithmetic", no_argument, NULL, 't'},
+    {"tracelogical", no_argument, NULL, 'T'},
+    {"dump", no_argument, NULL, 'd'},
+    {"memorysize", required_argument, NULL, 'M'},
+    {"clocks", required_argument, NULL, 'C'},
+    {"help", no_argument, NULL, 'h'},
+    {0, 0, 0, 0}
+};
+
+EXECMODE execmode = {false, false, false};
+
 /* 指定されたファイルからCOMET II仮想メモリ（アセンブル結果）を読込 */
 bool inassemble(char *file) {
     FILE *fp;
@@ -16,33 +29,22 @@ bool inassemble(char *file) {
     return true;
 }
 
-static struct option longopts[] = {
-    {"trace", no_argument, NULL, 't'},
-    {"tracearithmetic", no_argument, NULL, 't'},
-    {"tracelogical", no_argument, NULL, 'T'},
-    {"dump", no_argument, NULL, 'd'},
-    {"memsize", required_argument, NULL, 'M'},
-    {"clocks", required_argument, NULL, 'C'},
-    {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0}
-};
-
 int main(int argc, char *argv[])
 {
     int opt;
-    const char *usage = "Usage: %s [-tTdh] [-M<memsize>] [-C<clocks>] FILE\n";
+    const char *usage = "Usage: %s [-tTdh] [-M <memorysize>] [-C <clocks>] FILE\n";
 
     while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
         switch(opt) {
         case 't':
-            tracemode = true;
+            (&execmode)->tracemode = true;
             break;
         case 'T':
-            tracemode = true;
-            logicalmode = true;
+            (&execmode)->tracemode = true;
+            (&execmode)->logicalmode = true;
             break;
         case 'd':
-            dumpmode = true;
+            (&execmode)->dumpmode = true;
             break;
         case 'M':
             memsize = atoi(optarg);
@@ -52,7 +54,7 @@ int main(int argc, char *argv[])
             break;
         case 'h':
             fprintf(stdout, usage, argv[0]);
-            exit(-1);
+            return 0;
         case '?':
             fprintf(stderr, usage, argv[0]);
             exit(-1);