diff options
Diffstat (limited to 'src/emu/dirom.h')
-rw-r--r-- | src/emu/dirom.h | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/src/emu/dirom.h b/src/emu/dirom.h index 761e1d357ec..62566f433d3 100644 --- a/src/emu/dirom.h +++ b/src/emu/dirom.h @@ -10,25 +10,22 @@ #pragma once -#ifndef __EMU_H__ -#error Dont include this file directly; include emu.h instead. -#endif - #ifndef MAME_EMU_DIROM_H #define MAME_EMU_DIROM_H -class device_rom_interface : public device_memory_interface +// Beware, DataWidth is 0-3 +template<int AddrWidth, int DataWidth = 0, int AddrShift = 0, endianness_t Endian = ENDIANNESS_LITTLE> class device_rom_interface : public device_memory_interface { public: - device_rom_interface(const machine_config &mconfig, device_t &device, u8 addrwidth, endianness_t endian = ENDIANNESS_LITTLE, u8 datawidth = 8); - virtual ~device_rom_interface(); + device_rom_interface(const machine_config &mconfig, device_t &device); + virtual ~device_rom_interface() = default; void set_device_rom_tag(const char *tag) { m_rom_tag = tag; } - inline u8 read_byte(offs_t byteaddress) { return m_r8(byteaddress); } - inline u16 read_word(offs_t byteaddress) { return m_r16(byteaddress); } - inline u32 read_dword(offs_t byteaddress) { return m_r32(byteaddress); } - inline u64 read_qword(offs_t byteaddress) { return m_r64(byteaddress); } + inline u8 read_byte(offs_t byteaddress) { return m_rom_cache.read_byte(byteaddress); } + inline u16 read_word(offs_t byteaddress) { return m_rom_cache.read_word(byteaddress); } + inline u32 read_dword(offs_t byteaddress) { return m_rom_cache.read_dword(byteaddress); } + inline u64 read_qword(offs_t byteaddress) { return m_rom_cache.read_qword(byteaddress); } void set_rom(const void *base, u32 size); void set_rom_bank(int bank); @@ -37,17 +34,12 @@ protected: virtual void rom_bank_updated() = 0; virtual space_config_vector memory_space_config() const override; - void set_rom_endianness(endianness_t endian) { assert(!device().configured()); m_rom_config.m_endianness = endian; } - void set_rom_data_width(u8 width) { assert(!device().configured()); m_rom_config.m_data_width = width; } - void set_rom_addr_width(u8 width) { assert(!device().configured()); m_rom_config.m_addr_width = m_rom_config.m_logaddr_width = width; } + void override_address_width(u8 width); private: const char *m_rom_tag; address_space_config m_rom_config; - std::function<u8 (offs_t)> m_r8; - std::function<u16 (offs_t)> m_r16; - std::function<u32 (offs_t)> m_r32; - std::function<u64 (offs_t)> m_r64; + typename memory_access<AddrWidth, DataWidth, AddrShift, Endian>::cache m_rom_cache; memory_bank *m_bank; int m_cur_bank, m_bank_count; @@ -56,4 +48,6 @@ private: virtual void interface_post_load() override; }; +#include "dirom.ipp" + #endif // MAME_EMU_DIROM_H |