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

SWTP: Cleanup Coverity identified issues

Browse source
This commit is contained in:
Bill Beech 2017-03-20 13:32:43 -07:00
parent 6831746400
commit bef62a51fd
4 changed files with 41 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
swtp6800/common/bootrom.c
View file

@ -218,6 +218,7 @@ t_stat BOOTROM_reset (DEVICE *dptr)
if (fp == NULL) { if (fp == NULL) {
printf("\tUnable to open ROM file %s\n",BOOTROM_unit.filename); printf("\tUnable to open ROM file %s\n",BOOTROM_unit.filename);
printf("\tNo ROM image loaded!!!\n"); printf("\tNo ROM image loaded!!!\n");
fclose(fp);
return SCPE_OK; return SCPE_OK;
} }
j = 0; /* load EPROM file */ j = 0; /* load EPROM file */

18
swtp6800/common/mp-a.c
View file

@ -140,25 +140,24 @@ int32 CPU_BD_get_mbyte(int32 addr)
if (CPU_BD_unit.flags & UNIT_RAM) { if (CPU_BD_unit.flags & UNIT_RAM) {
val = m6810_get_mbyte(addr - 0xA000) & 0xFF; val = m6810_get_mbyte(addr - 0xA000) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: m6810 val=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: m6810 val=%02X\n", val);
return val;
} else { } else {
val = MB_get_mbyte(addr) & 0xFF; val = MB_get_mbyte(addr) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: m6810 val=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: m6810 val=%02X\n", val);
return val;
} }
break;
case 0xE000: case 0xE000:
val = BOOTROM_get_mbyte(addr - 0xE000) & 0xFF; val = BOOTROM_get_mbyte(addr - 0xE000) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: EPROM=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: EPROM=%02X\n", val);
return val; break;
case 0xF000: case 0xF000:
val = BOOTROM_get_mbyte(addr - (0x10000 - BOOTROM_unit.capac)) & 0xFF; val = BOOTROM_get_mbyte(addr - (0x10000 - BOOTROM_unit.capac)) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: EPROM=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: EPROM=%02X\n", val);
return val; break;
default: default:
val = MB_get_mbyte(addr) & 0xFF; val = MB_get_mbyte(addr) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: mp_b2 val=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: mp_b2 val=%02X\n", val);
return val;
} }
return val;
} }
/* get a word from memory */ /* get a word from memory */
@ -183,16 +182,13 @@ void CPU_BD_put_mbyte(int32 addr, int32 val)
addr, val); addr, val);
switch(addr & 0xF000) { switch(addr & 0xF000) {
case 0xA000: case 0xA000:
if (CPU_BD_unit.flags & UNIT_RAM) { if (CPU_BD_unit.flags & UNIT_RAM)
m6810_put_mbyte(addr - 0xA000, val); m6810_put_mbyte(addr - 0xA000, val);
return; else
} else {
MB_put_mbyte(addr, val); MB_put_mbyte(addr, val);
return; break;
}
default: default:
MB_put_mbyte(addr, val); MB_put_mbyte(addr, val);
return;
} }
} }

21
swtp6800/common/mp-a2.c
View file

@ -181,35 +181,33 @@ int32 CPU_BD_get_mbyte(int32 addr)
if (CPU_BD_unit.flags & UNIT_RAM) { if (CPU_BD_unit.flags & UNIT_RAM) {
val = m6810_get_mbyte(addr - 0xA000) & 0xFF; val = m6810_get_mbyte(addr - 0xA000) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: m6810 val=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: m6810 val=%02X\n", val);
return val;
} else { } else {
val = MB_get_mbyte(addr) & 0xFF; val = MB_get_mbyte(addr) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: m6810 val=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: m6810 val=%02X\n", val);
return val;
} }
break;
case 0xC000: case 0xC000:
if (CPU_BD_unit.flags & UNIT_LO_PROM) { if (CPU_BD_unit.flags & UNIT_LO_PROM) {
val = i2716_get_mbyte(addr - 0xC000) & 0xFF; val = i2716_get_mbyte(addr - 0xC000) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: 2716=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: 2716=%02X\n", val);
return val;
} else } else
return 0xFF; val = 0xFF;
break; break;
case 0xE000: case 0xE000:
val = BOOTROM_get_mbyte(addr - 0xE000) & 0xFF; val = BOOTROM_get_mbyte(addr - 0xE000) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: EPROM=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: EPROM=%02X\n", val);
return val; break;
case 0xF000: case 0xF000:
if (CPU_BD_unit.flags & UNIT_MON) { if (CPU_BD_unit.flags & UNIT_MON) {
val = BOOTROM_get_mbyte(addr - (0x10000 - BOOTROM_unit.capac)) & 0xFF; val = BOOTROM_get_mbyte(addr - (0x10000 - BOOTROM_unit.capac)) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: EPROM=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: EPROM=%02X\n", val);
return val;
} }
break;
default: default:
val = MB_get_mbyte(addr) & 0xFF; val = MB_get_mbyte(addr) & 0xFF;
sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: mp_b2 val=%02X\n", val); sim_debug (DEBUG_read, &CPU_BD_dev, "CPU_BD_get_mbyte: mp_b2 val=%02X\n", val);
return val;
} }
return val;
} }
/* get a word from memory */ /* get a word from memory */
@ -234,16 +232,13 @@ void CPU_BD_put_mbyte(int32 addr, int32 val)
addr, val); addr, val);
switch(addr & 0xF000) { switch(addr & 0xF000) {
case 0xA000: case 0xA000:
if (CPU_BD_unit.flags & UNIT_RAM) { if (CPU_BD_unit.flags & UNIT_RAM)
m6810_put_mbyte(addr - 0xA000, val); m6810_put_mbyte(addr - 0xA000, val);
return; else
} else {
MB_put_mbyte(addr, val); MB_put_mbyte(addr, val);
return; break;
}
default: default:
MB_put_mbyte(addr, val); MB_put_mbyte(addr, val);
return;
} }
} }

55
swtp6800/common/mp-b2.c
View file

@ -190,19 +190,17 @@ int32 MB_get_mbyte(int32 addr)
sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: addr=%04X\n", addr); sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: addr=%04X\n", addr);
if (MB_dev.dctrl & DEBUG_read) if (MB_dev.dctrl & DEBUG_read)
printf("MB_get_mbyte: mp_8m val=%02X\n", val); printf("MB_get_mbyte: mp_8m val=%02X\n", val);
return val;
} else } else
return 0xFF; val = 0xFF;
/* fall through */ break;
case 0x2000: case 0x2000:
case 0x3000: case 0x3000:
if (MB_unit.flags & UNIT_RAM_2000) { if (MB_unit.flags & UNIT_RAM_2000) {
val = mp_8m_get_mbyte(addr) & 0xFF; val = mp_8m_get_mbyte(addr) & 0xFF;
sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: mp_8m val=%02X\n", val); sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: mp_8m val=%02X\n", val);
return val;
} else } else
return 0xFF; val = 0xFF;
/* fall through */ break;
case 0x4000: case 0x4000:
case 0x5000: case 0x5000:
if (MB_unit.flags & UNIT_RAM_4000) { if (MB_unit.flags & UNIT_RAM_4000) {
@ -210,19 +208,17 @@ int32 MB_get_mbyte(int32 addr)
sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: addr=%04X\n", addr); sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: addr=%04X\n", addr);
if (MB_dev.dctrl & DEBUG_read) if (MB_dev.dctrl & DEBUG_read)
printf("MB_get_mbyte: mp_8m val=%02X\n", val); printf("MB_get_mbyte: mp_8m val=%02X\n", val);
return val;
} else } else
return 0xFF; val = 0xFF;
/* fall through */ break;
case 0x6000: case 0x6000:
case 0x7000: case 0x7000:
if (MB_unit.flags & UNIT_RAM_6000) { if (MB_unit.flags & UNIT_RAM_6000) {
val = mp_8m_get_mbyte(addr) & 0xFF; val = mp_8m_get_mbyte(addr) & 0xFF;
sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: mp_8m val=%02X\n", val); sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: mp_8m val=%02X\n", val);
return val;
} else } else
return 0xFF; val = 0xFF;
/* fall through */ break;
case 0x8000: case 0x8000:
if (addr < 0x8020) if (addr < 0x8020)
val = (dev_table[addr - 0x8000].routine(0, 0)) & 0xFF; val = (dev_table[addr - 0x8000].routine(0, 0)) & 0xFF;
@ -230,29 +226,27 @@ int32 MB_get_mbyte(int32 addr)
val = 0xFF; val = 0xFF;
sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: I/O addr=%04X val=%02X\n", sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: I/O addr=%04X val=%02X\n",
addr, val); addr, val);
return val; break;
/* fall through */
case 0xA000: case 0xA000:
case 0xB000: case 0xB000:
if (MB_unit.flags & UNIT_RAM_A000) { if (MB_unit.flags & UNIT_RAM_A000) {
val = mp_8m_get_mbyte(addr) & 0xFF; val = mp_8m_get_mbyte(addr) & 0xFF;
sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: mp_8m val=%02X\n", val); sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: mp_8m val=%02X\n", val);
return val;
} else } else
return 0xFF; val = 0xFF;
/* fall through */ break;
case 0xC000: case 0xC000:
case 0xD000: case 0xD000:
if (MB_unit.flags & UNIT_RAM_C000) { if (MB_unit.flags & UNIT_RAM_C000) {
val = mp_8m_get_mbyte(addr) & 0xFF; val = mp_8m_get_mbyte(addr) & 0xFF;
sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: mp_8m val=%02X\n", val); sim_debug (DEBUG_read, &MB_dev, "MB_get_mbyte: mp_8m val=%02X\n", val);
return val;
} else } else
return 0xFF; val = 0xFF;
/* fall through */ break;
default: default:
return 0xFF; val = 0xFF;
} }
return val;
} }
/* get a word from memory */ /* get a word from memory */
@ -280,44 +274,45 @@ void MB_put_mbyte(int32 addr, int32 val)
case 0x1000: case 0x1000:
if (MB_unit.flags & UNIT_RAM_0000) { if (MB_unit.flags & UNIT_RAM_0000) {
mp_8m_put_mbyte(addr, val); mp_8m_put_mbyte(addr, val);
return;
} }
break;
case 0x2000: case 0x2000:
case 0x3000: case 0x3000:
if (MB_unit.flags & UNIT_RAM_2000) { if (MB_unit.flags & UNIT_RAM_2000) {
mp_8m_put_mbyte(addr, val); mp_8m_put_mbyte(addr, val);
return;
} }
break;
case 0x4000: case 0x4000:
case 0x5000: case 0x5000:
if (MB_unit.flags & UNIT_RAM_4000) { if (MB_unit.flags & UNIT_RAM_4000) {
mp_8m_put_mbyte(addr, val); mp_8m_put_mbyte(addr, val);
return;
} }
break;
case 0x6000: case 0x6000:
case 0x7000: case 0x7000:
if (MB_unit.flags & UNIT_RAM_6000) { if (MB_unit.flags & UNIT_RAM_6000) {
mp_8m_put_mbyte(addr, val); mp_8m_put_mbyte(addr, val);
return;
} }
break;
case 0x8000: case 0x8000:
if (addr < 0x8020) if (addr < 0x8020) {
dev_table[addr - 0x8000].routine(1, val); dev_table[addr - 0x8000].routine(1, val);
return; }
break;
case 0xA000: case 0xA000:
case 0xB000: case 0xB000:
if (MB_unit.flags & UNIT_RAM_A000) { if (MB_unit.flags & UNIT_RAM_A000) {
mp_8m_put_mbyte(addr, val); mp_8m_put_mbyte(addr, val);
return;
} }
break;
case 0xC000: case 0xC000:
case 0xD000: case 0xD000:
if (MB_unit.flags & UNIT_RAM_C000) { if (MB_unit.flags & UNIT_RAM_C000) {
mp_8m_put_mbyte(addr, val); mp_8m_put_mbyte(addr, val);
return;
} }
break;
default: default:
return; ;
} }
} }