summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/pic16c5x
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/pic16c5x')
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.cpp13
-rw-r--r--src/devices/cpu/pic16c5x/pic16c5x.h5
2 files changed, 8 insertions, 10 deletions
diff --git a/src/devices/cpu/pic16c5x/pic16c5x.cpp b/src/devices/cpu/pic16c5x/pic16c5x.cpp
index 21907b7d369..715cf574ee1 100644
--- a/src/devices/cpu/pic16c5x/pic16c5x.cpp
+++ b/src/devices/cpu/pic16c5x/pic16c5x.cpp
@@ -197,14 +197,14 @@ std::unique_ptr<util::disasm_interface> pic16c5x_device::create_disassembler()
void pic16c5x_device::update_internalram_ptr()
{
- m_internalram = (uint8_t *)m_data->get_write_ptr(0x00);
+ m_internalram = (uint8_t *)space(AS_DATA).get_write_ptr(0x00);
}
-#define PIC16C5x_RDOP(A) (m_cache->read_word(A))
-#define PIC16C5x_RAM_RDMEM(A) ((uint8_t)m_data->read_byte(A))
-#define PIC16C5x_RAM_WRMEM(A,V) (m_data->write_byte(A,V))
+#define PIC16C5x_RDOP(A) (m_program.read_word(A))
+#define PIC16C5x_RAM_RDMEM(A) ((uint8_t)m_data.read_byte(A))
+#define PIC16C5x_RAM_WRMEM(A,V) (m_data.write_byte(A,V))
#define M_RDRAM(A) (((A) < 9) ? m_internalram[A] : PIC16C5x_RAM_RDMEM(A))
#define M_WRTRAM(A,V) do { if ((A) < 9) m_internalram[A] = (V); else PIC16C5x_RAM_WRMEM(A,V); } while (0)
@@ -887,9 +887,8 @@ enum
void pic16c5x_device::device_start()
{
- m_program = &space(AS_PROGRAM);
- m_cache = m_program->cache<1, -1, ENDIANNESS_LITTLE>();
- m_data = &space(AS_DATA);
+ space(AS_PROGRAM).cache(m_program);
+ space(AS_DATA).specific(m_data);
m_read_a.resolve_safe(0);
m_read_b.resolve_safe(0);
diff --git a/src/devices/cpu/pic16c5x/pic16c5x.h b/src/devices/cpu/pic16c5x/pic16c5x.h
index e9e11b85778..8936a22d3a3 100644
--- a/src/devices/cpu/pic16c5x/pic16c5x.h
+++ b/src/devices/cpu/pic16c5x/pic16c5x.h
@@ -143,9 +143,8 @@ private:
uint8_t m_picRAMmask;
int m_inst_cycles;
- address_space *m_program;
- memory_access_cache<1, -1, ENDIANNESS_LITTLE> *m_cache;
- address_space *m_data;
+ memory_access<11, 1, -1, ENDIANNESS_LITTLE>::cache m_program;
+ memory_access< 7, 0, 0, ENDIANNESS_LITTLE>::specific m_data;
// i/o handlers
devcb_read8 m_read_a;