6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2024-06-03 05:29:43 +00:00
Code Issues Projects Releases Wiki Activity

If I've bothered to try and implement the failing test, show the actual and expected events.

Browse Source 
Signed-off-by: Adrian Conlon <adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2021-10-11 23:56:20 +01:00
parent 77a2c08c20
commit 31c3a57485
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
M6502/HarteTest_6502/TestRunner.cpp
View File

@ -29,6 +29,27 @@ void TestRunner::addActualEvent(test_t::action action, uint16_t address, uint8_t
m_actualEvents.push_back( { address, value, action } );
}
void TestRunner::dumpEvents(std::string which, const test_t::events_t& events) {
m_messages.push_back(which);
dumpEvents(events);
}
void TestRunner::dumpEvents(const test_t::events_t& events) {
os() << std::hex << std::uppercase << std::setfill('0');
for (const auto& event: events)
dumpEvent(event);
}
void TestRunner::dumpEvent(const test_t::event_t& event) {
const auto [address, contents, action] = event;
os()
<< "Address: " << std::setw(4) << address
<< ", contents: " << std::setw(2) << (int)contents
<< ", action: " << test_t::to_string(action);
m_messages.push_back(os().str());
os().str("");
}
void TestRunner::initialise() {
ReadByte.connect([this](EightBit::EventArgs&) {
@ -148,12 +169,21 @@ bool TestRunner::check() {
const int cycles = CPU().step();
const auto valid = checkState();
if (m_event_count_mismatch) {
std::ostringstream os;
os
<< "Stepped cycles: " << cycles
<< ", expected events: " << test().cycles().size()
<< ", actual events: " << m_actualEvents.size();
m_messages.push_back(os.str());
if (cycles == 1) {
m_messages.push_back("Unimplemented");
} else {
os()
<< std::dec << std::setfill(' ')
<< "Stepped cycles: " << cycles
<< ", expected events: " << test().cycles().size()
<< ", actual events: " << m_actualEvents.size();
m_messages.push_back(os().str());
os().str("");
dumpEvents("-- Expected cycles", test().cycles());
dumpEvents("-- Actual cycles", m_actualEvents);
}
}
lowerPOWER();
return valid;

4
M6502/HarteTest_6502/TestRunner.h
View File

@ -43,6 +43,10 @@ private:
void addActualEvent(test_t::action action, uint16_t address, uint8_t value);
void dumpEvents(std::string which, const test_t::events_t& events);
void dumpEvents(const test_t::events_t& events);
void dumpEvent(const test_t::event_t& event);
[[nodiscard]] auto& os() { return m_os; }
protected: