diff --git a/PDP10/ks10_uba.c b/PDP10/ks10_uba.c index 990cd598..40dde721 100644 --- a/PDP10/ks10_uba.c +++ b/PDP10/ks10_uba.c @@ -207,7 +207,7 @@ uba_read_npr(t_addr addr, uint16 ctl, uint64 *data) return 0; if ((map & MAP_VALID) == 0) return 0; - addr = (map & PAGE_MASK) | (addr >> 2) & 0777; + addr = (map & PAGE_MASK) | ((addr >> 2) & 0777); *data = M[addr]; sim_debug(DEBUG_DATA, &cpu_dev, "Rd NPR %08o %08o %012llo\n", oaddr, addr, *data); return 1; @@ -223,7 +223,7 @@ uba_write_npr(t_addr addr, uint16 ctl, uint64 data) return 0; if ((map & MAP_VALID) == 0) return 0; - addr = (map & PAGE_MASK) | (addr >> 2) & 0777; + addr = (map & PAGE_MASK) | ((addr >> 2) & 0777); sim_debug(DEBUG_DATA, &cpu_dev, "Wr NPR %08o %08o %012llo\n", oaddr, addr, data); M[addr] = data; return 1; @@ -240,7 +240,7 @@ uba_read_npr_byte(t_addr addr, uint16 ctl, uint8 *data) return 0; if ((map & MAP_VALID) == 0) return 0; - addr = (map & PAGE_MASK) | (addr >> 2) & 0777; + addr = (map & PAGE_MASK) | ((addr >> 2) & 0777); wd = M[addr]; sim_debug(DEBUG_DATA, &cpu_dev, "RD NPR B %08o %08o %012llo ", oaddr, addr, wd); if ((oaddr & 02) == 0) @@ -265,7 +265,7 @@ uba_write_npr_byte(t_addr addr, uint16 ctl, uint8 data) return 0; if ((map & MAP_VALID) == 0) return 0; - addr = (map & PAGE_MASK) | (addr >> 2) & 0777; + addr = (map & PAGE_MASK) | ((addr >> 2) & 0777); msk = 0377; buf = (uint64)(data & msk); wd = M[addr]; @@ -296,7 +296,7 @@ uba_read_npr_word(t_addr addr, uint16 ctl, uint16 *data) return 0; if ((map & MAP_VALID) == 0) return 0; - addr = (map & PAGE_MASK) | (addr >> 2) & 0777; + addr = (map & PAGE_MASK) | ((addr >> 2) & 0777); wd = M[addr]; sim_debug(DEBUG_DATA, &cpu_dev, "RD NPR W %08o %08o %012llo m=%o\n", oaddr, addr, wd, map); if ((oaddr & 02) == 0) @@ -318,7 +318,7 @@ uba_write_npr_word(t_addr addr, uint16 ctl, uint16 data) return 0; if ((map & MAP_VALID) == 0) return 0; - addr = (map & PAGE_MASK) | (addr >> 2) & 0777; + addr = (map & PAGE_MASK) | ((addr >> 2) & 0777); msk = 0177777; buf = (uint64)(data & msk); wd = M[addr]; diff --git a/PDP10/kx10_cpu.c b/PDP10/kx10_cpu.c index 59de12e4..c8970f36 100644 --- a/PDP10/kx10_cpu.c +++ b/PDP10/kx10_cpu.c @@ -4930,7 +4930,7 @@ unasign: MB = SMASK|BIT2| ((uint64)(fm_sel & 0160) << 23) | ((uint64)(prev_ctx & 0160) << 20) | - ub_ptr & 03777777; + (ub_ptr & 03777777); Mem_write_nopage(); #endif }