mirror of
https://github.com/holub/mame
synced 2025-05-04 13:33:05 +03:00
memory: Separate delegates for the main access and the subaccesses. [O. Galibert]
This commit is contained in:
Olivier Galibert
parent
587f1db003
commit
8e73d99610
243
src/emu/memory.c
243
src/emu/memory.c
@ -586,9 +586,12 @@ private:
|
||||
|
||||
// internal state
|
||||
access_handler m_read;
|
||||
access_handler m_subread;
|
||||
const input_port_config * m_ioport;
|
||||
|
||||
bool m_sub_is_legacy;
|
||||
legacy_info m_legacy_info;
|
||||
legacy_info m_sublegacy_info;
|
||||
};
|
||||
|
||||
|
||||
@ -684,9 +687,12 @@ private:
|
||||
|
||||
// internal state
|
||||
access_handler m_write;
|
||||
access_handler m_subwrite;
|
||||
const input_port_config * m_ioport;
|
||||
|
||||
bool m_sub_is_legacy;
|
||||
legacy_info m_legacy_info;
|
||||
legacy_info m_sublegacy_info;
|
||||
};
|
||||
|
||||
|
||||
@ -4461,14 +4467,21 @@ void handler_entry_read::set_delegate(read8_delegate delegate, UINT64 mask, cons
|
||||
|
||||
// make sure this is a valid size
|
||||
assert(m_datawidth >= 8);
|
||||
m_read.r8 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
|
||||
// if mismatched bus width, configure a stub
|
||||
if (m_datawidth != 8)
|
||||
{
|
||||
configure_subunits(mask, 8);
|
||||
if (info)
|
||||
{
|
||||
m_sublegacy_info = *info;
|
||||
m_sub_is_legacy = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_subread.r8 = delegate;
|
||||
m_sub_is_legacy = false;
|
||||
}
|
||||
if (m_datawidth == 16)
|
||||
set_delegate(read16_delegate(&handler_entry_read::read_stub_16, delegate.name(), this));
|
||||
else if (m_datawidth == 32)
|
||||
@ -4476,6 +4489,12 @@ void handler_entry_read::set_delegate(read8_delegate delegate, UINT64 mask, cons
|
||||
else if (m_datawidth == 64)
|
||||
set_delegate(read64_delegate(&handler_entry_read::read_stub_64, delegate.name(), this));
|
||||
}
|
||||
else
|
||||
{
|
||||
m_read.r8 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -4492,19 +4511,32 @@ void handler_entry_read::set_delegate(read16_delegate delegate, UINT64 mask, con
|
||||
|
||||
// make sure this is a valid size
|
||||
assert(m_datawidth >= 16);
|
||||
m_read.r16 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
|
||||
// if mismatched bus width, configure a stub
|
||||
if (m_datawidth != 16)
|
||||
{
|
||||
configure_subunits(mask, 16);
|
||||
if (info)
|
||||
{
|
||||
m_sublegacy_info = *info;
|
||||
m_sub_is_legacy = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_subread.r16 = delegate;
|
||||
m_sub_is_legacy = false;
|
||||
}
|
||||
if (m_datawidth == 32)
|
||||
set_delegate(read32_delegate(&handler_entry_read::read_stub_32, delegate.name(), this));
|
||||
else if (m_datawidth == 64)
|
||||
set_delegate(read64_delegate(&handler_entry_read::read_stub_64, delegate.name(), this));
|
||||
}
|
||||
else
|
||||
{
|
||||
m_read.r16 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -4521,17 +4553,30 @@ void handler_entry_read::set_delegate(read32_delegate delegate, UINT64 mask, con
|
||||
|
||||
// make sure this is a valid size
|
||||
assert(m_datawidth >= 32);
|
||||
m_read.r32 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
|
||||
// if mismatched bus width, configure a stub
|
||||
if (m_datawidth != 32)
|
||||
{
|
||||
configure_subunits(mask, 32);
|
||||
if (info)
|
||||
{
|
||||
m_sublegacy_info = *info;
|
||||
m_sub_is_legacy = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_subread.r32 = delegate;
|
||||
m_sub_is_legacy = false;
|
||||
}
|
||||
if (m_datawidth == 64)
|
||||
set_delegate(read64_delegate(&handler_entry_read::read_stub_64, delegate.name(), this));
|
||||
}
|
||||
else
|
||||
{
|
||||
m_read.r32 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -4661,7 +4706,15 @@ UINT16 handler_entry_read::read_stub_16(address_space &space, offs_t offset, UIN
|
||||
const subunit_info &si = m_subunit_infos[index];
|
||||
UINT32 submask = (mask >> si.m_shift) & si.m_mask;
|
||||
if (submask)
|
||||
result |= m_read.r8(space, offset * si.m_multiplier + si.m_offset, submask) << si.m_shift;
|
||||
{
|
||||
offs_t aoffset = offset * si.m_multiplier + si.m_offset;
|
||||
UINT8 val;
|
||||
if (m_sub_is_legacy)
|
||||
val = m_sublegacy_info.handler.space8(m_sublegacy_info.object.space, aoffset);
|
||||
else
|
||||
val = m_subread.r8(space, aoffset, submask);
|
||||
result |= val << si.m_shift;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@ -4680,16 +4733,36 @@ UINT32 handler_entry_read::read_stub_32(address_space &space, offs_t offset, UIN
|
||||
const subunit_info &si = m_subunit_infos[index];
|
||||
UINT32 submask = (mask >> si.m_shift) & si.m_mask;
|
||||
if (submask)
|
||||
{
|
||||
offs_t aoffset = offset * si.m_multiplier + si.m_offset;
|
||||
UINT16 val = 0;
|
||||
if (m_sub_is_legacy)
|
||||
{
|
||||
switch (si.m_size)
|
||||
{
|
||||
case 8:
|
||||
result |= m_read.r8(space, offset * si.m_multiplier + si.m_offset, submask) << si.m_shift;
|
||||
val = m_sublegacy_info.handler.space8(m_sublegacy_info.object.space, aoffset);
|
||||
break;
|
||||
case 16:
|
||||
result |= m_read.r16(space, offset * si.m_multiplier + si.m_offset, submask) << si.m_shift;
|
||||
val = m_sublegacy_info.handler.space16(m_sublegacy_info.object.space, aoffset, submask);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (si.m_size)
|
||||
{
|
||||
case 8:
|
||||
val = m_subread.r8(space, aoffset, submask);
|
||||
break;
|
||||
case 16:
|
||||
val = m_subread.r16(space, aoffset, submask);
|
||||
break;
|
||||
}
|
||||
}
|
||||
result |= val << si.m_shift;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -4707,19 +4780,42 @@ UINT64 handler_entry_read::read_stub_64(address_space &space, offs_t offset, UIN
|
||||
const subunit_info &si = m_subunit_infos[index];
|
||||
UINT32 submask = (mask >> si.m_shift) & si.m_mask;
|
||||
if (submask)
|
||||
{
|
||||
offs_t aoffset = offset * si.m_multiplier + si.m_offset;
|
||||
UINT32 val = 0;
|
||||
if (m_sub_is_legacy)
|
||||
{
|
||||
switch (si.m_size)
|
||||
{
|
||||
case 8:
|
||||
result |= UINT64(m_read.r8(space, offset * si.m_multiplier + si.m_offset, submask)) << si.m_shift;
|
||||
val = m_sublegacy_info.handler.space8(m_sublegacy_info.object.space, aoffset);
|
||||
break;
|
||||
case 16:
|
||||
result |= UINT64(m_read.r16(space, offset * si.m_multiplier + si.m_offset, submask)) << si.m_shift;
|
||||
val = m_sublegacy_info.handler.space16(m_sublegacy_info.object.space, aoffset, submask);
|
||||
break;
|
||||
case 32:
|
||||
result |= UINT64(m_read.r32(space, offset * si.m_multiplier + si.m_offset, submask)) << si.m_shift;
|
||||
val = m_sublegacy_info.handler.space32(m_sublegacy_info.object.space, aoffset, submask);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (si.m_size)
|
||||
{
|
||||
case 8:
|
||||
val = m_subread.r8(space, aoffset, submask);
|
||||
break;
|
||||
case 16:
|
||||
val = m_subread.r16(space, aoffset, submask);
|
||||
break;
|
||||
case 32:
|
||||
val = m_subread.r32(space, aoffset, submask);
|
||||
break;
|
||||
}
|
||||
}
|
||||
result |= UINT64(val) << si.m_shift;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -4781,14 +4877,21 @@ const char *handler_entry_write::name() const
|
||||
void handler_entry_write::set_delegate(write8_delegate delegate, UINT64 mask, const legacy_info *info)
|
||||
{
|
||||
assert(m_datawidth >= 8);
|
||||
m_write.w8 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
|
||||
// if mismatched bus width, configure a stub
|
||||
if (m_datawidth != 8)
|
||||
{
|
||||
configure_subunits(mask, 8);
|
||||
if (info)
|
||||
{
|
||||
m_sublegacy_info = *info;
|
||||
m_sub_is_legacy = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_subwrite.w8 = delegate;
|
||||
m_sub_is_legacy = false;
|
||||
}
|
||||
if (m_datawidth == 16)
|
||||
set_delegate(write16_delegate(&handler_entry_write::write_stub_16, delegate.name(), this));
|
||||
else if (m_datawidth == 32)
|
||||
@ -4796,6 +4899,12 @@ void handler_entry_write::set_delegate(write8_delegate delegate, UINT64 mask, co
|
||||
else if (m_datawidth == 64)
|
||||
set_delegate(write64_delegate(&handler_entry_write::write_stub_64, delegate.name(), this));
|
||||
}
|
||||
else
|
||||
{
|
||||
m_write.w8 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -4807,19 +4916,32 @@ void handler_entry_write::set_delegate(write8_delegate delegate, UINT64 mask, co
|
||||
void handler_entry_write::set_delegate(write16_delegate delegate, UINT64 mask, const legacy_info *info)
|
||||
{
|
||||
assert(m_datawidth >= 16);
|
||||
m_write.w16 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
|
||||
// if mismatched bus width, configure a stub
|
||||
if (m_datawidth != 16)
|
||||
{
|
||||
configure_subunits(mask, 16);
|
||||
if (info)
|
||||
{
|
||||
m_sublegacy_info = *info;
|
||||
m_sub_is_legacy = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_subwrite.w16 = delegate;
|
||||
m_sub_is_legacy = false;
|
||||
}
|
||||
if (m_datawidth == 32)
|
||||
set_delegate(write32_delegate(&handler_entry_write::write_stub_32, delegate.name(), this));
|
||||
else if (m_datawidth == 64)
|
||||
set_delegate(write64_delegate(&handler_entry_write::write_stub_64, delegate.name(), this));
|
||||
}
|
||||
else
|
||||
{
|
||||
m_subwrite.w16 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -4831,17 +4953,30 @@ void handler_entry_write::set_delegate(write16_delegate delegate, UINT64 mask, c
|
||||
void handler_entry_write::set_delegate(write32_delegate delegate, UINT64 mask, const legacy_info *info)
|
||||
{
|
||||
assert(m_datawidth >= 32);
|
||||
m_write.w32 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
|
||||
// if mismatched bus width, configure a stub
|
||||
if (m_datawidth != 32)
|
||||
{
|
||||
configure_subunits(mask, 32);
|
||||
if (info)
|
||||
{
|
||||
m_sublegacy_info = *info;
|
||||
m_sub_is_legacy = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_subwrite.w32 = delegate;
|
||||
m_sub_is_legacy = false;
|
||||
}
|
||||
if (m_datawidth == 64)
|
||||
set_delegate(write64_delegate(&handler_entry_write::write_stub_64, delegate.name(), this));
|
||||
}
|
||||
else
|
||||
{
|
||||
m_write.w32 = delegate;
|
||||
if (info)
|
||||
m_legacy_info = *info;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -4965,7 +5100,14 @@ void handler_entry_write::write_stub_16(address_space &space, offs_t offset, UIN
|
||||
const subunit_info &si = m_subunit_infos[index];
|
||||
UINT32 submask = (mask >> si.m_shift) & si.m_mask;
|
||||
if (submask)
|
||||
m_write.w8(space, offset * si.m_multiplier + si.m_offset, data >> si.m_shift, submask);
|
||||
{
|
||||
offs_t aoffset = offset * si.m_multiplier + si.m_offset;
|
||||
UINT8 adata = data >> si.m_shift;
|
||||
if (m_sub_is_legacy)
|
||||
m_sublegacy_info.handler.space8(m_sublegacy_info.object.space, aoffset, adata);
|
||||
else
|
||||
m_subwrite.w8(space, aoffset, adata, submask);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -4982,16 +5124,35 @@ void handler_entry_write::write_stub_32(address_space &space, offs_t offset, UIN
|
||||
const subunit_info &si = m_subunit_infos[index];
|
||||
UINT32 submask = (mask >> si.m_shift) & si.m_mask;
|
||||
if (submask)
|
||||
{
|
||||
offs_t aoffset = offset * si.m_multiplier + si.m_offset;
|
||||
UINT16 adata = data >> si.m_shift;
|
||||
if (m_sub_is_legacy)
|
||||
{
|
||||
switch (si.m_size)
|
||||
{
|
||||
case 8:
|
||||
m_write.w8(space, offset * si.m_multiplier + si.m_offset, data >> si.m_shift, submask);
|
||||
m_sublegacy_info.handler.space8(m_sublegacy_info.object.space, aoffset, adata);
|
||||
break;
|
||||
case 16:
|
||||
m_write.w16(space, offset * si.m_multiplier + si.m_offset, data >> si.m_shift, submask);
|
||||
m_sublegacy_info.handler.space16(m_sublegacy_info.object.space, aoffset, adata, submask);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (si.m_size)
|
||||
{
|
||||
case 8:
|
||||
m_subwrite.w8(space, aoffset, adata, submask);
|
||||
break;
|
||||
case 16:
|
||||
m_subwrite.w16(space, aoffset, adata, submask);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -5007,19 +5168,41 @@ void handler_entry_write::write_stub_64(address_space &space, offs_t offset, UIN
|
||||
const subunit_info &si = m_subunit_infos[index];
|
||||
UINT32 submask = (mask >> si.m_shift) & si.m_mask;
|
||||
if (submask)
|
||||
{
|
||||
offs_t aoffset = offset * si.m_multiplier + si.m_offset;
|
||||
UINT32 adata = data >> si.m_shift;
|
||||
if (m_sub_is_legacy)
|
||||
{
|
||||
switch (si.m_size)
|
||||
{
|
||||
case 8:
|
||||
m_write.w8(space, offset * si.m_multiplier + si.m_offset, data >> si.m_shift, submask);
|
||||
m_sublegacy_info.handler.space8(m_sublegacy_info.object.space, aoffset, adata);
|
||||
break;
|
||||
case 16:
|
||||
m_write.w16(space, offset * si.m_multiplier + si.m_offset, data >> si.m_shift, submask);
|
||||
m_sublegacy_info.handler.space16(m_sublegacy_info.object.space, aoffset, adata, submask);
|
||||
break;
|
||||
case 32:
|
||||
m_write.w32(space, offset * si.m_multiplier + si.m_offset, data >> si.m_shift, submask);
|
||||
m_sublegacy_info.handler.space32(m_sublegacy_info.object.space, aoffset, adata, submask);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (si.m_size)
|
||||
{
|
||||
case 8:
|
||||
m_subwrite.w8(space, aoffset, adata, submask);
|
||||
break;
|
||||
case 16:
|
||||
m_subwrite.w16(space, aoffset, adata, submask);
|
||||
break;
|
||||
case 32:
|
||||
m_subwrite.w32(space, aoffset, adata, submask);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user