Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-12 00:58:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

memory: Fix an endianness issue when doing a device mapping on a big endian bus [O. Galibert]

Browse Source
This commit is contained in:
Olivier Galibert 2011-08-05 18:52:29 +00:00
parent 7f1f57d8ff
commit c9fc846c46
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emu/addrmap.c
View File

@ -843,7 +843,7 @@ address_map_entry64 *address_map::add(offs_t start, offs_t end, address_map_entr
// uplift_submaps - propagate in the device submaps // uplift_submaps - propagate in the device submaps
//------------------------------------------------- //-------------------------------------------------
void address_map::uplift_submaps(running_machine &machine, device_t &device) void address_map::uplift_submaps(running_machine &machine, device_t &device, endianness_t endian)
{ {
address_map_entry *prev = 0; address_map_entry *prev = 0;
address_map_entry *entry = m_entrylist.first(); address_map_entry *entry = m_entrylist.first();
@ -859,7 +859,7 @@ void address_map::uplift_submaps(running_machine &machine, device_t &device)
address_map submap(*mapdevice, entry); address_map submap(*mapdevice, entry);
// Recursively uplift it if needed // Recursively uplift it if needed
submap.uplift_submaps(machine, *mapdevice); submap.uplift_submaps(machine, *mapdevice, endian);
// Compute the unit repartition characteristics // Compute the unit repartition characteristics
int entry_bits = entry->m_submap_bits; int entry_bits = entry->m_submap_bits;
@ -879,6 +879,7 @@ void address_map::uplift_submaps(running_machine &machine, device_t &device)
int slot_offset[8]; int slot_offset[8];
int slot_count = 0; int slot_count = 0;
int max_slot_count = m_databits / entry_bits; int max_slot_count = m_databits / entry_bits;
int slot_xor_mask = endian == ENDIANNESS_LITTLE ? 0 : max_slot_count - 1;
UINT64 global_mask = entry->m_read.m_mask; UINT64 global_mask = entry->m_read.m_mask;
// zero means all // zero means all
@ -889,7 +890,7 @@ void address_map::uplift_submaps(running_machine &machine, device_t &device)
// unitmask_is_appropriate, so one bit is enough // unitmask_is_appropriate, so one bit is enough
for (int slot=0; slot < max_slot_count; slot++) for (int slot=0; slot < max_slot_count; slot++)
if (global_mask & (1ULL << (slot * entry_bits))) if (global_mask & (1ULL << (slot * entry_bits)))
slot_offset[slot_count++] = slot * entry_bits; slot_offset[slot_count++] = (slot ^ slot_xor_mask) * entry_bits;
// Merge in all the map contents in order // Merge in all the map contents in order
while (submap.m_entrylist.count()) while (submap.m_entrylist.count())

2
src/emu/addrmap.h
View File

@ -441,7 +441,7 @@ public:
offs_t m_globalmask; // global mask offs_t m_globalmask; // global mask
simple_list<address_map_entry> m_entrylist; // list of entries simple_list<address_map_entry> m_entrylist; // list of entries
void uplift_submaps(running_machine &machine, device_t &device); void uplift_submaps(running_machine &machine, device_t &device, endianness_t endian);
}; };

2
src/emu/memory.c
View File

@ -2155,7 +2155,7 @@ void address_space::prepare_map()
m_map = global_alloc(address_map(m_device, m_spacenum)); m_map = global_alloc(address_map(m_device, m_spacenum));
// merge in the submaps // merge in the submaps
m_map->uplift_submaps(machine(), m_device); m_map->uplift_submaps(machine(), m_device, endianness());
// extract global parameters specified by the map // extract global parameters specified by the map
m_unmap = (m_map->m_unmapval == 0) ? 0 : ~0; m_unmap = (m_map->m_unmapval == 0) ? 0 : ~0;