folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MicroVAX2: NVR watch chip simulation cleanup

Browse source 
- Fix NVR EXAMINE & DEPOSIT and SAVE/RESTORE as suggested by Bob Supnik.
- Properly initialize NVR contents when ATTACHed to a new/empty file.
This commit is contained in:
Mark Pizzolato 2016-04-12 13:03:56 -07:00
parent 6043962584
commit 5a5df503af
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
VAX/vax630_sysdev.c
View file

@ -442,7 +442,7 @@ else
else else
result = nvr[rg] | (((int32)nvr[rg+1]) << 16); result = nvr[rg] | (((int32)nvr[rg+1]) << 16);
sim_debug (DBG_REG, &nvr_dev, "nvr_rd(pa=0x%X) returns: 0x%X\n", pa, result); sim_debug (DBG_REG, &nvr_dev, "nvr_rd(pa=0x%X) nvr[0x%X] returns: 0x%X\n", pa, rg, result);
return result; return result;
} }
@ -450,11 +450,11 @@ return result;
void nvr_wr (int32 pa, int32 val, int32 lnt) void nvr_wr (int32 pa, int32 val, int32 lnt)
{ {
int32 rg = (pa - NVRBASE) >> 1; int32 rg = (pa - NVRBASE) >> 1;
uint32 orig_nvr = nvr[rg] | (nvr[rg+1] << 8);
if (rg < 14) /* watch chip */ if (rg < 14) /* watch chip */
wtc_wr (pa, val, lnt); wtc_wr (pa, val, lnt);
else { else {
int32 orig_nvr = (int32)nvr[rg];
int32 v = val; int32 v = val;
int32 r = rg; int32 r = rg;
int32 l = lnt; int32 l = lnt;
@ -466,7 +466,13 @@ else {
v = (v >> 16); v = (v >> 16);
} }
sim_debug (DBG_REG, &nvr_dev, "nvr_wr(pa=0x%X,val=0x%04X,lnt=%d) nvr[%02X] was %04X now %04X\n", pa, val, lnt, rg, orig_nvr, nvr[rg] | (nvr[rg+1] << 8)); if (lnt > 1)
sim_debug (DBG_REG, &nvr_dev, "nvr_wr(pa=0x%X,val=0x%04X,lnt=%d) Unexpected write length\n", pa, val, lnt);
if (pa & 1)
sim_debug (DBG_REG, &nvr_dev, "nvr_wr(pa=0x%X,val=0x%04X,lnt=%d) Unexpected write address\n", pa, val, lnt);
sim_debug (DBG_REG, &nvr_dev, "nvr_wr(pa=0x%X,val=0x%04X,lnt=%d) nvr[0x%02X] was %04X now %04X\n", pa, val, lnt, rg, orig_nvr, nvr[rg]);
} }
} }
@ -478,9 +484,9 @@ uint32 addr = (uint32) exta;
if ((vptr == NULL) || (addr & 03)) if ((vptr == NULL) || (addr & 03))
return SCPE_ARG; return SCPE_ARG;
if (addr >= NVRBASE+NVRASIZE) if (addr >= NVRASIZE)
return SCPE_NXM; return SCPE_NXM;
*vptr = nvr[addr >> 1] | (nvr[(addr >> 1) + 1] << 8); *vptr = (t_value)(nvr[addr >> 1] | (nvr[(addr >> 1) + 1] << 16));
return SCPE_OK; return SCPE_OK;
} }
@ -492,10 +498,10 @@ uint32 addr = (uint32) exta;
if (addr & 03) if (addr & 03)
return SCPE_ARG; return SCPE_ARG;
if (addr >= NVRBASE+NVRASIZE) if (addr >= NVRASIZE)
return SCPE_NXM; return SCPE_NXM;
nvr[addr >> 1] = (uint8) val; nvr[addr >> 1] = (uint8)val;
nvr[(addr >> 1) + 1] = (uint8) (val >> 8); nvr[(addr >> 1) + 1] = (uint8)(val >> 16);
return SCPE_OK; return SCPE_OK;
} }
@ -540,13 +546,17 @@ uint8 nvr_empty_valid[NVRSIZE] = {
t_stat nvr_attach (UNIT *uptr, char *cptr) t_stat nvr_attach (UNIT *uptr, char *cptr)
{ {
t_stat r; t_stat r;
int32 saved_sim_quiet = sim_quiet;
memcpy (nvr, nvr_empty_valid, NVRSIZE);
uptr->flags = uptr->flags | (UNIT_ATTABLE | UNIT_BUFABLE); uptr->flags = uptr->flags | (UNIT_ATTABLE | UNIT_BUFABLE);
sim_quiet = 1;
r = attach_unit (uptr, cptr); r = attach_unit (uptr, cptr);
sim_quiet = saved_sim_quiet;
if (r != SCPE_OK) if (r != SCPE_OK)
uptr->flags = uptr->flags & ~(UNIT_ATTABLE | UNIT_BUFABLE); uptr->flags = uptr->flags & ~(UNIT_ATTABLE | UNIT_BUFABLE);
else { else {
if (uptr->hwmark == 0)
memcpy (nvr, nvr_empty_valid, NVRSIZE);
uptr->hwmark = (uint32) uptr->capac; uptr->hwmark = (uint32) uptr->capac;
wtc_set_valid (); wtc_set_valid ();
} }