zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-06-01 09:45:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding a global goto but it still doesn't work with rectangle shadows

Browse Source
This commit is contained in:
Anonymus Raccoon
2020-02-25 02:35:07 +01:00
parent 4437df4666
commit 298f02890e
11 changed files with 91 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Debugger/MemoryViewer.cpp
+27 -4
View File
@@ -9,6 +9,8 @@
#include "MemoryViewer.hpp"
#include "../SNES.hpp"
#include "../Utility/Utility.hpp"
#include "../Memory/MemoryShadow.hpp"
#include "../Exceptions/InvalidAddress.hpp"
MemoryViewerModel::MemoryViewerModel(std::shared_ptr<Ram> memory, QObject *parent) :
QAbstractTableModel(parent),
@@ -62,9 +64,10 @@ void MemoryViewerModel::setMemory(std::shared_ptr<Ram> memory)
namespace ComSquare::Debugger
{
MemoryViewer::MemoryViewer(ComSquare::SNES &snes) :
MemoryViewer::MemoryViewer(ComSquare::SNES &snes, Memory::MemoryBus &bus) :
QMainWindow(),
_snes(snes),
_bus(bus),
_ui(),
_model(snes.wram)
{
@@ -128,15 +131,35 @@ namespace ComSquare::Debugger
if (dialog.exec() != QDialog::Accepted)
return;
long value = std::strtol(dialogUI.spinBox->text().toStdString().c_str() + 1, nullptr, 16);
if (dialogUI.checkBox->isChecked())
this->switchToAddrTab(value);
if (dialogUI.checkBox->isChecked()) {
try {
value = this->switchToAddrTab(value);
} catch (InvalidAddress &) {}
}
QModelIndex index = this->_ui.tableView->model()->index(value >> 4, value & 0x0000000F);
this->_ui.tableView->scrollTo(index);
this->_ui.tableView->selectionModel()->select(index, QItemSelectionModel::ClearAndSelect);
}
void MemoryViewer::switchToAddrTab(uint24_t addr)
unsigned MemoryViewer::switchToAddrTab(uint24_t addr)
{
std::shared_ptr<Memory::IMemory> accessor = this->_bus.getAccessor(addr);
if (!accessor)
throw InvalidAddress("Memory viewer switch to address", addr);
Memory::IMemory *ptr;
if (accessor->isMirror())
ptr = accessor->getMirrored().get();
else
ptr = accessor.get();
if (ptr == this->_snes.wram.get())
this->_ui.tabs->setCurrentIndex(0);
else if (ptr == this->_snes.sram.get())
this->_ui.tabs->setCurrentIndex(1);
else if (ptr == this->_snes.cartridge.get())
this->_ui.tabs->setCurrentIndex(2);
else
throw InvalidAddress("Memory viewer switch to address", addr);
return addr - accessor->getStart();
}
}
sources/Debugger/MemoryViewer.hpp
+6 -2
View File
@@ -9,6 +9,7 @@
#include "../../ui/ui_ramView.h"
#include "../../ui/ui_gotoDialog.h"
#include "../Ram/Ram.hpp"
#include "../Memory/MemoryBus.hpp"
#include <memory>
using ComSquare::Ram::Ram;
@@ -52,6 +53,8 @@ namespace ComSquare
private:
//! @brief SNES containing all rams to view.
SNES &_snes;
//! @brief The memory bus used to get the view for a given address.
Memory::MemoryBus &_bus;
//! @brief The layout of the viewer.
Ui::RamView _ui;
//! @brief The Ram visualizer model for QT.
@@ -60,7 +63,8 @@ namespace ComSquare
void _internalGoto(bool isAbsolute);
public:
//! @brief Select the memory tab corresponding to a 24 bit address (map the address via the bus).
void switchToAddrTab(uint24_t addr);
//! @return The address converted to the new tab's locale space.
unsigned switchToAddrTab(uint24_t addr);
//! @brief Callback called when a memory tab is selected.
void changeRam(int id);
@@ -69,7 +73,7 @@ namespace ComSquare
//! @brief Create a popup asking you where you want to jump to with the absolute mode selected.
void gotoAbsoluteAddr();
explicit MemoryViewer(SNES &snes);
explicit MemoryViewer(SNES &snes, Memory::MemoryBus &bus);
MemoryViewer(const MemoryViewer &) = delete;
MemoryViewer &operator=(const MemoryViewer &) = delete;
~MemoryViewer() override = default;