github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-02-08 09:12:10 +00:00
Code Releases Activity

More General cleanup migrate to using sim_printf vs separate calls to printf and fprintf(sim_log).

Browse Source
This commit is contained in:
Mark Pizzolato
2014-10-24 14:37:37 -07:00
parent ebf53c9cda
commit 995ab8f1e2
23 changed files with 118 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
TX-0/tx0_cpu.c
View File

@@ -426,16 +426,16 @@ void tx0_dump_regs(char *desc)
/* Check regs sanity */
if (AC > DMASK) {
printf("Error: AC > DMASK\n");
sim_printf("Error: AC > DMASK\n");
}
if (MBR > DMASK) {
printf("Error: MBR > DMASK\n");
sim_printf("Error: MBR > DMASK\n");
}
if (LR > DMASK) {
printf("Error: LR > DMASK\n");
sim_printf("Error: LR > DMASK\n");
}
if (!MEM_ADDR_OK(MAR)) {
printf("Error: MAR > %06o\n", MEMSIZE);
sim_printf("Error: MAR > %06o\n", MEMSIZE);
}
}
@@ -812,7 +812,7 @@ t_stat sim_instr (void)
char *tape_cmd[] = {"Backspace Tape", "Read/Select Tape", "Rewind Tape", "Write/Select Tape" };
TRACE_PRINT(ERROR_MSG, ("[%06o] TODO: SEL (magtape)\n", PC-1));
printf("Device %d: CLRA=%d, BINDEC=%d: %s\n", device, CLRA, BINDEC, tape_cmd[tape_ord]);
sim_printf("Device %d: CLRA=%d, BINDEC=%d: %s\n", device, CLRA, BINDEC, tape_cmd[tape_ord]);
}
break;
case IOS_RPF: /* These are used for Magtape control. */
@@ -1108,13 +1108,13 @@ t_stat cpu_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc)
t_stat cpu_set_ext (UNIT *uptr, int32 val, char *cptr, void *desc)
{
printf("Set CPU Extended Mode\n");
sim_printf("Set CPU Extended Mode\n");
return SCPE_OK;
}
t_stat cpu_set_noext (UNIT *uptr, int32 val, char *cptr, void *desc)
{
printf("Set CPU Non-Extended Mode\n");
sim_printf("Set CPU Non-Extended Mode\n");
return SCPE_OK;
}
@@ -1231,7 +1231,7 @@ t_stat sim_load(FILE *fileref, char *cptr, char *fnam, int flag) {
}
}
printf("%d words %s [%06o - %06o].\n", j - lo, flag ? "dumped" : "loaded", lo, j-1);
sim_printf("%d words %s [%06o - %06o].\n", j - lo, flag ? "dumped" : "loaded", lo, j-1);
return SCPE_OK;
}
@@ -1314,7 +1314,7 @@ t_stat sim_opr_orig(int32 op)
int32 rbuf;
rbuf = tti(0,0,0);
TRACE_PRINT(IOS_MSG, ("TTI: character received='%c'\n", rbuf &077));
printf("TTI: character received='%c'\n", rbuf &077);
sim_printf("TTI: character received='%c'\n", rbuf &077);
LR &= 0266666; /* Clear bits 0,2,5,8,...,17 */
LR |= SIGN; /* Set bit 0, character available. */

8
TX-0/tx0_stddev.c
View File

@@ -320,7 +320,7 @@ int32 petr (int32 inst, int32 dev, int32 dat)
do {
result = petr_svc(&petr_unit);
if (result != SCPE_OK) {
printf("PETR: Read error\n");
sim_printf("PETR: Read error\n");
break;
}
} while ((petr_unit.buf & 0100) == 0); /* NOTE: Lines without seventh hole are ignored by PETR. */
@@ -436,7 +436,7 @@ t_stat petr_boot (int32 unitno, DEVICE *dptr)
case 03: /* Storage (opr x) */
MBR = petr(3,0,0); /* Read three characters from tape. */
TRACE_PRINT(petr_dev, ERROR_MSG, ("READIN: sto @%06o = %06o\n", MAR, MBR));
printf("[%06o] = %06o\n", MAR, MBR);
sim_printf("[%06o] = %06o\n", MAR, MBR);
break;
case 02: /* Transfer Control (trn x) Start Execution */
PC = MAR;
@@ -482,7 +482,7 @@ t_stat petr_boot (int32 unitno, DEVICE *dptr)
la = (~la) & 0177777;
printf("First Address=%06o, Last Address=%06o\n", fa, la);
sim_printf("First Address=%06o, Last Address=%06o\n", fa, la);
for(addr = fa; addr <= la; addr++) {
tdata = petr(3,0,0); /* Read three characters from tape. */
@@ -501,7 +501,7 @@ t_stat petr_boot (int32 unitno, DEVICE *dptr)
reason = SCPE_FMT;
}
printf("Block %d: Calculated checksum=%06o, real checksum=%06o, %s\n", blkcnt, chksum, tdata, chksum == tdata ? "OK" : "BAD Checksum!");
sim_printf("Block %d: Calculated checksum=%06o, real checksum=%06o, %s\n", blkcnt, chksum, tdata, chksum == tdata ? "OK" : "BAD Checksum!");
blkcnt++;
}