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

AltairZ80: Fix warnings in altairz80_cpu.c.

Browse source
This commit is contained in:
Howard M. Harte 2023-04-01 07:01:13 -07:00
parent 0521722525
commit 885f9123c1
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
AltairZ80/altairz80_cpu.c
View file

@ -6628,7 +6628,7 @@ static const char* m68kVariantToString[] = {
static t_stat chip_show(FILE *st, UNIT *uptr, int32 val, CONST void *desc) { static t_stat chip_show(FILE *st, UNIT *uptr, int32 val, CONST void *desc) {
fprintf(st, cpu_unit.flags & UNIT_CPU_OPSTOP ? "ITRAP, " : "NOITRAP, "); fprintf(st, cpu_unit.flags & UNIT_CPU_OPSTOP ? "ITRAP, " : "NOITRAP, ");
if (chiptype < NUM_CHIP_TYPE) { if ((chiptype >= 0) && (chiptype < NUM_CHIP_TYPE)) {
fprintf(st, "%s", cpu_mod[chiptype].mstring); fprintf(st, "%s", cpu_mod[chiptype].mstring);
if (chiptype == CHIP_TYPE_M68K) { if (chiptype == CHIP_TYPE_M68K) {
fprintf(st, " (%s)", m68kVariantToString[m68kvariant]); fprintf(st, " (%s)", m68kVariantToString[m68kvariant]);
@ -6677,7 +6677,7 @@ static t_stat cpu_show(FILE *st, UNIT *uptr, int32 val, CONST void *desc) {
} }
fprintf(st, "]"); fprintf(st, "]");
} }
if (chiptype < NUM_CHIP_TYPE) { if ((chiptype >= 0) && (chiptype < NUM_CHIP_TYPE)) {
first = TRUE; first = TRUE;
/* show verbose CPU flags */ /* show verbose CPU flags */
for (i = 0; cpuflags[chiptype][i].mask; i++) for (i = 0; cpuflags[chiptype][i].mask; i++)
@ -6861,7 +6861,7 @@ static int32 bankseldev(const int32 port, const int32 io, const int32 data) {
} }
static void cpu_set_chiptype_short(const int32 value) { static void cpu_set_chiptype_short(const int32 value) {
if ((chiptype == value) || (chiptype >= NUM_CHIP_TYPE)) if ((chiptype == value) || (value < 0) || (value >= NUM_CHIP_TYPE))
return; /* nothing to do */ return; /* nothing to do */
if (((chiptype == CHIP_TYPE_8080) && (value == CHIP_TYPE_Z80)) || if (((chiptype == CHIP_TYPE_8080) && (value == CHIP_TYPE_Z80)) ||
((chiptype == CHIP_TYPE_Z80) && (value == CHIP_TYPE_8080))) { ((chiptype == CHIP_TYPE_Z80) && (value == CHIP_TYPE_8080))) {
@ -7090,7 +7090,7 @@ static t_stat cpu_set_hist(UNIT *uptr, int32 val, CONST char *cptr, void *desc)
uint32 i, lnt; uint32 i, lnt;
t_stat r; t_stat r;
if ((chiptype != CHIP_TYPE_8080) && (chiptype != CHIP_TYPE_Z80)) { if ((chiptype >= 0) && (chiptype != CHIP_TYPE_8080) && (chiptype != CHIP_TYPE_Z80)) {
sim_printf("History not supported for chiptype: %s\n", sim_printf("History not supported for chiptype: %s\n",
(chiptype < NUM_CHIP_TYPE) ? cpu_mod[chiptype].mstring : "????"); (chiptype < NUM_CHIP_TYPE) ? cpu_mod[chiptype].mstring : "????");
return SCPE_NOFNC; return SCPE_NOFNC;
@ -7158,7 +7158,8 @@ t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
if ((chiptype != CHIP_TYPE_8080) && (chiptype != CHIP_TYPE_Z80)) { if ((chiptype != CHIP_TYPE_8080) && (chiptype != CHIP_TYPE_Z80)) {
sim_printf("History not supported for chiptype: %s\n", sim_printf("History not supported for chiptype: %s\n",
(chiptype < NUM_CHIP_TYPE) ? cpu_mod[chiptype].mstring : "????"); (0 <= chiptype) && (chiptype < NUM_CHIP_TYPE) ?
cpu_mod[chiptype].mstring : "????");
return SCPE_NOFNC; return SCPE_NOFNC;
} }
@ -7377,6 +7378,9 @@ static t_stat cpu_hex_load(FILE *fileref, CONST char *cptr, CONST char *fnam, in
bufptr = datastr; bufptr = datastr;
/* Ensure datastr is NULL-terminated. */
datastr[sizeof(datastr) - 1] = '\0';
if ((rectype == 0) && (bytecnt > 0) && (addr+bytecnt <= MAXMEMORY)) { if ((rectype == 0) && (bytecnt > 0) && (addr+bytecnt <= MAXMEMORY)) {
if (cnt == 0) if (cnt == 0)
org = addr; org = addr;
@ -7413,7 +7417,8 @@ void cpu_raise_interrupt(uint32 irq) {
cpu8086_intr(irq); cpu8086_intr(irq);
} else if (cpu_unit.flags & UNIT_CPU_VERBOSE) { } else if (cpu_unit.flags & UNIT_CPU_VERBOSE) {
sim_printf("Interrupts not fully supported for chiptype: %s\n", sim_printf("Interrupts not fully supported for chiptype: %s\n",
(chiptype < NUM_CHIP_TYPE) ? cpu_mod[chiptype].mstring : "????"); (0 <= chiptype) && (chiptype < NUM_CHIP_TYPE) ?
cpu_mod[chiptype].mstring : "????");
} }
} }