X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdump.c;h=70d4e2e13ffeb7a697e77b8b2fb15e76cfc8ce40;hb=7ac339dcd755848e9820142422752fbdc8186b5c;hp=60ca21d3953a14fceacabee54ef3d1d8a4fe30c1;hpb=4ee27a568fb9222907a566e59aaefe248f08a8e4;p=YACASL2.git

diff --git a/src/dump.c b/src/dump.c
index 60ca21d..70d4e2e 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -1,23 +1,22 @@
-#include "casl2.h"
 #include "exec.h"
 
-/* COMET IIのメモリを表示 */
+/* exec.hに定義された関数群 */
 void dumpmemory()
 {
     const int col = 16;
     int i;
     /* Header */
-    fprintf(stdout, "#%04X: adr :", cpu->pr);
-    for(i = 0; i < memsize && i < col; i++) {
+    fprintf(stdout, "#%04X: adr :", sys->cpu->pr);
+    for(i = 0; i < sys->memsize && i < col; i++) {
         fprintf(stdout, " %04X", i);
     }
     fprintf(stdout, "\n");
     /* Memory */
-    for(i = 0; i < memsize; i++) {
+    for(i = 0; i < sys->memsize; i++) {
         if(i % col == 0) {
-            fprintf(stdout, "#%04X: %04X: ", cpu->pr, i);
+            fprintf(stdout, "#%04X: %04X: ", sys->cpu->pr, i);
         }
-        fprintf(stdout, "%04X", memory[i]);
+        fprintf(stdout, "%04X", (sys->memory)[i]);
         if(i > 0 && (i + 1) % col == 0) {
             fprintf(stdout, "\n");
         } else {
@@ -26,18 +25,22 @@ void dumpmemory()
     }
 }
 
-/* COMET IIのレジスタを表示 */
 void dspregister()
 {
     int i;
+    char *sp, *pr, *fr;
     for(i = 0; i < GRSIZE; i++ ) {
-        fprintf(stdout, "#%04X: GR%d: ", cpu->pr, i);
-        print_dumpword(cpu->gr[i], (&execmode)->logical);
+        fprintf(stdout, "#%04X: GR%d: ", sys->cpu->pr, i);
+        print_dumpword(sys->cpu->gr[i], (&execmode)->logical);
     }
     fprintf(stdout, "#%04X: SP:  %6d = #%04X = %s\n",
-            cpu->pr, cpu->sp, cpu->sp, word2bit(cpu->sp));
+            sys->cpu->pr, sys->cpu->sp, sys->cpu->sp, sp = word2bit(sys->cpu->sp));
     fprintf(stdout, "#%04X: PR:  %6d = #%04X = %s\n",
-            cpu->pr, cpu->pr, cpu->pr, word2bit(cpu->pr));
+            sys->cpu->pr, sys->cpu->pr, sys->cpu->pr, pr = word2bit(sys->cpu->pr));
     fprintf(stdout, "#%04X: FR (OF SF ZF): %s\n",
-            cpu->pr, (word2bit(cpu->fr)+13));
+            sys->cpu->pr, ((fr = word2bit(sys->cpu->fr)) + 13));
+
+    FREE(sp);
+    FREE(pr);
+    FREE(fr);
 }