zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-05-23 14:58:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Making the internal logger work

Browse Source
This commit is contained in:
Anonymus Raccoon
2020-03-24 02:56:46 +01:00
parent 95f17c06a8
commit 51ddb1f1cb
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Debugger/MemoryBusDebug.cpp
+27 -2
View File
@@ -5,6 +5,8 @@
#include "MemoryBusDebug.hpp"
#include "../SNES.hpp"
#include "../Utility/Utility.hpp"
#include "../Exceptions/InvalidAction.hpp"
#include "../Exceptions/InvalidAddress.hpp"
namespace ComSquare::Debugger
{
@@ -46,13 +48,29 @@ namespace ComSquare::Debugger
uint8_t MemoryBusDebug::read(uint24_t addr)
{
auto accessor = this->getAccessor(addr);
uint8_t value = accessor->read(addr - accessor->getStart());
this->_model.log(BusLog(false, addr, accessor, value, value));
return MemoryBus::read(addr);
}
void MemoryBusDebug::write(uint24_t addr, uint8_t data)
{
auto accessor = this->getAccessor(addr);
uint8_t value;
try {
value = accessor->read(addr - accessor->getStart());
} catch (InvalidAddress &) {
value = 0;
}
this->_model.log(BusLog(true, addr, accessor, value, data));
MemoryBus::write(addr, data);
}
BusLog::BusLog(bool write, uint24_t addr, std::shared_ptr<Memory::AMemory> &accessor, uint8_t oldData, uint8_t newData) :
write(write), addr(addr), accessor(accessor), oldData(oldData), newData(newData)
{}
}
int BusLogModel::rowCount(const QModelIndex &) const
@@ -78,9 +96,9 @@ QVariant BusLogModel::data(const QModelIndex &index, int role) const
case 1:
return QString(ComSquare::Utility::to_hex(log.addr).c_str());
case 2:
return QString(log.accessor.getName().c_str());
return QString(log.accessor->getName().c_str());
case 3:
return QString(log.accessor.getValueName(log.addr - log.accessor.getStart()).c_str());
return QString(log.accessor->getValueName(log.addr - log.accessor->getStart()).c_str());
case 4:
return QString(ComSquare::Utility::to_hex(log.oldData).c_str());
case 5:
@@ -111,3 +129,10 @@ QVariant BusLogModel::headerData(int section, Qt::Orientation orientation, int r
return QString("");
}
}
void BusLogModel::log(ComSquare::Debugger::BusLog log)
{
this->_logs.push_back(log);
this->insertRow(this->_logs.size());
// The row may be inserted but items are not displayed.
}
sources/Debugger/MemoryBusDebug.hpp
+6 -4
View File
@@ -14,9 +14,11 @@ namespace ComSquare::Debugger
{
//! @brief The struct used to represent memory bus logs.
struct BusLog {
BusLog(bool write, uint24_t addr, std::shared_ptr<Memory::AMemory> &accessor, uint8_t oldData, uint8_t newData);
bool write;
uint24_t addr;
Memory::AMemory &accessor;
std::shared_ptr<Memory::AMemory> &accessor;
uint8_t oldData;
uint8_t newData;
};
@@ -36,6 +38,9 @@ public:
const BusLogModel &operator=(const BusLogModel &) = delete;
~BusLogModel() override = default;
//! @brief Add a log to the model
void log(ComSquare::Debugger::BusLog log);
//! @brief The number of row the table has.
int rowCount(const QModelIndex &parent) const override;
//! @brief The number of column the table has.
@@ -60,9 +65,6 @@ namespace ComSquare::Debugger
Ui::BusView _ui;
//! @brief The Log visualizer model for QT.
BusLogModel _model;
//! @brief Log a read/write to the debugger.
// void log()
public:
//! @brief Called when the window is closed. Turn off the debugger and revert to a basic CPU.
void disableViewer();