From cd2787990151b035628501e62ba7c104557191aa Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Mon, 12 Oct 2020 23:29:30 -0400 Subject: [PATCH] IBM360: Removed compiler errors. --- IBM360/ibm360_cpu.c | 32 ++++++++++++++++---------------- IBM360/ibm360_dasd.c | 14 +++++++------- IBM360/ibm360_lpr.c | 18 +++++++++--------- IBM360/ibm360_sys.c | 2 +- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/IBM360/ibm360_cpu.c b/IBM360/ibm360_cpu.c index fc25832..9fa5e17 100644 --- a/IBM360/ibm360_cpu.c +++ b/IBM360/ibm360_cpu.c @@ -2270,10 +2270,10 @@ save_dbl: reg1, addr1, dest, PC, reg); switch (reg1) { case 0x0: /* Segment table address */ - for (temp = 0; - temp < sizeof(tlb)/sizeof(uint32); - temp++) - tlb[temp] = 0; + for (addr2 = 0; + addr2 < sizeof(tlb)/sizeof(uint32); + addr2++) + tlb[addr2] = 0; if ((dest & 0x3f) != 0) storepsw(OPPSW, IRC_DATA); seg_addr = dest & AMASK; @@ -3096,10 +3096,10 @@ save_dbl: storepsw(OPPSW, IRC_OPR); goto supress; } - for (temp = 0; - temp < sizeof(tlb)/sizeof(uint32); - temp++) - tlb[temp] = 0; + for (addr2 = 0; + addr2 < sizeof(tlb)/sizeof(uint32); + addr2++) + tlb[addr2] = 0; break; case 0x10: /* SPX */ storepsw(OPPSW, IRC_OPR); @@ -3310,18 +3310,18 @@ save_dbl: ~page_mask) & AMASK) >> page_shift; intval_en = ((dest & 0x400) != 0); tod_en = ((dest & 0x800) != 0); - for (temp = 0; - temp < sizeof(tlb)/sizeof(uint32); - temp++) - tlb[temp] = 0; + for (addr2 = 0; + addr2 < sizeof(tlb)/sizeof(uint32); + addr2++) + tlb[addr2] = 0; break; case 0x1: /* Segment table address and length */ seg_addr = dest & AMASK; seg_len = (((dest >> 24) & 0xff) + 1) << 4; - for (temp = 0; - temp < sizeof(tlb)/sizeof(uint32); - temp++) - tlb[temp] = 0; + for (addr2 = 0; + addr2 < sizeof(tlb)/sizeof(uint32); + addr2++) + tlb[addr2] = 0; break; case 0x2: /* Masks */ if (ec_mode) diff --git a/IBM360/ibm360_dasd.c b/IBM360/ibm360_dasd.c index 463f0b5..b2e5da0 100644 --- a/IBM360/ibm360_dasd.c +++ b/IBM360/ibm360_dasd.c @@ -204,7 +204,7 @@ struct disk_t { const char *name; /* Type Name */ int cyl; /* Number of cylinders */ - int heads; /* Number of heads/cylinder */ + uint32 heads; /* Number of heads/cylinder */ int bpt; /* Max bytes per track */ uint8 sen_cnt; /* Number of sense bytes */ uint8 dev_type; /* Device type code */ @@ -621,7 +621,7 @@ t_stat dasd_srv(UNIT * uptr) goto index; } uptr->CCH ++; - if ((uptr->CCH & 0xff) >= disk_type[type].heads) { + if ((uint32)(uptr->CCH & 0xff) >= disk_type[type].heads) { endcyl: sim_debug(DEBUG_DETAIL, dptr, "end cyl unit=%d %02x %d\n", unit, state, data->tpos); @@ -652,7 +652,7 @@ endcyl: uptr->CCH ++; sim_debug(DEBUG_DETAIL, dptr, "over unit=%d %04x\n", unit, uptr->CCH); uptr->CMD &= ~(DK_INDEX); - if ((uptr->CCH & 0xff) >= disk_type[type].heads) + if ((uint32)(uptr->CCH & 0xff) >= disk_type[type].heads) goto endcyl; } } @@ -1822,7 +1822,7 @@ dasd_format(UNIT * uptr, int flag) { int type = GET_TYPE(uptr->flags); int tsize; int cyl; - int hd; + uint32 hd; int pos; if (flag || get_yn("Initialize dasd? [Y] ", TRUE)) { @@ -1864,7 +1864,7 @@ dasd_format(UNIT * uptr, int flag) { data->cbuf[pos++] = (hd & 0xff); data->cbuf[pos++] = 1; /* Rec */ if (cyl == 0 && hd == 0 && (sim_switches & SWMASK ('V')) != 0) { - int p; + unsigned int p; /* R1, IPL1 */ data->cbuf[pos++] = 4; /* keylen */ data->cbuf[pos++] = 0; /* dlen */ @@ -1929,10 +1929,10 @@ dasd_attach(UNIT * uptr, CONST char *file) uint16 addr = GET_UADDR(uptr->CMD); int flag = (sim_switches & SWMASK ('I')) != 0; t_stat r; - int i; + uint32 i; struct dasd_header hdr; struct dasd_t *data; - int tsize; + uint32 tsize; size_t isize; size_t dsize; diff --git a/IBM360/ibm360_lpr.c b/IBM360/ibm360_lpr.c index 24d21df..aa9a819 100644 --- a/IBM360/ibm360_lpr.c +++ b/IBM360/ibm360_lpr.c @@ -245,26 +245,26 @@ print_line(UNIT * uptr) } break; case 5: /* Half page */ - while((uptr->LINE != (uptr->capac/2)) || - (uptr->LINE != (uptr->capac))) { + while((uptr->LINE != (int)(uptr->capac/2)) || + (uptr->LINE != (int)(uptr->capac))) { sim_fwrite("\r\n", 1, 2, uptr->fileref); f = 0; uptr->pos += 2; uptr->LINE++; - if (((uint32)uptr->LINE) > uptr->capac) + if (uptr->LINE > (int)uptr->capac) break; } break; case 6: /* 1/4 Page */ - while((uptr->LINE != (uptr->capac/4)) || - (uptr->LINE != (uptr->capac/2)) || - (uptr->LINE != (uptr->capac/2+uptr->capac/4)) || - (uptr->LINE != (uptr->capac))) { + while((uptr->LINE != (int)(uptr->capac/4)) || + (uptr->LINE != (int)(uptr->capac/2)) || + (uptr->LINE != (int)(uptr->capac/2+uptr->capac/4)) || + (uptr->LINE != (int)(uptr->capac))) { sim_fwrite("\r\n", 1, 2, uptr->fileref); f = 0; uptr->pos += 2; uptr->LINE++; - if (((uint32)uptr->LINE) > uptr->capac) + if (uptr->LINE > (int)uptr->capac) break; } break; @@ -280,7 +280,7 @@ print_line(UNIT * uptr) break; } - if ((t_addr)uptr->LINE > uptr->capac) { + if (uptr->LINE > (int)uptr->capac) { if (f) sim_fwrite("\r\n", 1, 2, uptr->fileref); sim_fwrite("\f", 1, 1, uptr->fileref); diff --git a/IBM360/ibm360_sys.c b/IBM360/ibm360_sys.c index 2f3d94b..3d6d7bf 100644 --- a/IBM360/ibm360_sys.c +++ b/IBM360/ibm360_sys.c @@ -547,7 +547,7 @@ if (sw & SWMASK ('M')) { if (sw & SWMASK ('C')) { fputc('\'', of); for(i = 0; i < l; i++) { - char ch = ebcdic_to_ascii[val[i] & 0xff]; + uint8 ch = ebcdic_to_ascii[val[i] & 0xff]; if (ch >= 0x20 && ch <= 0x7f) fprintf(of, "%c", ch); else