From 377cd9ae7aaa3baeb6b8eec19586d1dbbb70a9f8 Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Tue, 19 Mar 2024 12:04:10 -0400 Subject: [PATCH] IBM360: Cleanup warnings from CMake --- IBM360/ibm360_cpu.c | 9 ++++----- IBM360/ibm360_sys.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/IBM360/ibm360_cpu.c b/IBM360/ibm360_cpu.c index 6760a53..565137f 100644 --- a/IBM360/ibm360_cpu.c +++ b/IBM360/ibm360_cpu.c @@ -713,7 +713,6 @@ ReadFull(uint32 addr, uint32 *data) /* Handle unaligned access */ if (offset != 0) { uint32 temp; - uint8 k; temp = pa + 4; if ((temp & 0x7FC) == 0) { @@ -5147,7 +5146,7 @@ dec_mul(int op, uint32 addr1, uint8 len1, uint32 addr2, uint8 len2) uint32 pa; /* Validate address */ - if (TransAddr(addr1 + len, &pa)) + if (TransAddr(addr1 + len1, &pa)) return; k = key[pa >> 11]; @@ -5156,7 +5155,7 @@ dec_mul(int op, uint32 addr1, uint8 len1, uint32 addr2, uint8 len2) return; } /* Check if start on another page */ - if (((addr1 & 0x3ff) + len) > 0x3ff) { + if (((addr1 & 0x3ff) + len1) > 0x3ff) { /* Validate address */ if (TransAddr(addr1, &pa)) return; @@ -5228,7 +5227,7 @@ dec_div(int op, uint32 addr1, uint8 len1, uint32 addr2, uint8 len2) uint32 pa; /* Validate address */ - if (TransAddr(addr1 + len, &pa)) + if (TransAddr(addr1 + len1, &pa)) return; k = key[pa >> 11]; @@ -5237,7 +5236,7 @@ dec_div(int op, uint32 addr1, uint8 len1, uint32 addr2, uint8 len2) return; } /* Check if start on another page */ - if (((addr1 & 0x3ff) + len) > 0x3ff) { + if (((addr1 & 0x3ff) + len1) > 0x3ff) { /* Validate address */ if (TransAddr(addr1, &pa)) return; diff --git a/IBM360/ibm360_sys.c b/IBM360/ibm360_sys.c index 2b69d94..422e5db 100644 --- a/IBM360/ibm360_sys.c +++ b/IBM360/ibm360_sys.c @@ -280,7 +280,7 @@ t_stat sim_load (FILE *fileref, CONST char *cptr, CONST char *fnam, int flag) int offset; uint16 cnt; int i, j, k; - uint16 esid; + uint16 esid = 0; if (sim_switches & SWMASK ('R')) /* Relocate deck */ rel = 1;