diff options
Diffstat (limited to 'src/devices/cpu/sparc/sparc.cpp')
-rw-r--r-- | src/devices/cpu/sparc/sparc.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/cpu/sparc/sparc.cpp b/src/devices/cpu/sparc/sparc.cpp index 6e9ec39e90c..ea301d6a1fe 100644 --- a/src/devices/cpu/sparc/sparc.cpp +++ b/src/devices/cpu/sparc/sparc.cpp @@ -659,8 +659,8 @@ void mb86930_device::device_reset() m_spmr = 0; m_spmr_mask = ~0ULL; std::fill_n(&m_wssr[0], 3, 0); - m_last_masked_addr = 0ULL; + std::fill_n(&m_last_masked_addr[0], 6, 0ULL); std::fill_n(&m_same_page_waits[0], 6, 0); std::fill_n(&m_other_page_waits[0], 6, 0); @@ -819,14 +819,14 @@ uint32_t mb86930_device::mmu_r(offs_t offset, uint32_t mem_mask) { const uint64_t full_addr = ((uint64_t)Asi << 30) | offset; - const uint64_t masked_addr = full_addr & m_spmr_mask; - const bool is_same_page = (masked_addr == m_last_masked_addr); - m_last_masked_addr = masked_addr; - for (int cs = 0; cs < 6; cs++) { if ((full_addr & m_full_masks[cs]) == m_full_ranges[cs]) { + const uint64_t masked_addr = full_addr & m_spmr_mask; + const bool is_same_page = (masked_addr == m_last_masked_addr[cs]); + m_last_masked_addr[cs] = masked_addr; + eat_cycles(is_same_page ? m_same_page_waits[cs] : m_other_page_waits[cs]); return m_cs_r[cs](offset, mem_mask); } @@ -839,14 +839,14 @@ template <uint8_t Asi> void mb86930_device::mmu_w(offs_t offset, uint32_t data, { const uint64_t full_addr = ((uint64_t)Asi << 30) | offset; - const uint64_t masked_addr = full_addr & m_spmr_mask; - const bool is_same_page = (masked_addr == m_last_masked_addr); - m_last_masked_addr = masked_addr; - for (int cs = 0; cs < 6; cs++) { if ((full_addr & m_full_masks[cs]) == m_full_ranges[cs]) { + const uint64_t masked_addr = full_addr & m_spmr_mask; + const bool is_same_page = (masked_addr == m_last_masked_addr[cs]); + m_last_masked_addr[cs] = masked_addr; + eat_cycles(is_same_page ? m_same_page_waits[cs] : m_other_page_waits[cs]); m_cs_w[cs](offset, data, mem_mask); return; |