From ccdc5d0711ac68f3c521610731b13f482af57cd3 Mon Sep 17 00:00:00 2001
From: CRWolff <27215580+crwolff@users.noreply.github.com>
Date: Sat, 17 Aug 2024 07:20:54 -0600
Subject: [PATCH] Mask QBus addresses to 22 bits

---
 VAX/vax630_io.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/VAX/vax630_io.c b/VAX/vax630_io.c
index c25dbbf9..c8907157 100644
--- a/VAX/vax630_io.c
+++ b/VAX/vax630_io.c
@@ -619,6 +619,7 @@ int32 Map_ReadB (uint32 ba, int32 bc, uint8 *buf)
 int32 i;
 uint32 ma, dat;
 
+ba &= 0x003FFFFF;
 if ((ba | bc) & 03) {                                   /* check alignment */
     for (i = ma = 0; i < bc; i++, buf++) {              /* by bytes */
         if ((ma & VA_M_OFF) == 0) {                     /* need map? */
@@ -651,6 +652,7 @@ int32 Map_ReadW (uint32 ba, int32 bc, uint16 *buf)
 int32 i;
 uint32 ma,dat;
 
+ba &= 0x003FFFFF;
 ba = ba & ~01;
 bc = bc & ~01;
 if ((ba | bc) & 03) {                                   /* check alignment */
@@ -683,6 +685,7 @@ int32 Map_WriteB (uint32 ba, int32 bc, const uint8 *buf)
 int32 i;
 uint32 ma, dat;
 
+ba &= 0x003FFFFF;
 if ((ba | bc) & 03) {                                   /* check alignment */
     for (i = ma = 0; i < bc; i++, buf++) {              /* by bytes */
         if ((ma & VA_M_OFF) == 0) {                     /* need map? */
@@ -715,6 +718,7 @@ int32 Map_WriteW (uint32 ba, int32 bc, const uint16 *buf)
 int32 i;
 uint32 ma, dat;
 
+ba &= 0x003FFFFF;
 ba = ba & ~01;
 bc = bc & ~01;
 if ((ba | bc) & 03) {                                   /* check alignment */