X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fdump.c;h=51650c975c3a6367840c9a353724603ee95a8e21;hp=09fe4ddff4724230ef1a650d7776ea2eac94017e;hb=80ce7950a164d14c61db94dc6d6d1eccef8b32cc;hpb=e07b6371cc8a59c6793a895e968ff2c6cf28181b

diff --git a/src/dump.c b/src/dump.c
index 09fe4dd..51650c9 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -1,4 +1,5 @@
 #include "casl2.h"
+#include "exec.h"
 
 /* COMET IIのメモリを表示 */
 void dumpmemory()
@@ -7,7 +8,7 @@ void dumpmemory()
     int i;
     /* Header */
     fprintf(stdout, "#%04X: adr :", PR);
-    for(i = 0; i < col; i++) {
+    for(i = 0; i < memsize && i < col; i++) {
         fprintf(stdout, " %04X", i);
     }
     fprintf(stdout, "\n");
@@ -30,13 +31,8 @@ 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]));
-        }
+        fprintf(stdout, "#%04X: GR%d: ", PR, i);
+        print_dumpword(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));