diff --git a/M6502/HarteTest_6502/checker_t.cpp b/M6502/HarteTest_6502/checker_t.cpp index 4acbf62..6323dee 100644 --- a/M6502/HarteTest_6502/checker_t.cpp +++ b/M6502/HarteTest_6502/checker_t.cpp @@ -1,20 +1,20 @@ #include "stdafx.h" #include "checker_t.h" -void checker_t::addActualCycle(const uint16_t address, const uint8_t value, const std::string action) { +void checker_t::addActualCycle(const uint16_t address, const uint8_t value, const std::string_view action) { m_actualCycles.push_back({ address, value, action }); } -void checker_t::addActualCycle(const EightBit::register16_t address, const uint8_t value, const std::string action) { +void checker_t::addActualCycle(const EightBit::register16_t address, const uint8_t value, const std::string_view action) { addActualCycle(address.word, value, action); } void checker_t::addActualReadCycle(const EightBit::register16_t address, const uint8_t value) { - addActualCycle(address, value, "read"); + addActualCycle(address, value, m_read_action); } void checker_t::addActualWriteCycle(const EightBit::register16_t address, const uint8_t value) { - addActualCycle(address, value, "write"); + addActualCycle(address, value, m_write_action); } void checker_t::dumpCycles(const std::string which, const actual_cycles_t& events) { diff --git a/M6502/HarteTest_6502/checker_t.h b/M6502/HarteTest_6502/checker_t.h index f46b5dd..8f8d61f 100644 --- a/M6502/HarteTest_6502/checker_t.h +++ b/M6502/HarteTest_6502/checker_t.h @@ -20,7 +20,10 @@ private: std::ostringstream m_os; std::vector m_messages; - typedef std::tuple actual_cycle_t; + const std::string m_read_action = { "read" }; + const std::string m_write_action = { "write" }; + + typedef std::tuple actual_cycle_t; typedef std::vector actual_cycles_t; actual_cycles_t m_actualCycles; bool m_cycle_count_mismatch = false; @@ -50,8 +53,8 @@ private: bool check(std::string_view what, uint16_t address, uint8_t expected, uint8_t actual); - void addActualCycle(uint16_t address, uint8_t value, std::string action); - void addActualCycle(EightBit::register16_t address, uint8_t value, std::string action); + void addActualCycle(uint16_t address, uint8_t value, std::string_view action); + void addActualCycle(EightBit::register16_t address, uint8_t value, std::string_view action); void addActualReadCycle(EightBit::register16_t address, uint8_t value); void addActualWriteCycle(EightBit::register16_t address, uint8_t value);