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

VAX750: Fix some 750 UBA inconsistencies

Browse source
This commit is contained in:
Mark Pizzolato 2017-04-06 18:12:44 -07:00
parent 1c83826b43
commit d42dd707e9
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
VAX/vax750_uba.c
View file

@ -34,7 +34,7 @@
/* Unibus adapter */ /* Unibus adapter */
#define UBA_NDPATH 4 /* number of data paths */ #define UBA_NDPATH 4 /* number of data paths */
#define UBA_NMAPR 496 /* number of map reg */ #define UBA_NMAPR 512 /* number of map reg */
/* Unibus adapter configuration register */ /* Unibus adapter configuration register */
@ -73,7 +73,7 @@
#define UBAMAP_LWAE 0x04000000 /* LW access enb - ni */ #define UBAMAP_LWAE 0x04000000 /* LW access enb - ni */
#define UBAMAP_ODD 0x02000000 /* odd byte */ #define UBAMAP_ODD 0x02000000 /* odd byte */
#define UBAMAP_V_DP 21 /* data path */ #define UBAMAP_V_DP 21 /* data path */
#define UBAMAP_M_DP 0xF #define UBAMAP_M_DP 0x3
#define UBAMAP_DP (UBAMAP_M_DP << UBAMAP_V_DP) #define UBAMAP_DP (UBAMAP_M_DP << UBAMAP_V_DP)
#define UBAMAP_GETDP(x) (((x) >> UBAMAP_V_DP) & UBAMAP_M_DP) #define UBAMAP_GETDP(x) (((x) >> UBAMAP_V_DP) & UBAMAP_M_DP)
#define UBAMAP_PAG 0x001FFFFF #define UBAMAP_PAG 0x001FFFFF
@ -235,12 +235,6 @@ switch (ofs) { /* case on offset */
case UBADPR_OF + 1: case UBADPR_OF + 1:
case UBADPR_OF + 2: case UBADPR_OF + 3: case UBADPR_OF + 2: case UBADPR_OF + 3:
case UBADPR_OF + 4: case UBADPR_OF + 5:
case UBADPR_OF + 6: case UBADPR_OF + 7:
case UBADPR_OF + 8: case UBADPR_OF + 9:
case UBADPR_OF + 10: case UBADPR_OF + 11:
case UBADPR_OF + 12: case UBADPR_OF + 13:
case UBADPR_OF + 14: case UBADPR_OF + 15:
idx = ofs - UBADPR_OF; idx = ofs - UBADPR_OF;
*val = uba_dpr[idx] & UBADPR_RD; *val = uba_dpr[idx] & UBADPR_RD;
break; break;