X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fexec.c;h=65bd3a77d00d9ba630c24de81278e9993c56b103;hp=718a936a38dc924f5870365561bd6b064ffeebaf;hb=4f0fb4945a97e5fc4d23814226b08709469513fa;hpb=a77e8363f86dfc38838990a174486166b7c5cbf2

diff --git a/src/exec.c b/src/exec.c
index 718a936..65bd3a7 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,9 +1,4 @@
-#include <stdio.h>
-#include <assert.h>
-#include <time.h>
-
 #include "exec.h"
-#include "cerr.h"
 
 /**
  * @brief プログラムレジスタ（PR）を表すWORD値を文字列に変換
@@ -75,16 +70,6 @@ WORD get_adr_x(WORD adr, WORD oprx);
  */
 WORD get_val_adr_x(WORD adr, WORD oprx);
 
-/**
- * @brief 汎用レジスタの番号からレジスタを表す文字列を返す
- *
- * @return 汎用レジスタを表す文字列。「GR0」「GR1」・・・「GR7」のいずれか
- *
- * @param word レジスタ番号[0-7]を表すWORD値
- */
-char *grstr(WORD word);
-
-
 /**
  * @brief 実行エラーの定義
  */
@@ -101,17 +86,9 @@ static CERR cerr_exec[] = {
 };
 
 /**
- * @brief アセンブル結果読み込みエラーの定義
- */
-static CERR cerr_load[] = {
-    { 210, "load - memory overflow" },
-    { 211, "object file not specified" },
-};
-
-/**
- * @brief 実行モード: trace, logical, dump, debugger
+ * @brief 実行モード: trace, logical, dump, dump_start, dump_end,  monitor, step
  */
-EXECMODE execmode = {false, false, false, false};
+EXECMODE execmode = {false, false, false, 0, 0xFFFF, false, false};
 
 char *pr2str(WORD pr)
 {
@@ -131,7 +108,7 @@ void svcin()
         return;
     }
     for(i = 0; i < INSIZE; i++) {
-        if(*(buf + i) == '\0' || *(buf + i) == '\n') {
+        if(!buf[i] || buf[i] == '\n') {
             --i;
             break;
         }
@@ -139,7 +116,7 @@ void svcin()
             setcerr(208, "");    /* SVC input - memory overflow */
             break;
         }
-        sys->memory[sys->cpu->gr[1]+i] = *(buf + i);
+        sys->memory[sys->cpu->gr[1] + i] = buf[i];
     }
     sys->memory[sys->cpu->gr[2]] = i + 1;
     FREE(buf);
@@ -184,8 +161,8 @@ void setfr(WORD adr)
 
 WORD get_r_r1(WORD oprx)
 {
-    WORD r;
-    char *s;
+    WORD r = 0;
+    char *s = NULL;
 
     if((r = ((oprx & 0x00F0) >>4)) > GRSIZE - 1) {
         setcerr(205, s = pr2str(sys->cpu->pr));    /* r/r1 in word #1 - not GR */
@@ -197,8 +174,8 @@ WORD get_r_r1(WORD oprx)
 
 WORD get_x_r2(WORD oprx)
 {
-    WORD x;
-    char *s;
+    WORD x = 0;
+    char *s = NULL;
 
     if((x = (oprx & 0x000F)) > GRSIZE - 1) {
         setcerr(206, s = pr2str(sys->cpu->pr));    /* r/r1 in word #1 - not GR */
@@ -210,8 +187,10 @@ WORD get_x_r2(WORD oprx)
 
 WORD get_adr_x(WORD adr, WORD oprx)
 {
-    WORD a = adr, x;
-    if((x = get_x_r2(oprx)) > 0) {
+    WORD a = adr;
+    WORD x = get_x_r2(oprx);
+
+    if(x > 0) {
         a += sys->cpu->gr[x];
     }
     return a;
@@ -219,8 +198,8 @@ WORD get_adr_x(WORD adr, WORD oprx)
 
 WORD get_val_adr_x(WORD adr, WORD oprx)
 {
-    WORD a;
-    char *s;
+    WORD a = 0;
+    char *s = NULL;
 
     if((a = get_adr_x(adr, oprx)) >= sys->memsize) {
         setcerr(207, s = pr2str(sys->cpu->pr + 1));    /* address in word #2 - out of memory */
@@ -231,37 +210,11 @@ WORD get_val_adr_x(WORD adr, WORD oprx)
 }
 
 /* exec.hで定義された関数群 */
-void addcerrlist_load()
-{
-    addcerrlist(ARRAYSIZE(cerr_load), cerr_load);
-}
-
 void addcerrlist_exec()
 {
     addcerrlist(ARRAYSIZE(cerr_exec), cerr_exec);
 }
 
-bool loadassemble(const char *file)
-{
-    FILE *fp;
-    bool stat = true;
-
-    assert(file != NULL);
-    if((fp = fopen(file, "rb")) == NULL) {
-        perror(file);
-        return false;
-    }
-    execptr->end = execptr->start +
-        fread(sys->memory, sizeof(WORD), sys->memsize - execptr->start, fp);
-    if(execptr->end == sys->memsize) {
-        setcerr(210, file);    /* load - memory overflow */
-        fprintf(stderr, "Load error - %d: %s\n", cerr->num, cerr->msg);
-        stat = false;
-    }
-    fclose(fp);
-    return stat;
-}
-
 void nop()
 {
     sys->cpu->pr += 1;
@@ -269,35 +222,28 @@ void nop()
 
 void ld_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     setfr(sys->cpu->gr[get_r_r1(w[0])] = get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
 void ld_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     setfr(sys->cpu->gr[get_r_r1(w[0])] = sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
 void st()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     sys->memory[get_adr_x(w[1], w[0])] = sys->cpu->gr[get_r_r1(w[0])];
     sys->cpu->pr += 2;
 }
 
 void lad()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     sys->cpu->gr[get_r_r1(w[0])] = get_adr_x(w[1], w[0]);
     sys->cpu->pr += 2;
 }
@@ -323,34 +269,28 @@ void adda(WORD r, WORD val)
 
 void adda_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     adda(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
 void adda_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     adda(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
 void suba_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     adda(get_r_r1(w[0]), ~(get_val_adr_x(w[1], w[0])) + 1);
     sys->cpu->pr += 2;
 }
 
 void suba_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     adda(get_r_r1(w[0]), ~(sys->cpu->gr[get_x_r2(w[0])]) + 1);
     sys->cpu->pr += 1;
 }
@@ -388,92 +328,77 @@ void addl_gr(WORD r, WORD val, bool add)
 
 void addl_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), true);
     sys->cpu->pr += 2;
 }
 
 void addl_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], true);
     sys->cpu->pr += 1;
 }
 
 void subl_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), false);
     sys->cpu->pr += 2;
 }
 
 void subl_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], false);
     sys->cpu->pr += 1;
 }
 
 void and_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     setfr(sys->cpu->gr[get_r_r1(w[0])] &= get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
 void and_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     setfr(sys->cpu->gr[get_r_r1(w[0])] &= sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
 void or_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     setfr(sys->cpu->gr[get_r_r1(w[0])] |= get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
 void or_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     setfr(sys->cpu->gr[get_r_r1(w[0])] |= sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
 void xor_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     setfr(sys->cpu->gr[get_r_r1(w[0])] ^= get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
 void xor_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     setfr(sys->cpu->gr[get_r_r1(w[0])] ^= sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
 void cpa(WORD r, WORD val)
 {
-    sys->cpu->fr = 0x0;
+    sys->cpu->fr = 0;
     if((short)sys->cpu->gr[r] < (short)val) {
         sys->cpu->fr = SF;
     } else if(sys->cpu->gr[r] == val) {
@@ -483,17 +408,14 @@ void cpa(WORD r, WORD val)
 
 void cpa_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     cpa(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
 void cpa_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     cpa(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
@@ -510,32 +432,28 @@ void cpl(WORD r, WORD val)
 
 void cpl_r_adr_x()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     cpl(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
     sys->cpu->pr += 2;
 }
 
 void cpl_r1_r2()
 {
-    WORD w[1];
-    w[0] = sys->memory[sys->cpu->pr];
+    WORD w[] = {sys->memory[sys->cpu->pr]};
     cpl(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
     sys->cpu->pr += 1;
 }
 
 void sla()
 {
-    WORD w[2], sign, last = 0x0, r;
-    int i;
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
+    WORD r = get_r_r1(w[0]);
+    WORD sign = sys->cpu->gr[r] & 0x8000;
+    WORD last = 0;
 
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
-    sys->cpu->fr = 0x0;
-    sign = sys->cpu->gr[(r = get_r_r1(w[0]))] & 0x8000;
+    sys->cpu->fr = 0;
     sys->cpu->gr[r] &= 0x7FFF;
-    for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
+    for(int i = 0; i < get_adr_x(w[1], w[0]); i++) {
         last = sys->cpu->gr[r] & 0x4000;
         sys->cpu->gr[r] <<= 1;
     }
@@ -557,15 +475,14 @@ void sla()
 
 void sra()
 {
-    WORD w[2], sign, last = 0x0, r;
-    int i;
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
+    WORD r = get_r_r1(w[0]);
+    WORD sign = sys->cpu->gr[r] & 0x8000;
+    WORD last = 0;
 
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
-    sys->cpu->fr = 0x0;
-    sign = sys->cpu->gr[(r = get_r_r1(w[0]))] & 0x8000;
+    sys->cpu->fr = 0;
     sys->cpu->gr[r] &= 0x7FFF;
-    for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
+    for(int i = 0; i < get_adr_x(w[1], w[0]); i++) {
         last = sys->cpu->gr[r] & 0x1;
         sys->cpu->gr[r] >>= 1;
         if(sign > 0) {
@@ -590,14 +507,13 @@ void sra()
 
 void sll()
 {
-    WORD w[2], last = 0x0, r;
-    int i;
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
+    WORD last = 0;
+    WORD r = get_r_r1(w[0]);
 
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
     sys->cpu->fr = 0x0;
-    for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
-        last = sys->cpu->gr[(r = get_r_r1(w[0]))] & 0x8000;
+    for(int i = 0; i < get_adr_x(w[1], w[0]); i++) {
+        last = sys->cpu->gr[r] & 0x8000;
         sys->cpu->gr[r] <<= 1;
     }
     /* OFに、レジスタから最後に送り出されたビットの値を設定 */
@@ -617,14 +533,12 @@ void sll()
 
 void srl()
 {
-    WORD w[2], last = 0x0, r;
-    int i;
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
+    WORD last = 0;
+    WORD r = get_r_r1(w[0]);
 
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
     sys->cpu->fr = 0x0;
-    r = get_r_r1(w[0]);
-    for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
+    for(int i = 0; i < get_adr_x(w[1], w[0]); i++) {
         last = sys->cpu->gr[r] & 0x0001;
         sys->cpu->gr[r] >>= 1;
     }
@@ -645,9 +559,7 @@ void srl()
 
 void jpl()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     if((sys->cpu->fr & (SF | ZF)) == 0) {
         sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
@@ -657,9 +569,7 @@ void jpl()
 
 void jmi()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     if((sys->cpu->fr & SF) > 0) {
         sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
@@ -669,9 +579,7 @@ void jmi()
 
 void jnz()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     if((sys->cpu->fr & ZF) == 0) {
         sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
@@ -681,9 +589,7 @@ void jnz()
 
 void jze()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     if((sys->cpu->fr & ZF) > 0) {
         sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
@@ -693,9 +599,7 @@ void jze()
 
 void jov()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     if((sys->cpu->fr & OF) > 0) {
         sys->cpu->pr = get_adr_x(w[1], w[0]);
     } else {
@@ -705,19 +609,14 @@ void jov()
 
 void jump()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     sys->cpu->pr = get_adr_x(w[1], w[0]);
 }
 
 void push()
 {
     assert(sys->cpu->sp > execptr->end && sys->cpu->sp <= sys->memsize);
-    WORD w[2];
-
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     sys->memory[--(sys->cpu->sp)] = get_adr_x(w[1], w[0]);
     sys->cpu->pr += 2;
 }
@@ -725,15 +624,14 @@ void push()
 void pop()
 {
     assert(sys->cpu->sp > execptr->end);
-    WORD w;
-    char *s;
+    WORD w[] = {sys->memory[sys->cpu->pr]};
+    char *s = NULL;
 
     if(sys->cpu->sp >= sys->memsize) {
         setcerr(203, s = pr2str(sys->cpu->pr));        /* Stack Pointer (SP) - stack underflow */
         FREE(s);
     } else {
-        w = sys->memory[sys->cpu->pr];
-        sys->cpu->gr[get_r_r1(w)] = sys->memory[(sys->cpu->sp)++];
+        sys->cpu->gr[get_r_r1(w[0])] = sys->memory[(sys->cpu->sp)++];
         sys->cpu->pr += 1;
     }
 }
@@ -741,9 +639,7 @@ void pop()
 void call()
 {
     assert(sys->cpu->sp > execptr->end && sys->cpu->sp <= sys->memsize);
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     sys->memory[--(sys->cpu->sp)] = sys->cpu->pr + 1;
     sys->cpu->pr = get_adr_x(w[1], w[0]);
 }
@@ -760,9 +656,7 @@ void ret()
 
 void svc()
 {
-    WORD w[2];
-    w[0] = sys->memory[sys->cpu->pr];
-    w[1] = sys->memory[sys->cpu->pr + 1];
+    WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
     switch(get_adr_x(w[1], w[0]))
     {
     case 0x0:                   /* STOP */
@@ -778,47 +672,16 @@ void svc()
     sys->cpu->pr += 2;
 }
 
-char *grstr(WORD word)
-{
-    assert(word <= 7);
-    char *str = malloc_chk(3 + 1, "grstr.str");
-    sprintf(str, "GR%d", word);
-    return str;
-}
-
-void debugger()
-{
-    char *buf = malloc_chk(DBINSIZE + 1, "debugger.buf");
-    for( ; ;) {
-        fprintf(stdout, "COMET II (Type ? for help) > ");
-        fgets(buf, DBINSIZE, stdin);
-        if(*buf == 'r') {
-            execmode.debugger = false;
-            break;
-        } else if(*buf == 's') {
-            break;
-        } else if(*buf == 't') {
-            fprintf(stdout, "#%04X: Register::::\n", sys->cpu->pr);
-            dspregister();
-        } else if(*buf == 'd') {
-            dumpmemory();
-        } else if(*buf == '?') {
-            fprintf(stdout, "r -- Continue running your program.\n");
-            fprintf(stdout, "s -- Continue running your program until next interaction.\n");
-            fprintf(stdout, "t -- Display CPU register.\n");
-            fprintf(stdout, "d -- Display memory dump.\n");
-            break;
-        }
-    }
-}
-
 void exec()
 {
-    clock_t clock_begin, clock_end;
-    void (*cmdptr)();
-    char *s;
+    clock_t clock_begin = 0;
+    clock_t clock_end = 0;
+    void (*cmdptr)() = NULL;
+    char *s = NULL;
+    const char *monmsg = "COMET II machine code monitor. Type ? for help.\n";
+
+    create_cmdtable(HASH_CODE);                 /* 命令のコードとタイプがキーのハッシュ表を作成 */
 
-    create_code_cmdtype();                          /* 命令のコードとタイプがキーのハッシュ表を作成 */
     if(execmode.trace == true) {
         fprintf(stdout, "\nExecuting machine codes\n");
     }
@@ -832,31 +695,34 @@ void exec()
             }
             if(execmode.dump) {                    /* dumpオプション指定時、メモリを出力 */
                 fprintf(stdout, "#%04X: Memory::::\n", sys->cpu->pr);
-                dumpmemory();
+                dumpmemory(execmode.dump_start, execmode.dump_end);
             }
             fprintf(stdout, "\n");
         }
-        /* デバッガーモードの場合、デバッガーを起動 */
-        if(execmode.debugger == true) {
-            debugger();
+        /* ステップモードまたはブレークポイントの場合、モニターを起動 */
+        if(
+            (execmode.monitor == true && sys->cpu->pr == execptr->start) ||
+            execmode.step == true || getbps(sys->cpu->pr) == true)
+        {
+            if(sys->cpu->pr == execptr->start) {
+                fprintf(stdout, "%s", monmsg);
+            }
+            monitor();
         }
         /* プログラムレジスタをチェック */
         if(sys->cpu->pr >= sys->memsize) {
             setcerr(201, s = pr2str(sys->cpu->pr));        /* Program Register (PR) - memory overflow */
-            FREE(s);
             goto execfin;
         }
         /* スタックポインタをチェック */
         if(sys->cpu->sp <= execptr->end) {
             setcerr(202, s = pr2str(sys->cpu->pr));        /* Stack Pointer (SP) - stack overflow */
-            FREE(s);
             goto execfin;
         }
         /* コードから命令を取得 */
         /* 取得できない場合はエラー終了 */
         if((cmdptr = getcmdptr(sys->memory[sys->cpu->pr] & 0xFF00)) == NULL) {
             setcerr(204, s = pr2str(sys->cpu->pr));            /* OP in word #1 - not command code */
-            FREE(s);
             goto execfin;
         }
         /* 命令の実行 */
@@ -865,9 +731,14 @@ void exec()
         if(cerr->num > 0) {
             goto execfin;
         }
-        /* 終了フラグがtrueの場合は、正常終了 */
+        /* 終了フラグがtrueの場合は、モニターまたは正常終了 */
         if(execptr->stop == true) {
-            break;
+            if(execmode.monitor == true) {
+                fprintf(stdout, "Return to top.\n");
+                monitor();
+            } else {
+                break;
+            }
         }
         /* クロック周波数の設定 */
         do {
@@ -875,74 +746,10 @@ void exec()
         } while(clock_end - clock_begin < CLOCKS_PER_SEC / sys->clocks);
     }
 execfin:
-    free_code_cmdtype();                           /* 命令のコードとタイプがキーのハッシュ表を解放 */
+    FREE(s);
+    freebps();
+    free_cmdtable(HASH_CODE);              /* 命令のコードとタイプがキーのハッシュ表を解放 */
     if(cerr->num > 0) {
         fprintf(stderr, "Execute error - %d: %s\n", cerr->num, cerr->msg);
     }
 }
-
-bool disassemble_file(const char *file)
-{
-    bool stat = true;
-    FILE *fp;
-    WORD i = 0, w, cmd, x, adr;
-    CMDTYPE cmdtype = 0;
-    char *cmdname, *g, *g1, *g2;
-
-    assert(file != NULL);
-    if((fp = fopen(file, "rb")) == NULL) {
-        perror(file);
-        return false;
-    }
-
-    create_code_cmdtype();                          /* 命令のコードとタイプがキーのハッシュ表を作成 */
-
-    fprintf(stdout, "MAIN\tSTART\n");
-    for(; ;) {
-        fread(&w, sizeof(WORD), 1, fp);
-        if(feof(fp)) {
-            break;
-        }
-        cmd = w & 0xFF00;
-        cmdname = getcmdname(cmd);
-        cmdtype = getcmdtype(cmd);
-        if(cmd == 0xFF00 || (w != 0 && cmd == 0x0000)) {
-            fprintf(stdout, "\tDC\t%d\t\t\t\t; #%04X: #%04X :: ", w, i++, w);
-            print_dumpword(w, true);
-        } else if(cmdtype == R_ADR_X || cmdtype == ADR_X) {
-            fread(&adr, sizeof(WORD), 1, fp);
-            fprintf(stdout, "\t%s\t", cmdname);
-            if(cmdtype == R_ADR_X) {
-                g = grstr((w & 0x00F0) >> 4);
-                fprintf(stdout, "%s,", g);
-                FREE(g);
-            }
-            fprintf(stdout, "#%04X", adr);
-            if((x = w & 0x000F) != 0) {
-                fprintf(stdout, ",%s", g = grstr(x));
-                FREE(g);
-            }
-            fprintf(stdout, "\t\t\t\t; #%04X: #%04X #%04X", i, w, adr);
-            i += 2;
-        } else {
-            fprintf(stdout, "\t%s", cmdname);
-            if(cmdtype == R1_R2) {
-                g1 = grstr((w & 0x00F0) >> 4);
-                g2 = grstr(w & 0x000F);
-                fprintf(stdout, "\t%s,%s", g1, g2);
-                FREE(g1);
-                FREE(g2);
-            } else if(cmdtype == R_) {
-                g = grstr((w & 0x00F0) >> 4);
-                fprintf(stdout, "\t%s", g);
-                FREE(g);
-            }
-            fprintf(stdout, "\t\t\t\t; #%04X: #%04X", i++, w);
-        }
-        fprintf(stdout, "\n");
-    }
-    fprintf(stdout, "\tEND\n");
-    free_code_cmdtype();
-    fclose(fp);
-    return stat;
-}