6502/EightBit
1
0 Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2026-10-24 20:02:21 +00:00
Code Issues Projects Releases Wiki Activity

Don't expose the bus via the CPU any more: if a component needs the bus, it should be prepared to hold a reference to it.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon committed 2018-10-20 20:52:41 +01:00
1 parent 9b0cc4542f
commit 1b2ddd8843
19 files changed
+131 -103
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Z80/src/Disassembler.cpp
+6 -6
View File
@@ -10,7 +10,8 @@
#include "Z80.h"
EightBit::Disassembler::Disassembler() noexcept {
EightBit::Disassembler::Disassembler(Bus& bus) noexcept
: m_bus(bus) {
// Disable exceptions where too many format arguments are available
m_formatter.exceptions(boost::io::all_error_bits ^ boost::io::too_many_args_bit);
}
@@ -180,8 +181,7 @@ std::string EightBit::Disassembler::disassemble(Z80& cpu) {
void EightBit::Disassembler::disassemble(std::ostringstream& output, Z80& cpu, uint16_t pc) {
auto& bus = cpu.BUS();
auto opcode = bus.peek(pc);
auto opcode = BUS().peek(pc);
const auto& decoded = cpu.getDecodedOpcode(opcode);
@@ -192,11 +192,11 @@ void EightBit::Disassembler::disassemble(std::ostringstream& output, Z80& cpu, u
auto p = decoded.p;
auto q = decoded.q;
auto immediate = bus.peek(pc + 1);
auto immediate = BUS().peek(pc + 1);
auto absolute = cpu.peekWord(pc + 1).word;
auto displacement = (int8_t)immediate;
auto relative = pc + displacement + 2;
auto indexedImmediate = bus.peek(pc + 1);
auto indexedImmediate = BUS().peek(pc + 1);
auto dumpCount = 0;
@@ -221,7 +221,7 @@ void EightBit::Disassembler::disassemble(std::ostringstream& output, Z80& cpu, u
x, y, z, p, q);
for (int i = 0; i < dumpCount; ++i)
output << hex(bus.peek(pc + i + 1));
output << hex(BUS().peek(pc + i + 1));
auto outputFormatSpecification = !m_prefixDD;
if (m_prefixDD) {