diff --git a/3B2/3b2_mmu.h b/3B2/3b2_mmu.h index 82a63a06..345fb167 100644 --- a/3B2/3b2_mmu.h +++ b/3B2/3b2_mmu.h @@ -413,10 +413,8 @@ static SIM_INLINE t_stat get_pdce(uint32 va, uint32 *pd, uint8 *pd_acc) static SIM_INLINE void put_sdce(uint32 va, uint32 sd0, uint32 sd1) { - uint32 tag; uint8 ci; - tag = SD_TAG(va); ci = (SID(va) * NUM_SDCE) + SD_IDX(va); mmu_state.sdcl[ci] = SD_TO_SDCL(va, sd0); @@ -426,18 +424,14 @@ static SIM_INLINE void put_sdce(uint32 va, uint32 sd0, uint32 sd1) static SIM_INLINE void put_pdce(uint32 va, uint32 sd0, uint32 pd) { - uint32 tag, pdclh, pdcrh; + uint32 pdclh; uint8 ci; - tag = PD_TAG(va); ci = (SID(va) * NUM_PDCE) + PD_IDX(va); /* Left side contains the 'U' bit we care about */ pdclh = mmu_state.pdclh[ci]; - /* Right side */ - pdcrh = mmu_state.pdcrh[ci]; - /* Pick the least-recently-replaced side */ if (pdclh & PDCLH_USED_MASK) { /* Right side replaced more recently */ /* Add to left side of cache without the U bit set */ @@ -454,11 +448,9 @@ static SIM_INLINE void put_pdce(uint32 va, uint32 sd0, uint32 pd) static SIM_INLINE void flush_sdce(uint32 va) { - uint32 tag; uint8 ci; ci = (SID(va) * NUM_SDCE) + SD_IDX(va); - tag = SD_TAG(va); if (mmu_state.sdch[ci] & SD_GOOD_MASK) { mmu_state.sdch[ci] &= ~SD_GOOD_MASK; @@ -538,10 +530,9 @@ static SIM_INLINE t_stat mmu_check_perm(uint8 flags, uint8 r_acc) */ static SIM_INLINE void mmu_update_sd(uint32 va, uint32 mask) { - uint32 sd0, tag; + uint32 sd0; uint8 ci; - tag = SD_TAG(va); ci = (SID(va) * NUM_SDCE) + SD_IDX(va); /* We go back to main memory to find the SD because the SD may diff --git a/3B2/3b2_sysdev.c b/3B2/3b2_sysdev.c index de1ecf51..ce576cee 100644 --- a/3B2/3b2_sysdev.c +++ b/3B2/3b2_sysdev.c @@ -486,7 +486,7 @@ t_stat timer0_svc(UNIT *uptr) t_stat timer1_svc(UNIT *uptr) { struct timer_ctr *ctr; - int32 t, ticks; + int32 ticks; ctr = (struct timer_ctr *)uptr->tmr; @@ -501,7 +501,7 @@ t_stat timer1_svc(UNIT *uptr) ticks = TPS_CLK; } - t = sim_rtcn_calb(ticks, TMR_CLK); + sim_rtcn_calb(ticks, TMR_CLK); sim_activate_after(uptr, (uint32) (1000000 / ticks)); return SCPE_OK;