1
0
mirror of https://github.com/simh/simh.git synced 2026-04-30 05:25:05 +00:00

SCP: Update to Bob Supnik's latest source candidate v3.11.2

This commit is contained in:
Bob Supnik
2020-12-27 13:25:10 -08:00
committed by Mark Pizzolato
parent 507be1f2e2
commit 541d1c3c90
7 changed files with 337 additions and 130 deletions

View File

@@ -1663,10 +1663,13 @@ vax_flag = 0;
lock_flag = 0;
trap_summ = 0;
trap_mask = 0;
if (M == NULL) M = (t_uint64 *) calloc (((uint32) MEMSIZE) >> 3, sizeof (t_uint64));
if (M == NULL) return SCPE_MEM;
if (M == NULL)
M = (t_uint64 *) calloc (((uint32) MEMSIZE) >> 3, sizeof (t_uint64));
if (M == NULL)
return SCPE_MEM;
pcq_r = find_reg ("PCQ", NULL, dptr);
if (pcq_r) pcq_r->qptr = 0;
if (pcq_r)
pcq_r->qptr = 0;
else return SCPE_IERR;
sim_brk_types = sim_brk_dflt = SWMASK ('E');
return SCPE_OK;
@@ -1686,7 +1689,8 @@ t_stat cpu_ex (t_value *vptr, t_addr addr, UNIT *uptr, int32 sw)
if (vptr == NULL) return SCPE_ARG;
if (sw & SWMASK ('V') && dmapen) {
addr = trans_c (addr);
if (addr == M64) return STOP_MME;
if (addr == M64)
return STOP_MME;
}
if (ADDR_IS_MEM (addr)) {
*vptr = ReadPQ (addr);
@@ -1701,7 +1705,8 @@ t_stat cpu_dep (t_value val, t_addr addr, UNIT *uptr, int32 sw)
{
if (sw & SWMASK ('V') && dmapen) {
addr = trans_c (addr);
if (addr == M64) return STOP_MME;
if (addr == M64)
return STOP_MME;
}
if (ADDR_IS_MEM (addr)) {
WritePQ (addr, val);
@@ -1722,7 +1727,8 @@ for (i = val; i < MEMSIZE; i = i + 8) mc = mc | M[i >> 3];
if ((mc != 0) && !get_yn ("Really truncate memory [N]?", FALSE))
return SCPE_OK;
nM = (t_uint64 *) calloc (val >> 3, sizeof (t_uint64));
if (nM == NULL) return SCPE_MEM;
if (nM == NULL)
return SCPE_MEM;
clim = (uint32) ((((uint32) val) < MEMSIZE)? val: MEMSIZE);
for (i = 0; i < clim; i = i + 8) nM[i >> 3] = M[i >>3];
free (M);
@@ -1835,7 +1841,8 @@ if (h_fmt[op] & H_EA) { /* ea? */
}
else fputs (" ", st);
fputc (' ', st);
if (pc & 4) sim_val = ((t_uint64) ir) << 32;
if (pc & 4)
sim_val = ((t_uint64) ir) << 32;
else sim_val = ir;
if ((fprint_sym (st, pc & ~03, &sim_val, &cpu_unit, SWMASK ('M'))) > 0)
fprintf (st, "(undefined) %08X", ir);
@@ -1855,7 +1862,8 @@ InstHistory *h;
if (hst_lnt == 0) return SCPE_NOFNC; /* enabled? */
if (cptr) {
lnt = (int32) get_uint (cptr, 10, hst_lnt, &r);
if ((r != SCPE_OK) || (lnt == 0)) return SCPE_ARG;
if ((r != SCPE_OK) || (lnt == 0))
return SCPE_ARG;
}
else lnt = hst_lnt;
di = hst_p - lnt; /* work forward */