summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/v60
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2020-05-25 16:42:42 +0200
committer Olivier Galibert <galibert@pobox.com>2020-05-25 16:42:57 +0200
commit22513fb6fe281f5ccb75aaddb6417a12a66c313d (patch)
tree3cf84032cc6482d685a8dbb57e015bd17c7f7fdc /src/devices/cpu/v60
parente42c2d2874cf9c1092c01ab5ce9ef997d465ce25 (diff)
emumem: A little more speedup. cache and specific change syntax, and are not pointers anymore [O. Galibert]
The last(?) two changes are: - Add a template parameter to everything (theoretically the address space width, in practice a level derived from it to keep as much compatibility between widths as possible) so that the shift size becomes a constant. - Change the syntax of declaring and initializing the caches and specifics so that they're embedded in the owner device. Solves lifetime issues and also removes one indirection (looking up the base dispatch pointer through the cache/specific pointer).
Diffstat (limited to 'src/devices/cpu/v60')
-rw-r--r--src/devices/cpu/v60/v60.cpp16
-rw-r--r--src/devices/cpu/v60/v60.h3
2 files changed, 11 insertions, 8 deletions
diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp
index 989e509ef2e..0a9030ad313 100644
--- a/src/devices/cpu/v60/v60.cpp
+++ b/src/devices/cpu/v60/v60.cpp
@@ -412,17 +412,17 @@ void v60_device::device_start()
m_program = &space(AS_PROGRAM);
if (m_program->data_width() == 16)
{
- auto cache = m_program->cache<1, 0, ENDIANNESS_LITTLE>();
- m_pr8 = [cache](offs_t address) -> u8 { return cache->read_byte(address); };
- m_pr16 = [cache](offs_t address) -> u16 { return cache->read_word_unaligned(address); };
- m_pr32 = [cache](offs_t address) -> u32 { return cache->read_dword_unaligned(address); };
+ m_program->cache(m_cache16);
+ m_pr8 = [this](offs_t address) -> u8 { return m_cache16.read_byte(address); };
+ m_pr16 = [this](offs_t address) -> u16 { return m_cache16.read_word_unaligned(address); };
+ m_pr32 = [this](offs_t address) -> u32 { return m_cache16.read_dword_unaligned(address); };
}
else
{
- auto cache = m_program->cache<2, 0, ENDIANNESS_LITTLE>();
- m_pr8 = [cache](offs_t address) -> u8 { return cache->read_byte(address); };
- m_pr16 = [cache](offs_t address) -> u16 { return cache->read_word_unaligned(address); };
- m_pr32 = [cache](offs_t address) -> u32 { return cache->read_dword_unaligned(address); };
+ m_program->cache(m_cache32);
+ m_pr8 = [this](offs_t address) -> u8 { return m_cache32.read_byte(address); };
+ m_pr16 = [this](offs_t address) -> u16 { return m_cache32.read_word_unaligned(address); };
+ m_pr32 = [this](offs_t address) -> u32 { return m_cache32.read_dword_unaligned(address); };
}
m_io = &space(AS_IO);
diff --git a/src/devices/cpu/v60/v60.h b/src/devices/cpu/v60/v60.h
index 35c5843c487..0cb41bd18a8 100644
--- a/src/devices/cpu/v60/v60.h
+++ b/src/devices/cpu/v60/v60.h
@@ -163,6 +163,9 @@ private:
uint8_t m_irq_line;
uint8_t m_nmi_line;
address_space *m_program;
+ memory_access<32, 1, 0, ENDIANNESS_LITTLE>::cache m_cache16;
+ memory_access<32, 2, 0, ENDIANNESS_LITTLE>::cache m_cache32;
+
std::function<u8 (offs_t)> m_pr8;
std::function<u16 (offs_t)> m_pr16;
std::function<u32 (offs_t)> m_pr32;