Compiler suggested fixes

This commit is contained in:
Mark Pizzolato 2013-01-23 12:36:03 -08:00
parent f7e8024c59
commit 9091330a5f
6 changed files with 10 additions and 8 deletions

View file

@ -1244,7 +1244,7 @@ static const int32 boot_rom[] = {
t_stat cpu_boot (int32 unitno, DEVICE *dptr) t_stat cpu_boot (int32 unitno, DEVICE *dptr)
{ {
int32 i; size_t i;
for (i = 0; i < BOOT_LEN; i++) M[BOOT_START + i] = boot_rom[i]; for (i = 0; i < BOOT_LEN; i++) M[BOOT_START + i] = boot_rom[i];
saved_PC = BOOT_START; saved_PC = BOOT_START;

View file

@ -1085,7 +1085,7 @@ static const int32 boot_rom[] = {
t_stat dkp_boot (int32 unitno, DEVICE *dptr) t_stat dkp_boot (int32 unitno, DEVICE *dptr)
{ {
int32 i; size_t i;
for (i = 0; i < BOOT_LEN; i++) for (i = 0; i < BOOT_LEN; i++)
M[BOOT_START + i] = (uint16) boot_rom[i]; M[BOOT_START + i] = (uint16) boot_rom[i];

View file

@ -297,7 +297,7 @@ static const int32 boot_rom[] = {
t_stat dsk_boot (int32 unitno, DEVICE *dptr) t_stat dsk_boot (int32 unitno, DEVICE *dptr)
{ {
int32 i; size_t i;
for (i = 0; i < BOOT_LEN; i++) M[BOOT_START + i] = (uint16) boot_rom[i]; for (i = 0; i < BOOT_LEN; i++) M[BOOT_START + i] = (uint16) boot_rom[i];
saved_PC = BOOT_START; saved_PC = BOOT_START;

View file

@ -717,7 +717,7 @@ static const uint16 boot_rom[] = {
t_stat ct_boot (int32 unitno, DEVICE *dptr) t_stat ct_boot (int32 unitno, DEVICE *dptr)
{ {
int32 i; size_t i;
extern int32 saved_PC; extern int32 saved_PC;
extern uint16 M[]; extern uint16 M[];

View file

@ -1019,6 +1019,8 @@ switch (rlcs_state) {
if (sim_fseek (uptr->fileref, da, SEEK_SET)) if (sim_fseek (uptr->fileref, da, SEEK_SET))
return SCPE_IOERR; return SCPE_IOERR;
bcnt = sim_fread (rlcs_buf, sizeof (int16), RL_NUMBY, uptr->fileref); bcnt = sim_fread (rlcs_buf, sizeof (int16), RL_NUMBY, uptr->fileref);
if (bcnt != (sizeof (int16) * RL_NUMBY))
return SCPE_IOERR;
} }
if (rlcs_bcnt < RL_NUMBY) { /* more data in buffer? */ if (rlcs_bcnt < RL_NUMBY) { /* more data in buffer? */
cso_buf = rlcs_buf[rlcs_bcnt++]; /* return next word */ cso_buf = rlcs_buf[rlcs_bcnt++]; /* return next word */
@ -1048,6 +1050,8 @@ switch (rlcs_state) {
if (sim_fseek (uptr->fileref, da, SEEK_SET)) if (sim_fseek (uptr->fileref, da, SEEK_SET))
return SCPE_IOERR; return SCPE_IOERR;
bcnt = sim_fwrite (rlcs_buf, sizeof (int16), RL_NUMBY, uptr->fileref); bcnt = sim_fwrite (rlcs_buf, sizeof (int16), RL_NUMBY, uptr->fileref);
if (bcnt != (sizeof (int16) * RL_NUMBY))
return SCPE_IOERR;
rlcs_state = RL_IDLE; /* now idle */ rlcs_state = RL_IDLE; /* now idle */
rlcs_bcnt = 0; rlcs_bcnt = 0;
cso_csr = cso_csr | CSR_DONE | /* complete */ cso_csr = cso_csr | CSR_DONE | /* complete */

View file

@ -502,8 +502,7 @@ int32 fdctrk(int32 io, int32 data)
dsk_unit[cur_dsk].u4 = data & 0xFF; dsk_unit[cur_dsk].u4 = data & 0xFF;
if (dsk_dev.dctrl & DEBUG_read) if (dsk_dev.dctrl & DEBUG_read)
printf("\nfdctrk: Drive %d track set to %d", cur_dsk, dsk_unit[cur_dsk].u4); printf("\nfdctrk: Drive %d track set to %d", cur_dsk, dsk_unit[cur_dsk].u4);
} else }
;
if (dsk_dev.dctrl & DEBUG_write) if (dsk_dev.dctrl & DEBUG_write)
printf("\nfdctrk: Drive %d track read as %d", cur_dsk, dsk_unit[cur_dsk].u4); printf("\nfdctrk: Drive %d track read as %d", cur_dsk, dsk_unit[cur_dsk].u4);
return dsk_unit[cur_dsk].u4; return dsk_unit[cur_dsk].u4;
@ -519,8 +518,7 @@ int32 fdcsec(int32 io, int32 data)
dsk_unit[cur_dsk].u5 = 1; dsk_unit[cur_dsk].u5 = 1;
if (dsk_dev.dctrl & DEBUG_write) if (dsk_dev.dctrl & DEBUG_write)
printf("\nfdcsec: Drive %d sector set to %d", cur_dsk, dsk_unit[cur_dsk].u5); printf("\nfdcsec: Drive %d sector set to %d", cur_dsk, dsk_unit[cur_dsk].u5);
} else }
;
if (dsk_dev.dctrl & DEBUG_read) if (dsk_dev.dctrl & DEBUG_read)
printf("\nfdcsec: Drive %d sector read as %d", cur_dsk, dsk_unit[cur_dsk].u5); printf("\nfdcsec: Drive %d sector read as %d", cur_dsk, dsk_unit[cur_dsk].u5);
return dsk_unit[cur_dsk].u5; return dsk_unit[cur_dsk].u5;