X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcomet2.c;h=fedf8951947b8a4232a494d06c9849422691e2d4;hb=0d225ac1f580c59da7a063ef52da35c0af254dd3;hp=82336133842284504213d9c8ff8ada42afb23209;hpb=4ee27a568fb9222907a566e59aaefe248f08a8e4;p=YACASL2.git

diff --git a/src/comet2.c b/src/comet2.c
index 8233613..fedf895 100644
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -34,9 +34,9 @@ bool loadassemble(char *file) {
         perror(file);
         return false;
     }
-    progprop->end = progprop->start +
-        fread(memory, sizeof(WORD), memsize-progprop->start, fp);
-    if(progprop->end == memsize) {
+    prog->end = prog->start +
+        fread(sys->memory, sizeof(WORD), sys->memsize - prog->start, fp);
+    if(prog->end == sys->memsize) {
         setcerr(201, NULL);    /* Load object file - full of COMET II memory */
         fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);
         status = false;
@@ -48,11 +48,11 @@ bool loadassemble(char *file) {
 /* comet2コマンド */
 int main(int argc, char *argv[])
 {
-    int opt, retval = 0;
+    int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
+    int opt, status = 0;
     const char *usage = "Usage: %s [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE\n";
 
-    /* エラーの初期化 */
-    cerr = malloc_chk(sizeof(CERR), "cerr");
+    cerr_init();
     addcerrlist_comet2();
     /* オプションの処理 */
     while((opt = getopt_long(argc, argv, "tTdM:C:h", longopts, NULL)) != -1) {
@@ -86,8 +86,9 @@ int main(int argc, char *argv[])
         fprintf(stderr, "comet2 error - %d: %s\n", cerr->num, cerr->msg);
         exit(-1);
     }
-    reset();
-    progprop->start = 0;
+    /* COMET II仮想マシンのリセット */
+    reset(memsize, clocks);
+    prog->start = 0;
     if(loadassemble(argv[optind]) == true) {
         create_code_type();    /* 命令と命令タイプがキーのハッシュ表を作成 */
         exec();                /* プログラム実行 */
@@ -96,9 +97,9 @@ int main(int argc, char *argv[])
     /* COMET II仮想マシンのシャットダウン */
     shutdown();
     if(cerr->num > 0) {
-        retval = -1;
+        status = -1;
     }
     /* エラーの解放 */
     freecerr();
-    return retval;
+    return status;
 }