-#include "casl2.h"
#include "exec.h"
-/* COMET IIのメモリを表示 */
-void dumpmemory()
+/* exec.hに定義された関数群 */
+void dumpmemory(WORD start, WORD end)
{
- const int col = 16;
- int i;
+ const WORD col = 0x10;
+ WORD i, j, mod = 0x0;
/* Header */
fprintf(stdout, "#%04X: adr :", sys->cpu->pr);
+ if(end > sys->memsize) {
+ end = sys->memsize;
+ }
for(i = 0; i < sys->memsize && i < col; i++) {
fprintf(stdout, " %04X", i);
}
fprintf(stdout, "\n");
+ fprintf(stdout, " -------------------------------------------------------------------------------------\n");
/* Memory */
- for(i = 0; i < sys->memsize; i++) {
- if(i % col == 0) {
+ for(i = start; i < end; i++) {
+ if((mod = i % col) == 0 || i == start) {
fprintf(stdout, "#%04X: %04X: ", sys->cpu->pr, i);
}
+ if(i == start) {
+ for(j = 0; j < mod; j++) {
+ fprintf(stdout, " ");
+ }
+ }
fprintf(stdout, "%04X", (sys->memory)[i]);
- if(i > 0 && (i + 1) % col == 0) {
+ if((i > 0 && (i + 1) % col == 0) || (i + 1) == end) {
fprintf(stdout, "\n");
} else {
fprintf(stdout, " ");
}
}
-/* COMET IIのレジスタを表示 */
void dspregister()
{
int i;
+ char *sp, *pr, *fr;
for(i = 0; i < GRSIZE; i++ ) {
fprintf(stdout, "#%04X: GR%d: ", sys->cpu->pr, i);
- print_dumpword(sys->cpu->gr[i], (&execmode)->logical);
+ print_dumpword(sys->cpu->gr[i], execmode.logical);
+ fprintf(stdout, "\n");
}
fprintf(stdout, "#%04X: SP: %6d = #%04X = %s\n",
- sys->cpu->pr, sys->cpu->sp, sys->cpu->sp, word2bit(sys->cpu->sp));
+ sys->cpu->pr, sys->cpu->sp, sys->cpu->sp, 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));
+ sys->cpu->pr, sys->cpu->pr, sys->cpu->pr, pr = word2bit(sys->cpu->pr));
fprintf(stdout, "#%04X: FR (OF SF ZF): %s\n",
- sys->cpu->pr, (word2bit(sys->cpu->fr)+13));
+ sys->cpu->pr, ((fr = word2bit(sys->cpu->fr)) + 13));
+
+ FREE(sp);
+ FREE(pr);
+ FREE(fr);
}