summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/emumem_heun.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/emumem_heun.cpp')
-rw-r--r--src/emu/emumem_heun.cpp302
1 files changed, 176 insertions, 126 deletions
diff --git a/src/emu/emumem_heun.cpp b/src/emu/emumem_heun.cpp
index 0248f0f5a98..5157c2c35df 100644
--- a/src/emu/emumem_heun.cpp
+++ b/src/emu/emumem_heun.cpp
@@ -5,37 +5,110 @@
#include "emumem_hea.h"
#include "emumem_heun.h"
-template<int Width, int AddrShift, endianness_t Endian> typename emu::detail::handler_entry_size<Width>::uX handler_entry_read_unmapped<Width, AddrShift, Endian>::read(offs_t offset, uX mem_mask) const
+template<int Width, int AddrShift> emu::detail::handler_entry_size_t<Width> handler_entry_read_unmapped<Width, AddrShift>::read(offs_t offset, uX mem_mask) const
{
- if (inh::m_space->log_unmap() && !inh::m_space->m_manager.machine().side_effects_disabled())
- inh::m_space->device().logerror(inh::m_space->is_octal()
+ if (this->m_space->log_unmap() && !this->m_space->m_manager.machine().side_effects_disabled())
+ this->m_space->device().logerror(this->m_space->is_octal()
? "%s: unmapped %s memory read from %0*o & %0*o\n"
: "%s: unmapped %s memory read from %0*X & %0*X\n",
- inh::m_space->m_manager.machine().describe_context(), inh::m_space->name(),
- inh::m_space->addrchars(), offset,
+ this->m_space->m_manager.machine().describe_context(), this->m_space->name(),
+ this->m_space->addrchars(), offset,
2 << Width, mem_mask);
- return inh::m_space->unmap();
+ return this->m_space->unmap();
}
-template<int Width, int AddrShift, endianness_t Endian> std::string handler_entry_read_unmapped<Width, AddrShift, Endian>::name() const
+template<int Width, int AddrShift> emu::detail::handler_entry_size_t<Width> handler_entry_read_unmapped<Width, AddrShift>::read_interruptible(offs_t offset, uX mem_mask) const
+{
+ if (this->m_space->log_unmap() && !this->m_space->m_manager.machine().side_effects_disabled())
+ this->m_space->device().logerror(this->m_space->is_octal()
+ ? "%s: unmapped %s memory read from %0*o & %0*o\n"
+ : "%s: unmapped %s memory read from %0*X & %0*X\n",
+ this->m_space->m_manager.machine().describe_context(), this->m_space->name(),
+ this->m_space->addrchars(), offset,
+ 2 << Width, mem_mask);
+ return this->m_space->unmap();
+}
+
+template<int Width, int AddrShift> std::pair<emu::detail::handler_entry_size_t<Width>, u16> handler_entry_read_unmapped<Width, AddrShift>::read_flags(offs_t offset, uX mem_mask) const
+{
+ if (this->m_space->log_unmap() && !this->m_space->m_manager.machine().side_effects_disabled())
+ this->m_space->device().logerror(this->m_space->is_octal()
+ ? "%s: unmapped %s memory read from %0*o & %0*o\n"
+ : "%s: unmapped %s memory read from %0*X & %0*X\n",
+ this->m_space->m_manager.machine().describe_context(), this->m_space->name(),
+ this->m_space->addrchars(), offset,
+ 2 << Width, mem_mask);
+ return std::pair<uX, u16>(this->m_space->unmap(), this->m_flags);
+}
+
+template<int Width, int AddrShift> u16 handler_entry_read_unmapped<Width, AddrShift>::lookup_flags(offs_t offset, uX mem_mask) const
+{
+ if (this->m_space->log_unmap() && !this->m_space->m_manager.machine().side_effects_disabled())
+ this->m_space->device().logerror(this->m_space->is_octal()
+ ? "%s: unmapped %s memory read flags lookup from %0*o & %0*o\n"
+ : "%s: unmapped %s memory read flags lookup from %0*X & %0*X\n",
+ this->m_space->m_manager.machine().describe_context(), this->m_space->name(),
+ this->m_space->addrchars(), offset,
+ 2 << Width, mem_mask);
+ return this->m_flags;
+}
+
+template<int Width, int AddrShift> std::string handler_entry_read_unmapped<Width, AddrShift>::name() const
{
return "unmapped";
}
-template<int Width, int AddrShift, endianness_t Endian> void handler_entry_write_unmapped<Width, AddrShift, Endian>::write(offs_t offset, uX data, uX mem_mask)const
+template<int Width, int AddrShift> void handler_entry_write_unmapped<Width, AddrShift>::write(offs_t offset, uX data, uX mem_mask)const
+{
+ if (this->m_space->log_unmap() && !this->m_space->m_manager.machine().side_effects_disabled())
+ this->m_space->device().logerror(this->m_space->is_octal()
+ ? "%s: unmapped %s memory write to %0*o = %0*o & %0*o\n"
+ : "%s: unmapped %s memory write to %0*X = %0*X & %0*X\n",
+ this->m_space->m_manager.machine().describe_context(), this->m_space->name(),
+ this->m_space->addrchars(), offset,
+ 2 << Width, data,
+ 2 << Width, mem_mask);
+}
+
+template<int Width, int AddrShift> void handler_entry_write_unmapped<Width, AddrShift>::write_interruptible(offs_t offset, uX data, uX mem_mask)const
+{
+ if (this->m_space->log_unmap() && !this->m_space->m_manager.machine().side_effects_disabled())
+ this->m_space->device().logerror(this->m_space->is_octal()
+ ? "%s: unmapped %s memory write to %0*o = %0*o & %0*o\n"
+ : "%s: unmapped %s memory write to %0*X = %0*X & %0*X\n",
+ this->m_space->m_manager.machine().describe_context(), this->m_space->name(),
+ this->m_space->addrchars(), offset,
+ 2 << Width, data,
+ 2 << Width, mem_mask);
+}
+
+template<int Width, int AddrShift> u16 handler_entry_write_unmapped<Width, AddrShift>::write_flags(offs_t offset, uX data, uX mem_mask)const
{
- if (inh::m_space->log_unmap() && !inh::m_space->m_manager.machine().side_effects_disabled())
- inh::m_space->device().logerror(inh::m_space->is_octal()
+ if (this->m_space->log_unmap() && !this->m_space->m_manager.machine().side_effects_disabled())
+ this->m_space->device().logerror(this->m_space->is_octal()
? "%s: unmapped %s memory write to %0*o = %0*o & %0*o\n"
: "%s: unmapped %s memory write to %0*X = %0*X & %0*X\n",
- inh::m_space->m_manager.machine().describe_context(), inh::m_space->name(),
- inh::m_space->addrchars(), offset,
+ this->m_space->m_manager.machine().describe_context(), this->m_space->name(),
+ this->m_space->addrchars(), offset,
2 << Width, data,
2 << Width, mem_mask);
+ return this->m_flags;
}
-template<int Width, int AddrShift, endianness_t Endian> std::string handler_entry_write_unmapped<Width, AddrShift, Endian>::name() const
+template<int Width, int AddrShift> u16 handler_entry_write_unmapped<Width, AddrShift>::lookup_flags(offs_t offset, uX mem_mask)const
+{
+ if (this->m_space->log_unmap() && !this->m_space->m_manager.machine().side_effects_disabled())
+ this->m_space->device().logerror(this->m_space->is_octal()
+ ? "%s: unmapped %s write flags lookup from %0*o & %0*o\n"
+ : "%s: unmapped %s write flags lookup from %0*X & %0*X\n",
+ this->m_space->m_manager.machine().describe_context(), this->m_space->name(),
+ this->m_space->addrchars(), offset,
+ 2 << Width, mem_mask);
+ return this->m_flags;
+}
+
+template<int Width, int AddrShift> std::string handler_entry_write_unmapped<Width, AddrShift>::name() const
{
return "unmapped";
}
@@ -43,132 +116,109 @@ template<int Width, int AddrShift, endianness_t Endian> std::string handler_entr
-template<int Width, int AddrShift, endianness_t Endian> typename emu::detail::handler_entry_size<Width>::uX handler_entry_read_nop<Width, AddrShift, Endian>::read(offs_t offset, uX mem_mask) const
+template<int Width, int AddrShift> emu::detail::handler_entry_size_t<Width> handler_entry_read_nop<Width, AddrShift>::read(offs_t offset, uX mem_mask) const
+{
+ return this->m_space->unmap();
+}
+
+template<int Width, int AddrShift> emu::detail::handler_entry_size_t<Width> handler_entry_read_nop<Width, AddrShift>::read_interruptible(offs_t offset, uX mem_mask) const
+{
+ return this->m_space->unmap();
+}
+
+template<int Width, int AddrShift> std::pair<emu::detail::handler_entry_size_t<Width>, u16> handler_entry_read_nop<Width, AddrShift>::read_flags(offs_t offset, uX mem_mask) const
+{
+ return std::pair<uX, u16>(this->m_space->unmap(), this->m_flags);
+}
+
+template<int Width, int AddrShift> u16 handler_entry_read_nop<Width, AddrShift>::lookup_flags(offs_t offset, uX mem_mask) const
{
- return inh::m_space->unmap();
+ return this->m_flags;
}
-template<int Width, int AddrShift, endianness_t Endian> std::string handler_entry_read_nop<Width, AddrShift, Endian>::name() const
+template<int Width, int AddrShift> std::string handler_entry_read_nop<Width, AddrShift>::name() const
{
return "nop";
}
-template<int Width, int AddrShift, endianness_t Endian> void handler_entry_write_nop<Width, AddrShift, Endian>::write(offs_t offset, uX data, uX mem_mask) const
+template<int Width, int AddrShift> void handler_entry_write_nop<Width, AddrShift>::write(offs_t offset, uX data, uX mem_mask) const
+{
+}
+
+template<int Width, int AddrShift> void handler_entry_write_nop<Width, AddrShift>::write_interruptible(offs_t offset, uX data, uX mem_mask) const
+{
+}
+
+template<int Width, int AddrShift> u16 handler_entry_write_nop<Width, AddrShift>::write_flags(offs_t offset, uX data, uX mem_mask) const
+{
+ return this->m_flags;
+}
+
+template<int Width, int AddrShift> u16 handler_entry_write_nop<Width, AddrShift>::lookup_flags(offs_t offset, uX mem_mask) const
{
+ return this->m_flags;
}
-template<int Width, int AddrShift, endianness_t Endian> std::string handler_entry_write_nop<Width, AddrShift, Endian>::name() const
+template<int Width, int AddrShift> std::string handler_entry_write_nop<Width, AddrShift>::name() const
{
return "nop";
}
-template class handler_entry_read_unmapped<0, 1, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<0, 1, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<0, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<0, 0, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<1, 3, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<1, 3, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<1, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<1, 0, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<1, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<1, -1, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<2, 3, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<2, 3, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<2, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<2, 0, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<2, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<2, -1, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<2, -2, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<2, -2, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<3, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<3, 0, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<3, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<3, -1, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<3, -2, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<3, -2, ENDIANNESS_BIG>;
-template class handler_entry_read_unmapped<3, -3, ENDIANNESS_LITTLE>;
-template class handler_entry_read_unmapped<3, -3, ENDIANNESS_BIG>;
-
-template class handler_entry_write_unmapped<0, 1, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<0, 1, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<0, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<0, 0, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<1, 3, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<1, 3, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<1, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<1, 0, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<1, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<1, -1, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<2, 3, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<2, 3, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<2, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<2, 0, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<2, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<2, -1, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<2, -2, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<2, -2, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<3, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<3, 0, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<3, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<3, -1, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<3, -2, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<3, -2, ENDIANNESS_BIG>;
-template class handler_entry_write_unmapped<3, -3, ENDIANNESS_LITTLE>;
-template class handler_entry_write_unmapped<3, -3, ENDIANNESS_BIG>;
-
-
-template class handler_entry_read_nop<0, 1, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<0, 1, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<0, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<0, 0, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<1, 3, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<1, 3, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<1, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<1, 0, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<1, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<1, -1, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<2, 3, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<2, 3, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<2, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<2, 0, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<2, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<2, -1, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<2, -2, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<2, -2, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<3, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<3, 0, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<3, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<3, -1, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<3, -2, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<3, -2, ENDIANNESS_BIG>;
-template class handler_entry_read_nop<3, -3, ENDIANNESS_LITTLE>;
-template class handler_entry_read_nop<3, -3, ENDIANNESS_BIG>;
-
-template class handler_entry_write_nop<0, 1, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<0, 1, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<0, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<0, 0, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<1, 3, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<1, 3, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<1, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<1, 0, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<1, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<1, -1, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<2, 3, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<2, 3, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<2, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<2, 0, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<2, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<2, -1, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<2, -2, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<2, -2, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<3, 0, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<3, 0, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<3, -1, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<3, -1, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<3, -2, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<3, -2, ENDIANNESS_BIG>;
-template class handler_entry_write_nop<3, -3, ENDIANNESS_LITTLE>;
-template class handler_entry_write_nop<3, -3, ENDIANNESS_BIG>;
+template class handler_entry_read_unmapped<0, 1>;
+template class handler_entry_read_unmapped<0, 0>;
+template class handler_entry_read_unmapped<1, 3>;
+template class handler_entry_read_unmapped<1, 0>;
+template class handler_entry_read_unmapped<1, -1>;
+template class handler_entry_read_unmapped<2, 3>;
+template class handler_entry_read_unmapped<2, 0>;
+template class handler_entry_read_unmapped<2, -1>;
+template class handler_entry_read_unmapped<2, -2>;
+template class handler_entry_read_unmapped<3, 0>;
+template class handler_entry_read_unmapped<3, -1>;
+template class handler_entry_read_unmapped<3, -2>;
+template class handler_entry_read_unmapped<3, -3>;
+
+template class handler_entry_write_unmapped<0, 1>;
+template class handler_entry_write_unmapped<0, 0>;
+template class handler_entry_write_unmapped<1, 3>;
+template class handler_entry_write_unmapped<1, 0>;
+template class handler_entry_write_unmapped<1, -1>;
+template class handler_entry_write_unmapped<2, 3>;
+template class handler_entry_write_unmapped<2, 0>;
+template class handler_entry_write_unmapped<2, -1>;
+template class handler_entry_write_unmapped<2, -2>;
+template class handler_entry_write_unmapped<3, 0>;
+template class handler_entry_write_unmapped<3, -1>;
+template class handler_entry_write_unmapped<3, -2>;
+template class handler_entry_write_unmapped<3, -3>;
+
+
+template class handler_entry_read_nop<0, 1>;
+template class handler_entry_read_nop<0, 0>;
+template class handler_entry_read_nop<1, 3>;
+template class handler_entry_read_nop<1, 0>;
+template class handler_entry_read_nop<1, -1>;
+template class handler_entry_read_nop<2, 3>;
+template class handler_entry_read_nop<2, 0>;
+template class handler_entry_read_nop<2, -1>;
+template class handler_entry_read_nop<2, -2>;
+template class handler_entry_read_nop<3, 0>;
+template class handler_entry_read_nop<3, -1>;
+template class handler_entry_read_nop<3, -2>;
+template class handler_entry_read_nop<3, -3>;
+
+template class handler_entry_write_nop<0, 1>;
+template class handler_entry_write_nop<0, 0>;
+template class handler_entry_write_nop<1, 3>;
+template class handler_entry_write_nop<1, 0>;
+template class handler_entry_write_nop<1, -1>;
+template class handler_entry_write_nop<2, 3>;
+template class handler_entry_write_nop<2, 0>;
+template class handler_entry_write_nop<2, -1>;
+template class handler_entry_write_nop<2, -2>;
+template class handler_entry_write_nop<3, 0>;
+template class handler_entry_write_nop<3, -1>;
+template class handler_entry_write_nop<3, -2>;
+template class handler_entry_write_nop<3, -3>;