6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-01-11 17:29:57 +00:00
Code Issues Projects Releases Wiki Activity

Change a couple of small formatting quirks in the disassembler to better match "nestest".

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2017-12-28 14:18:17 +00:00
parent d4782a66db
commit bfa1c07ea4
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
M6502/inc/Disassembly.h
View File

@ -64,7 +64,7 @@ namespace EightBit {
} }
std::string AM_Immediate() const { std::string AM_Immediate() const {
return "#" + AM_Immediate_dump(); return "#$" + AM_Immediate_dump();
} }
std::string AM_Absolute_dump() const { std::string AM_Absolute_dump() const {
@ -315,6 +315,8 @@ namespace EightBit {
#pragma endregion 6502 addressing modes #pragma endregion 6502 addressing modes
static void dump(std::ostream& out, int value, int width);
uint8_t getByte(uint16_t address) const; uint8_t getByte(uint16_t address) const;
std::string dump_Byte(uint16_t address) const; std::string dump_Byte(uint16_t address) const;

12
M6502/src/Disassembly.cpp
View File

@ -25,15 +25,19 @@ std::string EightBit::Disassembly::dump_Flags(uint8_t value) const {
return returned; return returned;
} }
void EightBit::Disassembly::dump(std::ostream& out, int value, int width) {
out << std::hex << std::uppercase << std::setw(width) << std::setfill('0') << value;
}
std::string EightBit::Disassembly::dump_ByteValue(uint8_t value) const { std::string EightBit::Disassembly::dump_ByteValue(uint8_t value) const {
std::ostringstream output; std::ostringstream output;
output << std::hex << std::setw(2) << std::setfill('0') << (int)value; dump(output, value, 2);
return output.str(); return output.str();
} }
std::string EightBit::Disassembly::dump_WordValue(uint16_t value) const { std::string EightBit::Disassembly::dump_WordValue(uint16_t value) const {
std::ostringstream output; std::ostringstream output;
output << std::hex << std::setw(4) << std::setfill('0') << (int)value; dump(output, value, 4);
return output.str(); return output.str();
} }
@ -47,7 +51,7 @@ std::string EightBit::Disassembly::disassemble(uint16_t current) const {
auto cell = bus.peek(current); auto cell = bus.peek(current);
output << dump_ByteValue(cell); output << dump_ByteValue(cell) << " ";
auto byte = bus.peek(current + 1); auto byte = bus.peek(current + 1);
uint16_t relative = processor.PC().word + 2 + (int8_t)byte; uint16_t relative = processor.PC().word + 2 + (int8_t)byte;
@ -332,7 +336,7 @@ std::string EightBit::Disassembly::dump_Byte(uint16_t address) const {
} }
std::string EightBit::Disassembly::dump_DByte(uint16_t address) const { std::string EightBit::Disassembly::dump_DByte(uint16_t address) const {
return dump_Byte(address) + dump_Byte(address + 1); return dump_Byte(address) + " " + dump_Byte(address + 1);
} }
//// ////