Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
David Haywood 2016-01-26 17:08:18 +00:00
commit bcb7421e0d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/bus/z88/z88.cpp
View File

@ -158,7 +158,11 @@ bool z88cart_slot_device::call_load()
void z88cart_slot_device::call_unload()
{
if (m_cart)
memset(m_cart->get_cart_base(), 0xff, m_cart->get_cart_size());
{
auto cart_size = m_cart->get_cart_size();
if (cart_size>0)
memset(m_cart->get_cart_base(), 0xff, cart_size);
}
// open the flap
m_out_flp_cb(ASSERT_LINE);

12
src/mame/drivers/viper.cpp
View File

@ -462,9 +462,12 @@ static inline void write64le_with_32le_device_handler(write32_delegate handler,
static inline UINT64 read64be_with_32le_device_handler(read32_delegate handler, address_space &space, offs_t offset, UINT64 mem_mask)
{
UINT64 result;
mem_mask = FLIPENDIAN_INT64(mem_mask);
result = read64le_with_32le_device_handler(handler, space, offset, mem_mask);
UINT64 result = 0;
if (ACCESSING_BITS_0_31)
result = (UINT64)(handler)(space, offset * 2, mem_mask & 0xffffffff);
if (ACCESSING_BITS_32_63)
result |= (UINT64)(handler)(space, offset * 2 + 1, mem_mask >> 32) << 32;
return FLIPENDIAN_INT64(result);
}
@ -473,7 +476,10 @@ static inline void write64be_with_32le_device_handler(write32_delegate handler,
{
data = FLIPENDIAN_INT64(data);
mem_mask = FLIPENDIAN_INT64(mem_mask);
write64le_with_32le_device_handler(handler, space, offset, data, mem_mask);
if (ACCESSING_BITS_0_31)
handler(space, offset * 2, data & 0xffffffff, mem_mask & 0xffffffff);
if (ACCESSING_BITS_32_63)
handler(space, offset * 2 + 1, data >> 32, mem_mask >> 32);
}
/*****************************************************************************/