Skip to content

Commit

Permalink
IBM360: Cleanup warnings from CMake
Browse files Browse the repository at this point in the history
  • Loading branch information
rcornwell committed Mar 19, 2024
1 parent b83faa7 commit 377cd9a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions IBM360/ibm360_cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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];
Expand All @@ -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;
Expand Down Expand Up @@ -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];
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion IBM360/ibm360_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 377cd9a

Please sign in to comment.