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

KA10: Fixed some compiler warnings on MACOS.

Browse source
This commit is contained in:
Richard Cornwell 2022-03-06 23:20:19 -05:00
parent 16042a7b96
commit 3dd0d03321
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
PDP10/ks10_uba.c
View file

@ -207,7 +207,7 @@ uba_read_npr(t_addr addr, uint16 ctl, uint64 *data)
return 0; return 0;
if ((map & MAP_VALID) == 0) if ((map & MAP_VALID) == 0)
return 0; return 0;
addr = (map & PAGE_MASK) | (addr >> 2) & 0777; addr = (map & PAGE_MASK) | ((addr >> 2) & 0777);
*data = M[addr]; *data = M[addr];
sim_debug(DEBUG_DATA, &cpu_dev, "Rd NPR %08o %08o %012llo\n", oaddr, addr, *data); sim_debug(DEBUG_DATA, &cpu_dev, "Rd NPR %08o %08o %012llo\n", oaddr, addr, *data);
return 1; return 1;
@ -223,7 +223,7 @@ uba_write_npr(t_addr addr, uint16 ctl, uint64 data)
return 0; return 0;
if ((map & MAP_VALID) == 0) if ((map & MAP_VALID) == 0)
return 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); sim_debug(DEBUG_DATA, &cpu_dev, "Wr NPR %08o %08o %012llo\n", oaddr, addr, data);
M[addr] = data; M[addr] = data;
return 1; return 1;
@ -240,7 +240,7 @@ uba_read_npr_byte(t_addr addr, uint16 ctl, uint8 *data)
return 0; return 0;
if ((map & MAP_VALID) == 0) if ((map & MAP_VALID) == 0)
return 0; return 0;
addr = (map & PAGE_MASK) | (addr >> 2) & 0777; addr = (map & PAGE_MASK) | ((addr >> 2) & 0777);
wd = M[addr]; wd = M[addr];
sim_debug(DEBUG_DATA, &cpu_dev, "RD NPR B %08o %08o %012llo ", oaddr, addr, wd); sim_debug(DEBUG_DATA, &cpu_dev, "RD NPR B %08o %08o %012llo ", oaddr, addr, wd);
if ((oaddr & 02) == 0) if ((oaddr & 02) == 0)
@ -265,7 +265,7 @@ uba_write_npr_byte(t_addr addr, uint16 ctl, uint8 data)
return 0; return 0;
if ((map & MAP_VALID) == 0) if ((map & MAP_VALID) == 0)
return 0; return 0;
addr = (map & PAGE_MASK) | (addr >> 2) & 0777; addr = (map & PAGE_MASK) | ((addr >> 2) & 0777);
msk = 0377; msk = 0377;
buf = (uint64)(data & msk); buf = (uint64)(data & msk);
wd = M[addr]; wd = M[addr];
@ -296,7 +296,7 @@ uba_read_npr_word(t_addr addr, uint16 ctl, uint16 *data)
return 0; return 0;
if ((map & MAP_VALID) == 0) if ((map & MAP_VALID) == 0)
return 0; return 0;
addr = (map & PAGE_MASK) | (addr >> 2) & 0777; addr = (map & PAGE_MASK) | ((addr >> 2) & 0777);
wd = M[addr]; wd = M[addr];
sim_debug(DEBUG_DATA, &cpu_dev, "RD NPR W %08o %08o %012llo m=%o\n", oaddr, addr, wd, map); sim_debug(DEBUG_DATA, &cpu_dev, "RD NPR W %08o %08o %012llo m=%o\n", oaddr, addr, wd, map);
if ((oaddr & 02) == 0) if ((oaddr & 02) == 0)
@ -318,7 +318,7 @@ uba_write_npr_word(t_addr addr, uint16 ctl, uint16 data)
return 0; return 0;
if ((map & MAP_VALID) == 0) if ((map & MAP_VALID) == 0)
return 0; return 0;
addr = (map & PAGE_MASK) | (addr >> 2) & 0777; addr = (map & PAGE_MASK) | ((addr >> 2) & 0777);
msk = 0177777; msk = 0177777;
buf = (uint64)(data & msk); buf = (uint64)(data & msk);
wd = M[addr]; wd = M[addr];

2
PDP10/kx10_cpu.c
View file

@ -4930,7 +4930,7 @@ unasign:
MB = SMASK|BIT2| MB = SMASK|BIT2|
((uint64)(fm_sel & 0160) << 23) | ((uint64)(fm_sel & 0160) << 23) |
((uint64)(prev_ctx & 0160) << 20) | ((uint64)(prev_ctx & 0160) << 20) |
ub_ptr & 03777777; (ub_ptr & 03777777);
Mem_write_nopage(); Mem_write_nopage();
#endif #endif
} }