From 3da3de331e8f63aea0ffc5c16635e3acb71e0f70 Mon Sep 17 00:00:00 2001
From: Richard Cornwell <rich@sky-visions.com>
Date: Sat, 30 Sep 2023 20:03:36 -0400
Subject: [PATCH] KA10: Fixed nopage read/write to always refer to memory.

---
 PDP10/kx10_cpu.c | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/PDP10/kx10_cpu.c b/PDP10/kx10_cpu.c
index 0f1e84fa..2c6ff41f 100644
--- a/PDP10/kx10_cpu.c
+++ b/PDP10/kx10_cpu.c
@@ -4313,21 +4313,17 @@ int Mem_read_nopage() {
     if (adr_cond && AB == AS)
         address_conditions (0, 0);
 #endif
-    if (AB < 020) {
-        MB =  get_reg(AB);
-    } else {
-        if (AB >= MEMSIZE) {
+    if (AB >= MEMSIZE) {
 #if KL | KS
-            irq_flags |= NXM_MEM;
+        irq_flags |= NXM_MEM;
 #else
-            nxm_flag = 1;
+        nxm_flag = 1;
 #endif
-            check_apr_irq();
-            return 1;
-        }
-        sim_interval--;
-        MB = M[AB];
+        check_apr_irq();
+        return 1;
     }
+    sim_interval--;
+    MB = M[AB];
     return 0;
 }
 
@@ -4341,21 +4337,17 @@ int Mem_write_nopage() {
     if (adr_cond && AB == AS)
         address_conditions (0, 1);
 #endif
-    if (AB < 020) {
-        set_reg(AB, MB);
-    } else {
-        if (AB >= MEMSIZE) {
+    if (AB >= MEMSIZE) {
 #if KL | KS
-            irq_flags |= NXM_MEM;
+        irq_flags |= NXM_MEM;
 #else
-            nxm_flag = 1;
+        nxm_flag = 1;
 #endif
-            check_apr_irq();
-            return 1;
-        }
-        sim_interval--;
-        M[AB] = MB;
+        check_apr_irq();
+        return 1;
     }
+    sim_interval--;
+    M[AB] = MB;
     return 0;
 }