-#include "casl2.h"
#include "exec.h"
-/* WORD値を2進数表記に変換 */
-char *word2bit(const WORD word)
-{
- WORD mask = 0x8000;
- char *bit, *p;
- bit = malloc(16 + 1);
- p = bit;
- while(mask > 0){
- if((word & mask) == 0) {
- *p++ = '0';
- } else {
- *p++ = '1';
- }
- mask = (mask >> 1);
- }
- *p = '\0';
- return bit;
-}
-
-/* COMET IIのメモリを表示 */
+/* exec.hに定義された関数群 */
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 {
}
}
-/* 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]));
- }
+ 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);
+ fprintf(stdout, "\n");
}
- 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, sp = word2bit(sys->cpu->sp));
+ fprintf(stdout, "#%04X: PR: %6d = #%04X = %s\n",
+ 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, ((fr = word2bit(sys->cpu->fr)) + 13));
+
+ FREE(sp);
+ FREE(pr);
+ FREE(fr);
}