diff --git a/VAX/vax_cpu.c b/VAX/vax_cpu.c index b751e352..23d239fb 100644 --- a/VAX/vax_cpu.c +++ b/VAX/vax_cpu.c @@ -1946,7 +1946,8 @@ for ( ;; ) { temp = CC_V; SET_TRAP (TRAP_DIVZRO); } - else if ((op0 == LMASK) && (op1 == LSIGN)) { /* overflow? */ + else if ((((uint32)op0) == LMASK) && + (((uint32)op1) == LSIGN)) { /* overflow? */ r = op1; temp = CC_V; INTOV; @@ -3222,7 +3223,7 @@ if ((mc != 0) && !get_yn ("Really truncate memory [N]?", FALSE)) nM = (uint32 *) calloc (val >> 2, sizeof (uint32)); if (nM == NULL) return SCPE_MEM; -clim = (uint32) ((((uint32) val) < MEMSIZE)? val: MEMSIZE); +clim = (((uint32) val) < MEMSIZE)? (uint32)val: MEMSIZE; for (i = 0; i < clim; i = i + 4) nM[i >> 2] = M[i >> 2]; free (M); diff --git a/VAX/vax_mmu.c b/VAX/vax_mmu.c index 79175c41..d86ba825 100644 --- a/VAX/vax_mmu.c +++ b/VAX/vax_mmu.c @@ -177,7 +177,10 @@ if (mapen) { /* mapping on? */ xpte = fill (va, lnt, acc, NULL); /* fill if needed */ pa = (xpte.pte & TLB_PFN) | off; /* get phys addr */ } -else pa = va & PAMASK; +else { + pa = va & PAMASK; + off = 0; + } if ((pa & (lnt - 1)) == 0) { /* aligned? */ if (lnt >= L_LONG) /* long, quad? */ return ReadL (pa); @@ -185,7 +188,7 @@ if ((pa & (lnt - 1)) == 0) { /* aligned? */ return ReadW (pa); return ReadB (pa); /* byte */ } -if (mapen && ((off + lnt) > VA_PAGSIZE)) { /* cross page? */ +if (mapen && ((uint32)(off + lnt) > VA_PAGSIZE)) { /* cross page? */ vpn = VA_GETVPN (va + lnt); /* vpn 2nd page */ tbi = VA_GETTBI (vpn); xpte = (va & VA_S0)? stlb[tbi]: ptlb[tbi]; /* access tlb */ @@ -239,7 +242,10 @@ if (mapen) { xpte = fill (va, lnt, acc, NULL); pa = (xpte.pte & TLB_PFN) | off; } -else pa = va & PAMASK; +else { + pa = va & PAMASK; + off = 0; + } if ((pa & (lnt - 1)) == 0) { /* aligned? */ if (lnt >= L_LONG) /* long, quad? */ WriteL (pa, val); @@ -248,7 +254,7 @@ if ((pa & (lnt - 1)) == 0) { /* aligned? */ else WriteB (pa, val); /* byte */ return; } -if (mapen && ((off + lnt) > VA_PAGSIZE)) { +if (mapen && ((uint32)(off + lnt) > VA_PAGSIZE)) { vpn = VA_GETVPN (va + 4); tbi = VA_GETTBI (vpn); xpte = (va & VA_S0)? stlb[tbi]: ptlb[tbi]; /* access tlb */ diff --git a/sim_ether.c b/sim_ether.c index 4cdcc58b..445b172c 100644 --- a/sim_ether.c +++ b/sim_ether.c @@ -2217,6 +2217,7 @@ key ^= 0x3f; return (hash[key>>3] & (1 << (key&0x7))); } +#if 0 static int _eth_hash_validate(ETH_MAC *MultiCastList, int count, ETH_MULTIHASH hash) { @@ -2268,6 +2269,7 @@ ETH_MULTIHASH thash = {0x01, 0x40, 0x00, 0x00, 0x48, 0x88, 0x40, 0x00}; _eth_hash_validate(tMacs, sizeof(tMacs)/sizeof(tMacs[0]), thash); } +#endif /* The IP header */ struct IPHeader { @@ -2935,10 +2937,12 @@ if (dev->dptr->dctrl & dev->dbit) { eth_mac_fmt(&dev->filter_address[i], mac); sim_debug(dev->dbit, dev->dptr, " Addr[%d]: %s\n", i, mac); } - if (dev->all_multicast) + if (dev->all_multicast) { sim_debug(dev->dbit, dev->dptr, "All Multicast\n"); - if (dev->promiscuous) + } + if (dev->promiscuous) { sim_debug(dev->dbit, dev->dptr, "Promiscuous\n"); + } } /* setup BPF filters and other fields to minimize packet delivery */