X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fdump.c;h=769b175534b5ba971dc8b75a9effbf87aa83871b;hp=5362de4b6104e336e8ff5467cb940290e908a8f2;hb=7f7bde5dd1305cfc598fe09030c69aad0dc01368;hpb=faec695d5b7ecf7dd3e4a07ac926ea93ca89020b

diff --git a/src/dump.c b/src/dump.c
index 5362de4..769b175 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -1,36 +1,25 @@
-#include "casl2.h"
+#include <stdio.h>
+#include "exec.h"
 
-/* WORD値を2進数表記に変換 */
-char *word2bit(const WORD word)
-{
-    WORD mask = 0x8000;
-    char *bit, *p;
-    bit = malloc(16 + 1);
-    p = bit;
-    do {
-        *p++ = (word & mask) ? '1' : '0';
-    } while((mask >>= 1) > 0);
-    *p = '\0';
-    return bit;
-}
-
-/* COMET IIのメモリを表示 */
+/**
+ * COMET IIのメモリを表示する
+ */
 void dumpmemory()
 {
     const int col = 16;
     int i;
     /* Header */
-    fprintf(stdout, "#%04X: adr :", PR);
-    for(i = 0; 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: ", 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 {
@@ -39,20 +28,20 @@ void dumpmemory()
     }
 }
 
-/* COMET IIのレジスタを表示 */
+/**
+ * COMET IIのレジスタを表示する
+ */
 void dspregister()
 {
     int i;
-    for(i = 0; i < REGSIZE; i++ ) {
-        if(logicalmode == true) {
-            fprintf(stdout, "#%04X: GR%d: %6d = #%04X = %s\n",
-                    PR, i, GR[i], GR[i], word2bit(GR[i]));
-        } else {
-            fprintf(stdout, "#%04X: GR%d: %6d = #%04X = %s\n",
-                    PR, i, (short)GR[i], GR[i], word2bit(GR[i]));
-        }
+    for(i = 0; i < GRSIZE; i++ ) {
+        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", PR, SP, SP, word2bit(SP));
-    fprintf(stdout, "#%04X: PR:  %6d = #%04X = %s\n", PR, PR, PR, word2bit(PR));
-    fprintf(stdout, "#%04X: FR (OF SF ZF): %s\n", PR, (word2bit(FR)+13));
+    fprintf(stdout, "#%04X: SP:  %6d = #%04X = %s\n",
+            sys->cpu->pr, sys->cpu->sp, sys->cpu->sp, word2bit(sys->cpu->sp));
+    fprintf(stdout, "#%04X: PR:  %6d = #%04X = %s\n",
+            sys->cpu->pr, sys->cpu->pr, sys->cpu->pr, word2bit(sys->cpu->pr));
+    fprintf(stdout, "#%04X: FR (OF SF ZF): %s\n",
+            sys->cpu->pr, (word2bit(sys->cpu->fr)+13));
 }