mirror of
https://github.com/mamedev/mame.git
synced 2024-11-16 07:48:32 +01:00
mc88200: fix cache endianness bugs
* add support for debugger address translation
This commit is contained in:
Patrick Mackinlay
parent
acd67bd6f1
commit
a2a46381cb
2 changed files with 245 additions and 199 deletions
|
|
@ -412,14 +412,65 @@ void mc88200_device::cssp_w(u32 data)
|
|||
m_cache[BIT(m_sar, 4, 8)].status = data & CSSP_WM;
|
||||
}
|
||||
|
||||
std::optional<mc88200_device::translate_result> mc88200_device::translate(u32 virtual_address, bool supervisor, bool write, bool debug)
|
||||
// abbreviated, side-effect free address translation for debugger
|
||||
bool mc88200_device::translate(int intention, u32 &address, bool supervisor)
|
||||
{
|
||||
// select area descriptor
|
||||
u32 const apr = supervisor ? m_sapr : m_uapr;
|
||||
if (apr & APR_TE)
|
||||
{
|
||||
// check block address translation cache
|
||||
for (u32 const batc : m_batc)
|
||||
// search block address translation cache
|
||||
for (u32 const &batc : m_batc)
|
||||
{
|
||||
if ((batc & BATC_V) && bool(batc & BATC_S) == supervisor && BIT(address, 19, 13) == BIT(batc, 19, 13))
|
||||
{
|
||||
address = ((batc & BATC_PBA) << 13) | (address & ~BATC_LBA);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// search page address translation cache
|
||||
for (u64 const &patc : m_patc)
|
||||
{
|
||||
if ((patc & PATC_V) && (bool(patc & PATC_S) == supervisor && BIT(address, 12, 20) == BIT(patc, 26, 20)))
|
||||
{
|
||||
address = ((patc & PATC_PFA) << 6) | (address & LA_OFS);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// load and check segment descriptor
|
||||
std::optional<u32> const sgd = mbus_read<u32>((apr & APR_STBA) | ((address & LA_SEG) >> 20));
|
||||
if (!sgd.has_value() || !(sgd.value() & SGD_V) || ((sgd.value() & SGD_SP) && !supervisor))
|
||||
return false;
|
||||
|
||||
// load and check page descriptor
|
||||
std::optional<u32> pgd = mbus_read<u32>((sgd.value() & SGD_PTBA) | ((address & LA_PAG) >> 10));
|
||||
if (!pgd.has_value() || !(pgd.value() & PGD_V) || ((pgd.value() & PGD_SP) && !supervisor))
|
||||
return false;
|
||||
|
||||
address = (pgd.value() & PGD_PFA) | (address & LA_OFS);
|
||||
}
|
||||
else
|
||||
{
|
||||
// apply hard-wired batc entries
|
||||
if (BIT(address, 19, 13) == BIT(m_batc[8], 19, 13))
|
||||
address = ((m_batc[8] & BATC_PBA) << 13) | (address & ~BATC_LBA);
|
||||
else if (BIT(address, 19, 13) == BIT(m_batc[9], 19, 13))
|
||||
address = ((m_batc[9] & BATC_PBA) << 13) | (address & ~BATC_LBA);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::optional<mc88200_device::translate_result> mc88200_device::translate(u32 virtual_address, bool supervisor, bool write)
|
||||
{
|
||||
// select area descriptor
|
||||
u32 const apr = supervisor ? m_sapr : m_uapr;
|
||||
if (apr & APR_TE)
|
||||
{
|
||||
// search block address translation cache
|
||||
for (u32 const &batc : m_batc)
|
||||
{
|
||||
if ((batc & BATC_V) && bool(batc & BATC_S) == supervisor && BIT(virtual_address, 19, 13) == BIT(batc, 19, 13))
|
||||
{
|
||||
|
|
@ -435,7 +486,7 @@ std::optional<mc88200_device::translate_result> mc88200_device::translate(u32 vi
|
|||
}
|
||||
}
|
||||
|
||||
// check page address translation cache
|
||||
// search page address translation cache
|
||||
bool patc_hit = false;
|
||||
for (u64 &patc : m_patc)
|
||||
{
|
||||
|
|
@ -505,9 +556,7 @@ std::optional<mc88200_device::translate_result> mc88200_device::translate(u32 vi
|
|||
return std::nullopt;
|
||||
}
|
||||
|
||||
if (!debug)
|
||||
{
|
||||
// set page descriptor used and modified bits
|
||||
// update page descriptor used and modified bits
|
||||
if (!(pgd.value() & PGD_U) || (write && !(pgd.value() & PGD_M)))
|
||||
{
|
||||
pgd.value() |= (write ? PGD_M : 0) | PGD_U;
|
||||
|
|
@ -523,7 +572,6 @@ std::optional<mc88200_device::translate_result> mc88200_device::translate(u32 vi
|
|||
if (m_patc_ptr == std::size(m_patc))
|
||||
m_patc_ptr = 0;
|
||||
}
|
||||
}
|
||||
|
||||
return translate_result((pgd.value() & PGD_PFA) | (virtual_address & LA_OFS),
|
||||
(apr | sgd.value() | pgd.value()) & PGD_CI,
|
||||
|
|
@ -689,14 +737,44 @@ std::optional<unsigned> mc88200_device::cache_replace(cache_set const &cs)
|
|||
return std::nullopt;
|
||||
}
|
||||
|
||||
template <typename T> std::optional<T> mc88200_device::cache_read(u32 physical_address)
|
||||
void mc88200_device::cache_flush(unsigned const start, unsigned const limit, match_function match, bool const copyback, bool const invalidate)
|
||||
{
|
||||
for (unsigned s = start; s < limit; s++)
|
||||
{
|
||||
cache_set &cs = m_cache[s];
|
||||
|
||||
for (unsigned l = 0; l < std::size(cs.line); l++)
|
||||
{
|
||||
if (!match || std::invoke(match, cs.line[l], m_sar))
|
||||
{
|
||||
// copy back
|
||||
if (copyback && cs.modified(l))
|
||||
if (!cs.line[l].copy_back(*this, cs.line[l].tag | (s << 4), true))
|
||||
return;
|
||||
|
||||
// invalidate
|
||||
if (invalidate)
|
||||
cs.set_invalid(l);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> std::optional<T> mc88200_device::read(u32 virtual_address, bool supervisor)
|
||||
{
|
||||
std::optional<mc88200_device::translate_result> result = translate(virtual_address, supervisor, false);
|
||||
if (!result.has_value())
|
||||
return std::nullopt;
|
||||
|
||||
u32 const physical_address = result.value().address;
|
||||
if (!result.value().ci)
|
||||
{
|
||||
unsigned const s = BIT(physical_address, 4, 8);
|
||||
cache_set &cs = m_cache[s];
|
||||
|
||||
for (unsigned l = 0; l < std::size(cs.line); l++)
|
||||
{
|
||||
// cache line hit: tag match, ensabled, not invalid
|
||||
// cache line hit: tag match, enabled, not invalid
|
||||
if (cs.line[l].match_page(physical_address) && cs.enabled(l) && !cs.invalid(l))
|
||||
{
|
||||
// set most recently used
|
||||
|
|
@ -707,8 +785,8 @@ template <typename T> std::optional<T> mc88200_device::cache_read(u32 physical_a
|
|||
|
||||
switch (sizeof(T))
|
||||
{
|
||||
case 1: return T(data >> ((physical_address & 3) * 8));
|
||||
case 2: return T(data >> ((physical_address & 3) * 8));
|
||||
case 1: return T(data >> (24 - (physical_address & 3) * 8));
|
||||
case 2: return T(data >> (16 - (physical_address & 3) * 8));
|
||||
case 4: return T(data);
|
||||
}
|
||||
}
|
||||
|
|
@ -745,17 +823,25 @@ template <typename T> std::optional<T> mc88200_device::cache_read(u32 physical_a
|
|||
|
||||
switch (sizeof(T))
|
||||
{
|
||||
case 1: return T(data >> ((physical_address & 3) * 8));
|
||||
case 2: return T(data >> ((physical_address & 3) * 8));
|
||||
case 1: return T(data >> (24 - (physical_address & 3) * 8));
|
||||
case 2: return T(data >> (16 - (physical_address & 3) * 8));
|
||||
case 4: return T(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return mbus_read<T>(physical_address);
|
||||
}
|
||||
|
||||
template <typename T> bool mc88200_device::cache_write(u32 physical_address, T data, bool writethrough, bool global)
|
||||
template <typename T> bool mc88200_device::write(u32 virtual_address, T data, bool supervisor)
|
||||
{
|
||||
std::optional<mc88200_device::translate_result> result = translate(virtual_address, supervisor, true);
|
||||
if (!result.has_value())
|
||||
return false;
|
||||
|
||||
u32 const physical_address = result.value().address;
|
||||
if (!result.value().ci)
|
||||
{
|
||||
unsigned const s = BIT(physical_address, 4, 8);
|
||||
cache_set &cs = m_cache[s];
|
||||
|
||||
|
|
@ -768,8 +854,8 @@ template <typename T> bool mc88200_device::cache_write(u32 physical_address, T d
|
|||
u32 &cache_data = cs.line[l].data[BIT(physical_address, 2, 2)];
|
||||
switch (sizeof(T))
|
||||
{
|
||||
case 1: cache_data = (cache_data & ~(0x000000ffU << ((physical_address & 3) * 8))) | (u32(data) << ((physical_address & 3) * 8)); break;
|
||||
case 2: cache_data = (cache_data & ~(0x0000ffffU << ((physical_address & 3) * 8))) | (u32(data) << ((physical_address & 3) * 8)); break;
|
||||
case 1: cache_data = (cache_data & ~(0x000000ffU << (24 - (physical_address & 3) * 8))) | (u32(data) << (24 - (physical_address & 3) * 8)); break;
|
||||
case 2: cache_data = (cache_data & ~(0x0000ffffU << (16 - (physical_address & 3) * 8))) | (u32(data) << (16 - (physical_address & 3) * 8)); break;
|
||||
case 4: cache_data = data; break;
|
||||
}
|
||||
|
||||
|
|
@ -777,16 +863,16 @@ template <typename T> bool mc88200_device::cache_write(u32 physical_address, T d
|
|||
cs.set_mru(l);
|
||||
|
||||
// write data to memory
|
||||
if (writethrough || global)
|
||||
if (result.value().wt || result.value().g)
|
||||
if (!mbus_write(physical_address, data))
|
||||
return false;
|
||||
|
||||
// update line status
|
||||
if (cs.shared(l))
|
||||
{
|
||||
if (global)
|
||||
if (result.value().g)
|
||||
cs.set_unmodified(l);
|
||||
else if (!writethrough)
|
||||
else if (!result.value().wt)
|
||||
cs.set_modified(l);
|
||||
}
|
||||
else
|
||||
|
|
@ -827,8 +913,8 @@ template <typename T> bool mc88200_device::cache_write(u32 physical_address, T d
|
|||
u32 &cache_data = cs.line[l.value()].data[BIT(physical_address, 2, 2)];
|
||||
switch (sizeof(T))
|
||||
{
|
||||
case 1: cache_data = (cache_data & ~(0x000000ffU << ((physical_address & 3) * 8))) | (u32(data) << ((physical_address & 3) * 8)); break;
|
||||
case 2: cache_data = (cache_data & ~(0x0000ffffU << ((physical_address & 3) * 8))) | (u32(data) << ((physical_address & 3) * 8)); break;
|
||||
case 1: cache_data = (cache_data & ~(0x000000ffU << (24 - (physical_address & 3) * 8))) | (u32(data) << (24 - (physical_address & 3) * 8)); break;
|
||||
case 2: cache_data = (cache_data & ~(0x0000ffffU << (16 - (physical_address & 3) * 8))) | (u32(data) << (16 - (physical_address & 3) * 8)); break;
|
||||
case 4: cache_data = data; break;
|
||||
}
|
||||
|
||||
|
|
@ -840,62 +926,18 @@ template <typename T> bool mc88200_device::cache_write(u32 physical_address, T d
|
|||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void mc88200_device::cache_flush(unsigned const start, unsigned const limit, match_function match, bool const copyback, bool const invalidate)
|
||||
{
|
||||
for (unsigned s = start; s < limit; s++)
|
||||
{
|
||||
cache_set &cs = m_cache[s];
|
||||
|
||||
for (unsigned l = 0; l < std::size(cs.line); l++)
|
||||
{
|
||||
if (!match || std::invoke(match, cs.line[l], m_sar))
|
||||
{
|
||||
// copy back
|
||||
if (copyback && cs.modified(l))
|
||||
if (!cs.line[l].copy_back(*this, cs.line[l].tag | (s << 4), true))
|
||||
return;
|
||||
|
||||
// invalidate
|
||||
if (invalidate)
|
||||
cs.set_invalid(l);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> std::optional<T> mc88200_device::read(u32 virtual_address, bool supervisor, bool debug)
|
||||
{
|
||||
std::optional<mc88200_device::translate_result> result = translate(virtual_address, supervisor, false, debug);
|
||||
if (!result.has_value())
|
||||
return std::nullopt;
|
||||
|
||||
if (result.value().ci)
|
||||
return mbus_read<T>(result.value().address);
|
||||
else
|
||||
return cache_read<T>(result.value().address);
|
||||
}
|
||||
|
||||
template <typename T> bool mc88200_device::write(u32 virtual_address, T data, bool supervisor, bool debug)
|
||||
{
|
||||
std::optional<mc88200_device::translate_result> result = translate(virtual_address, supervisor, true, debug);
|
||||
if (!result.has_value())
|
||||
return false;
|
||||
|
||||
if (result.value().ci)
|
||||
return mbus_write(result.value().address, data);
|
||||
else
|
||||
return cache_write<T>(result.value().address, data, result.value().wt, result.value().g);
|
||||
}
|
||||
|
||||
template std::optional<u8> mc88200_device::read(u32 virtual_address, bool supervisor, bool debug);
|
||||
template std::optional<u16> mc88200_device::read(u32 virtual_address, bool supervisor, bool debug);
|
||||
template std::optional<u32> mc88200_device::read(u32 virtual_address, bool supervisor, bool debug);
|
||||
template std::optional<u8> mc88200_device::read(u32 virtual_address, bool supervisor);
|
||||
template std::optional<u16> mc88200_device::read(u32 virtual_address, bool supervisor);
|
||||
template std::optional<u32> mc88200_device::read(u32 virtual_address, bool supervisor);
|
||||
|
||||
template bool mc88200_device::write(u32 virtual_address, u8 data, bool supervisor, bool debug);
|
||||
template bool mc88200_device::write(u32 virtual_address, u16 data, bool supervisor, bool debug);
|
||||
template bool mc88200_device::write(u32 virtual_address, u32 data, bool supervisor, bool debug);
|
||||
template bool mc88200_device::write(u32 virtual_address, u8 data, bool supervisor);
|
||||
template bool mc88200_device::write(u32 virtual_address, u16 data, bool supervisor);
|
||||
template bool mc88200_device::write(u32 virtual_address, u32 data, bool supervisor);
|
||||
|
||||
template <typename T> std::optional<T> mc88200_device::mbus_read(u32 address)
|
||||
{
|
||||
|
|
@ -909,11 +951,15 @@ template <typename T> std::optional<T> mc88200_device::mbus_read(u32 address)
|
|||
}
|
||||
|
||||
if (m_bus_error)
|
||||
{
|
||||
if (!machine().side_effects_disabled())
|
||||
{
|
||||
m_bus_error = false;
|
||||
m_pfar = address;
|
||||
m_pfsr = PFSR_BE;
|
||||
}
|
||||
data = std::nullopt;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,9 +14,11 @@ public:
|
|||
|
||||
template <typename T> void set_mbus(T &&tag, int spacenum) { m_mbus.set_tag(std::forward<T>(tag), spacenum); }
|
||||
|
||||
template <typename T> std::optional<T> read(u32 virtual_address, bool supervisor, bool debug = false);
|
||||
template <typename T> bool write(u32 virtual_address, T data, bool supervisor, bool debug = false);
|
||||
WRITE_LINE_MEMBER(bus_error_w) { m_bus_error = true; }
|
||||
bool translate(int intention, u32 &address, bool supervisor);
|
||||
|
||||
template <typename T> std::optional<T> read(u32 virtual_address, bool supervisor);
|
||||
template <typename T> bool write(u32 virtual_address, T data, bool supervisor);
|
||||
WRITE_LINE_MEMBER(bus_error_w) { if (!machine().side_effects_disabled()) m_bus_error = true; }
|
||||
|
||||
protected:
|
||||
virtual void device_start() override;
|
||||
|
|
@ -69,7 +71,7 @@ protected:
|
|||
bool const g; // global
|
||||
bool const wt; // writethrough
|
||||
};
|
||||
std::optional<translate_result> translate(u32 virtual_address, bool supervisor, bool write, bool debug = false);
|
||||
std::optional<translate_result> translate(u32 virtual_address, bool supervisor, bool write);
|
||||
|
||||
struct cache_set
|
||||
{
|
||||
|
|
@ -104,8 +106,6 @@ protected:
|
|||
typedef bool (mc88200_device::cache_set::cache_line::* match_function)(u32 const) const;
|
||||
|
||||
std::optional<unsigned> cache_replace(cache_set const &cs);
|
||||
template <typename T> std::optional<T> cache_read(u32 physical_address);
|
||||
template <typename T> bool cache_write(u32 physical_address, T data, bool writethrough, bool global);
|
||||
void cache_flush(unsigned const start, unsigned const limit, match_function match, bool const copyback, bool const invalidate);
|
||||
|
||||
template <typename T> std::optional<T> mbus_read(u32 address);
|
||||
|
|
|
|||
Loading…
Reference in a new issue