diff options
author | Vas Crabb <vas@vastheman.com> | 2019-03-26 11:13:37 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-03-26 11:13:37 +1100 |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/emu/emumem.cpp | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/emu/emumem.cpp')
-rw-r--r-- | src/emu/emumem.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/emu/emumem.cpp b/src/emu/emumem.cpp index 80aaaf32c42..092e44d9555 100644 --- a/src/emu/emumem.cpp +++ b/src/emu/emumem.cpp @@ -742,6 +742,13 @@ void memory_manager::allocate(device_memory_interface &memory) // allocate one of the appropriate type switch (spaceconfig->data_width() | (spaceconfig->addr_shift() + 4)) { + case 8|(4+1): + if (spaceconfig->endianness() == ENDIANNESS_LITTLE) + memory.allocate<address_space_specific<0, 1, ENDIANNESS_LITTLE>>(*this, spacenum); + else + memory.allocate<address_space_specific<0, 1, ENDIANNESS_BIG >>(*this, spacenum); + break; + case 8|(4-0): if (spaceconfig->endianness() == ENDIANNESS_LITTLE) memory.allocate<address_space_specific<0, 0, ENDIANNESS_LITTLE>>(*this, spacenum); @@ -962,8 +969,7 @@ address_space_config::address_space_config() m_logaddr_width(0), m_page_shift(0), m_is_octal(false), - m_internal_map(address_map_constructor()), - m_default_map(address_map_constructor()) + m_internal_map(address_map_constructor()) { } @@ -974,9 +980,8 @@ address_space_config::address_space_config() @param addrwidth address bits @param addrshift @param internal - @param defmap */ -address_space_config::address_space_config(const char *name, endianness_t endian, u8 datawidth, u8 addrwidth, s8 addrshift, address_map_constructor internal, address_map_constructor defmap) +address_space_config::address_space_config(const char *name, endianness_t endian, u8 datawidth, u8 addrwidth, s8 addrshift, address_map_constructor internal) : m_name(name), m_endianness(endian), m_data_width(datawidth), @@ -985,12 +990,11 @@ address_space_config::address_space_config(const char *name, endianness_t endian m_logaddr_width(addrwidth), m_page_shift(0), m_is_octal(false), - m_internal_map(internal), - m_default_map(defmap) + m_internal_map(internal) { } -address_space_config::address_space_config(const char *name, endianness_t endian, u8 datawidth, u8 addrwidth, s8 addrshift, u8 logwidth, u8 pageshift, address_map_constructor internal, address_map_constructor defmap) +address_space_config::address_space_config(const char *name, endianness_t endian, u8 datawidth, u8 addrwidth, s8 addrshift, u8 logwidth, u8 pageshift, address_map_constructor internal) : m_name(name), m_endianness(endian), m_data_width(datawidth), @@ -999,8 +1003,7 @@ address_space_config::address_space_config(const char *name, endianness_t endian m_logaddr_width(logwidth), m_page_shift(pageshift), m_is_octal(false), - m_internal_map(internal), - m_default_map(defmap) + m_internal_map(internal) { } @@ -2647,6 +2650,8 @@ template<int Width, int AddrShift, int Endian> memory_access_cache<Width, AddrSh } +template class memory_access_cache<0, 1, ENDIANNESS_LITTLE>; +template class memory_access_cache<0, 1, ENDIANNESS_BIG>; template class memory_access_cache<0, 0, ENDIANNESS_LITTLE>; template class memory_access_cache<0, 0, ENDIANNESS_BIG>; template class memory_access_cache<1, 3, ENDIANNESS_LITTLE>; |