デバッガー機能の実装

[YACASL2.git] / src / casl2.c

diff --git a/src/casl2.c b/src/casl2.c
index a5943c0..89333d5 100644 (file)
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -122,18 +122,14 @@ asfin:
  */
 int main(int argc, char *argv[])
 {
-    int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS, opt, i, stat;
+    int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS, opt, i, stat = 0;
     char *af[argc], *objfile = NULL;
     const char *version = PACKAGE_VERSION,  *cmdversion = "casl2 of YACASL2 version %s\n";
     const char *usage =
-        "Usage: %s [-slLaAtTdvh] [-oO[<OBJECTFILE>]] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE1[ FILE2  ...]\n";
+        "Usage: %s [-slLaAtTdbvh] [-oO[<OBJECTFILE>]] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE1[ FILE2  ...]\n";
 
-    cerr_init();
-    addcerrlist_casl2();
-    addcerrlist_assemble();
-    addcerrlist_exec();
     /* オプションの処理 */
-    while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:vh", longopts, NULL)) != -1) {
+    while((opt = getopt_long(argc, argv, "tTdslLbao::O::AM:C:vh", longopts, NULL)) != -1) {
         switch(opt) {
         case 's':
             asmode.src = true;
@@ -169,6 +165,9 @@ int main(int argc, char *argv[])
         case 'd':
             execmode.dump = true;
             break;
+        case 'b':
+            execmode.debugger = true;
+            break;
         case 'M':
             memsize = atoi(optarg);
             break;
@@ -186,10 +185,18 @@ int main(int argc, char *argv[])
             exit(1);
         }
     }
+
+    /* エラーの定義 */
+    cerr_init();
+    addcerrlist_casl2();
+    addcerrlist_assemble();
+    addcerrlist_exec();
+
     /* ソースファイルが指定されていない場合は終了 */
     if(argv[optind] == NULL) {
         setcerr(126, "");    /* no source file */
         fprintf(stderr, "CASL2 error - %d: %s\n", cerr->num, cerr->msg);
+        freecerr();                                    /* エラーの解放 */
         exit(1);
     }
     reset(memsize, clocks);                        /* 仮想マシンCOMET IIのリセット */