From 07a7cacbb497bcd94b4eddb0b6982f1fa81862e7 Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Tue, 9 May 2023 13:09:42 -0400 Subject: [PATCH] IBM360: Fixed some Windows warning. --- IBM360/ibm360_chan.c | 6 +++--- IBM360/ibm360_sys.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/IBM360/ibm360_chan.c b/IBM360/ibm360_chan.c index b4e5944..04b16df 100644 --- a/IBM360/ibm360_chan.c +++ b/IBM360/ibm360_chan.c @@ -1541,7 +1541,7 @@ set_dev_addr(UNIT * uptr, int32 val, CONST char *cptr, void *desc) struct _dev *ndev; t_stat r; unsigned int i; - int devaddr; + t_value devaddr; if (cptr == NULL) return SCPE_ARG; @@ -1621,9 +1621,9 @@ set_dev_addr(UNIT * uptr, int32 val, CONST char *cptr, void *desc) dev->dev_addr = devaddr; uptr->u3 &= ~UNIT_ADDR(0xfff); uptr->u3 |= UNIT_ADDR(devaddr); - sim_printf("Set dev %s %x\r\n", dptr->name, GET_UADDR(uptr->u3)); + sim_printf("Set dev %s %x\r\n", dptr->name, GET_UADDR(uptr->u3) & 0xfff); } else { - sim_printf("Set dev %s0 %x\r\n", dptr->name, devaddr); + sim_printf("Set dev %s0 %x\r\n", dptr->name, (uint32)(devaddr & 0xfff)); for (i = 0; i < dibp->numunits; i++) { dev = find_device(devaddr + i); uptr = &((dibp->units)[i]); diff --git a/IBM360/ibm360_sys.c b/IBM360/ibm360_sys.c index d68f7e4..9f601c6 100644 --- a/IBM360/ibm360_sys.c +++ b/IBM360/ibm360_sys.c @@ -517,7 +517,7 @@ t_opcode *tab; t_stat fprint_sym (FILE *of, t_addr addr, t_value *val, UNIT *uptr, int32 sw) { - uint8 inst = *val; + uint8 inst = (uint8)(*val & 0xff); uint16 sval[4]; int i; int l = 1; @@ -894,7 +894,7 @@ t_stat parse_sym (CONST char *cptr, t_addr addr, UNIT *uptr, t_value *val, int32 return -5; } } - num = get_uint(cptr, rdx, max[l], &r); + num = (uint32)(get_uint(cptr, rdx, max[l], &r) & 0xffffffff); for (i = 0; i < l && i < 4; i++) val[i] = (num >> (((l - 1) - i) * 8)) & 0xff; return -(l-1);