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

VAX8200: Added missing error bit to DWBUA CSR

Browse source 
As reported in #690
This commit is contained in:
Matt Burke 2019-05-01 08:55:39 +01:00
parent 95c24b4f81
commit 4aa4f639e6
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VAX/vax820_ka.c
View file

@ -349,13 +349,11 @@ int32 pcsr_rd (int32 pa)
int32 data; int32 data;
int32 ip_int = (ipir >> cur_cpu) & 0x1; int32 ip_int = (ipir >> cur_cpu) & 0x1;
data = ka_pcsr[cur_cpu] | (rxcd_int << PCSR_V_CONINT) | (ip_int << PCSR_V_IPINT); data = ka_pcsr[cur_cpu] | (rxcd_int << PCSR_V_CONINT) | (ip_int << PCSR_V_IPINT);
printf ("pcsr_rd: %08X\n", data);
return data; return data;
} }
void pcsr_wr (int32 pa, int32 val, int32 lnt) void pcsr_wr (int32 pa, int32 val, int32 lnt)
{ {
printf ("pcsr_wr: %08X\n", val);
ka_pcsr[cur_cpu] &= ~(val & PCSR_W1C); ka_pcsr[cur_cpu] &= ~(val & PCSR_W1C);
ka_pcsr[cur_cpu] &= ~(PCSR_WR) | (val & PCSR_WR); ka_pcsr[cur_cpu] &= ~(PCSR_WR) | (val & PCSR_WR);
if (val & PCSR_CONCLR) if (val & PCSR_CONCLR)

10
VAX/vax820_uba.c
View file

@ -50,12 +50,14 @@
#define UBACSR_BDP 0x01000000 /* bad buffered datapath */ #define UBACSR_BDP 0x01000000 /* bad buffered datapath */
#define UBACSR_EIE 0x00100000 /* error interrupt en */ #define UBACSR_EIE 0x00100000 /* error interrupt en */
#define UBACSR_UPI 0x00020000 /* unibus power init */ #define UBACSR_UPI 0x00020000 /* unibus power init */
#define UBACSR_RD 0x00010000 /* register dump */ #define UBACSR_DMP 0x00010000 /* register dump */
#define UBACSR_ONE 0x00008000 /* must be one */ #define UBACSR_MBO 0x00008000 /* must be one */
#define UBACSR_IEN 0x000000FF /* internal error - NI */ #define UBACSR_IEN 0x000000FF /* internal error - NI */
#define UBACSR_WR (UBACSR_EIE) #define UBACSR_WR (UBACSR_EIE)
#define UBACSR_W1C (UBACSR_BIF | UBACSR_TO | UBACSR_UIE | \ #define UBACSR_W1C (UBACSR_BIF | UBACSR_TO | UBACSR_UIE | \
UBACSR_IMR | UBACSR_BDP) UBACSR_IMR | UBACSR_BDP)
#define UBACSR_ERRS (UBACSR_BIF | UBACSR_TO | UBACSR_UIE | \
UBACSR_IMR | UBACSR_BDP)
/* Vector offset register */ /* Vector offset register */
@ -318,7 +320,9 @@ switch (ofs) { /* case on offset */
break; break;
case UBACSR_OF: /* CSR */ case UBACSR_OF: /* CSR */
*val = uba_csr | UBACSR_ONE; *val = uba_csr | UBACSR_MBO;
if (uba_csr & UBACSR_ERRS) /* any errors? */
*val |= UBACSR_ERR; /* yes, set logical OR bit */
break; break;
case UBAVO_OF: /* VO */ case UBAVO_OF: /* VO */