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

VAX: Mask QBus addresses to 22 bits for ka630/ka65x

Browse source
This commit is contained in:
CRWolff 2024-08-18 12:45:21 -06:00 • committed by Paul Koning
parent 4b73c8d81b
commit 0e83a37a99
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
VAX/vax630_io.c
View file

@ -619,7 +619,7 @@ int32 Map_ReadB (uint32 ba, int32 bc, uint8 *buf)
int32 i; int32 i;
uint32 ma, dat; uint32 ma, dat;
ba = ba & 0x00FFFFFF; ba = ba & QBMAMASK;
if ((ba | bc) & 03) { /* check alignment */ if ((ba | bc) & 03) { /* check alignment */
for (i = ma = 0; i < bc; i++, buf++) { /* by bytes */ for (i = ma = 0; i < bc; i++, buf++) { /* by bytes */
if ((ma & VA_M_OFF) == 0) { /* need map? */ if ((ma & VA_M_OFF) == 0) { /* need map? */
@ -652,7 +652,7 @@ int32 Map_ReadW (uint32 ba, int32 bc, uint16 *buf)
int32 i; int32 i;
uint32 ma,dat; uint32 ma,dat;
ba = ba & 0x00FFFFFE; ba = ba & QBMAMASK & ~01;
bc = bc & ~01; bc = bc & ~01;
if ((ba | bc) & 03) { /* check alignment */ if ((ba | bc) & 03) { /* check alignment */
for (i = ma = 0; i < bc; i = i + 2, buf++) { /* by words */ for (i = ma = 0; i < bc; i = i + 2, buf++) { /* by words */
@ -684,7 +684,7 @@ int32 Map_WriteB (uint32 ba, int32 bc, const uint8 *buf)
int32 i; int32 i;
uint32 ma, dat; uint32 ma, dat;
ba = ba & 0x00FFFFFF; ba = ba & QBMAMASK;
if ((ba | bc) & 03) { /* check alignment */ if ((ba | bc) & 03) { /* check alignment */
for (i = ma = 0; i < bc; i++, buf++) { /* by bytes */ for (i = ma = 0; i < bc; i++, buf++) { /* by bytes */
if ((ma & VA_M_OFF) == 0) { /* need map? */ if ((ma & VA_M_OFF) == 0) { /* need map? */
@ -717,7 +717,7 @@ int32 Map_WriteW (uint32 ba, int32 bc, const uint16 *buf)
int32 i; int32 i;
uint32 ma, dat; uint32 ma, dat;
ba = ba & 0x00FFFFFE; ba = ba & QBMAMASK & ~01;
bc = bc & ~01; bc = bc & ~01;
if ((ba | bc) & 03) { /* check alignment */ if ((ba | bc) & 03) { /* check alignment */
for (i = ma = 0; i < bc; i = i + 2, buf++) { /* by words */ for (i = ma = 0; i < bc; i = i + 2, buf++) { /* by words */

12
VAX/vax_io.c
View file

@ -106,6 +106,12 @@
#define QB_VEC_MASK 0x1FC /* Interrupt Vector value mask */ #define QB_VEC_MASK 0x1FC /* Interrupt Vector value mask */
/* Qbus memory space */
#define QBMAWIDTH 22 /* Qmem addr width */
#define QBMSIZE (1u << QBMAWIDTH) /* Qmem length */
#define QBMAMASK (QBMSIZE - 1) /* Qmem addr mask */
int32 int_req[IPL_HLVL] = { 0 }; /* intr, IPL 14-17 */ int32 int_req[IPL_HLVL] = { 0 }; /* intr, IPL 14-17 */
int32 int_vec_set[IPL_HLVL][32] = { 0 }; /* bits to set in vector */ int32 int_vec_set[IPL_HLVL][32] = { 0 }; /* bits to set in vector */
int32 cq_scr = 0; /* SCR */ int32 cq_scr = 0; /* SCR */
@ -765,6 +771,7 @@ int32 Map_ReadB (uint32 ba, int32 bc, uint8 *buf)
int32 i; int32 i;
uint32 ma, dat; uint32 ma, dat;
ba = ba & QBMAMASK;
if ((ba | bc) & 03) { /* check alignment */ if ((ba | bc) & 03) { /* check alignment */
for (i = ma = 0; i < bc; i++, buf++) { /* by bytes */ for (i = ma = 0; i < bc; i++, buf++) { /* by bytes */
if ((ma & VA_M_OFF) == 0) { /* need map? */ if ((ma & VA_M_OFF) == 0) { /* need map? */
@ -797,7 +804,7 @@ int32 Map_ReadW (uint32 ba, int32 bc, uint16 *buf)
int32 i; int32 i;
uint32 ma,dat; uint32 ma,dat;
ba = ba & ~01; ba = ba & QBMAMASK & ~01;
bc = bc & ~01; bc = bc & ~01;
if ((ba | bc) & 03) { /* check alignment */ if ((ba | bc) & 03) { /* check alignment */
for (i = ma = 0; i < bc; i = i + 2, buf++) { /* by words */ for (i = ma = 0; i < bc; i = i + 2, buf++) { /* by words */
@ -829,6 +836,7 @@ int32 Map_WriteB (uint32 ba, int32 bc, const uint8 *buf)
int32 i; int32 i;
uint32 ma, dat; uint32 ma, dat;
ba = ba & QBMAMASK;
if ((ba | bc) & 03) { /* check alignment */ if ((ba | bc) & 03) { /* check alignment */
for (i = ma = 0; i < bc; i++, buf++) { /* by bytes */ for (i = ma = 0; i < bc; i++, buf++) { /* by bytes */
if ((ma & VA_M_OFF) == 0) { /* need map? */ if ((ma & VA_M_OFF) == 0) { /* need map? */
@ -861,7 +869,7 @@ int32 Map_WriteW (uint32 ba, int32 bc, const uint16 *buf)
int32 i; int32 i;
uint32 ma, dat; uint32 ma, dat;
ba = ba & ~01; ba = ba & QBMAMASK & ~01;
bc = bc & ~01; bc = bc & ~01;
if ((ba | bc) & 03) { /* check alignment */ if ((ba | bc) & 03) { /* check alignment */
for (i = ma = 0; i < bc; i = i + 2, buf++) { /* by words */ for (i = ma = 0; i < bc; i = i + 2, buf++) { /* by words */