doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for flash memory inspection

Browse Source
This commit is contained in:
Nav
2023-05-03 23:13:22 +01:00
parent da5db96f11
commit eca86fcb1a
18 changed files with 316 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp
View File

@@ -152,6 +152,7 @@ namespace Bloom
this->ramInspectionButton = this->container->findChild<QToolButton*>("ram-inspection-btn");
this->eepromInspectionButton = this->container->findChild<QToolButton*>("eeprom-inspection-btn");
this->flashInspectionButton = this->container->findChild<QToolButton*>("flash-inspection-btn");
this->footer = this->windowContainer->findChild<QWidget*>("footer");
this->targetStatusLabel = this->footer->findChild<Label*>("target-state");
@@ -247,6 +248,12 @@ namespace Bloom
this,
&InsightWindow::toggleEepromInspectionPane
);
QObject::connect(
this->flashInspectionButton,
&QToolButton::clicked,
this,
&InsightWindow::toggleFlashInspectionPane
);
// InsightSignal connections
auto* insightSignals = InsightSignals::instance();
@@ -609,9 +616,9 @@ namespace Bloom
// Target memory inspection panes
auto* bottomPanelLayout = this->bottomPanel->layout();
// We only support inspection of RAM and EEPROM, for now.
const auto ramDescriptorIt = this->targetDescriptor.memoryDescriptorsByType.find(TargetMemoryType::RAM);
const auto eepromDescriptorIt = this->targetDescriptor.memoryDescriptorsByType.find(TargetMemoryType::EEPROM);
const auto flashDescriptorIt = this->targetDescriptor.memoryDescriptorsByType.find(TargetMemoryType::FLASH);
if (ramDescriptorIt != this->targetDescriptor.memoryDescriptorsByType.end()) {
if (!this->insightProjectSettings.ramInspectionPaneState.has_value()) {
@@ -694,6 +701,47 @@ namespace Bloom
this->eepromInspectionButton->setDisabled(false);
this->onEepromInspectionPaneStateChanged();
}
if (flashDescriptorIt != this->targetDescriptor.memoryDescriptorsByType.end()) {
if (!this->insightProjectSettings.flashInspectionPaneState.has_value()) {
this->insightProjectSettings.flashInspectionPaneState = PaneState(false, true, std::nullopt);
}
if (!memoryInspectionPaneSettingsByMemoryType.contains(TargetMemoryType::FLASH)) {
memoryInspectionPaneSettingsByMemoryType[TargetMemoryType::FLASH] = TargetMemoryInspectionPaneSettings();
}
this->flashInspectionPane = new TargetMemoryInspectionPane(
flashDescriptorIt->second,
memoryInspectionPaneSettingsByMemoryType[TargetMemoryType::FLASH],
*(this->insightProjectSettings.flashInspectionPaneState),
this->bottomPanel
);
bottomPanelLayout->addWidget(this->flashInspectionPane);
QObject::connect(
this->flashInspectionPane,
&PaneWidget::paneActivated,
this,
&InsightWindow::onFlashInspectionPaneStateChanged
);
QObject::connect(
this->flashInspectionPane,
&PaneWidget::paneDeactivated,
this,
&InsightWindow::onFlashInspectionPaneStateChanged
);
QObject::connect(
this->flashInspectionPane,
&PaneWidget::paneAttached,
this,
&InsightWindow::onFlashInspectionPaneStateChanged
);
this->flashInspectionButton->setDisabled(false);
this->onFlashInspectionPaneStateChanged();
}
}
void InsightWindow::destroyPanes() {
@@ -1001,19 +1049,28 @@ namespace Bloom
}
this->ramInspectionPane->deactivate();
return;
}
} else {
if (this->ramInspectionPane->state.attached) {
if (
this->ramInspectionPane->state.attached
&& this->eepromInspectionPane != nullptr
this->eepromInspectionPane != nullptr
&& this->eepromInspectionPane->state.activated
&& this->eepromInspectionPane->state.attached
) {
this->eepromInspectionPane->deactivate();
}
this->ramInspectionPane->activate();
if (
this->flashInspectionPane != nullptr
&& this->flashInspectionPane->state.activated
&& this->flashInspectionPane->state.attached
) {
this->flashInspectionPane->deactivate();
}
}
this->ramInspectionPane->activate();
}
void InsightWindow::toggleEepromInspectionPane() {
@@ -1026,19 +1083,62 @@ namespace Bloom
}
this->eepromInspectionPane->deactivate();
return;
}
} else {
if (this->eepromInspectionPane->state.attached) {
if (
this->eepromInspectionPane->state.attached
&& this->ramInspectionPane != nullptr
this->ramInspectionPane != nullptr
&& this->ramInspectionPane->state.activated
&& this->ramInspectionPane->state.attached
) {
this->ramInspectionPane->deactivate();
}
this->eepromInspectionPane->activate();
if (
this->flashInspectionPane != nullptr
&& this->flashInspectionPane->state.activated
&& this->flashInspectionPane->state.attached
) {
this->flashInspectionPane->deactivate();
}
}
this->eepromInspectionPane->activate();
}
void InsightWindow::toggleFlashInspectionPane() {
if (this->flashInspectionPane->state.activated) {
if (!this->flashInspectionPane->state.attached) {
this->flashInspectionPane->activateWindow();
this->flashInspectionButton->setChecked(true);
return;
}
this->flashInspectionPane->deactivate();
return;
}
if (this->flashInspectionPane->state.attached) {
if (
this->ramInspectionPane != nullptr
&& this->ramInspectionPane->state.activated
&& this->ramInspectionPane->state.attached
) {
this->ramInspectionPane->deactivate();
}
if (
this->eepromInspectionPane != nullptr
&& this->eepromInspectionPane->state.activated
&& this->eepromInspectionPane->state.attached
) {
this->eepromInspectionPane->deactivate();
}
}
this->flashInspectionPane->activate();
}
void InsightWindow::onRegistersPaneStateChanged() {
@@ -1052,30 +1152,67 @@ namespace Bloom
void InsightWindow::onRamInspectionPaneStateChanged() {
this->ramInspectionButton->setChecked(this->ramInspectionPane->state.activated);
if (
this->ramInspectionPane->state.activated
&& this->ramInspectionPane->state.attached
&& this->eepromInspectionPane != nullptr
&& this->eepromInspectionPane->state.activated
&& this->eepromInspectionPane->state.attached
) {
// Both panes cannot be attached and activated at the same time.
this->eepromInspectionPane->deactivate();
if (this->ramInspectionPane->state.activated && this->ramInspectionPane->state.attached) {
if (
this->eepromInspectionPane != nullptr
&& this->eepromInspectionPane->state.activated
&& this->eepromInspectionPane->state.attached
) {
this->eepromInspectionPane->deactivate();
}
if (
this->flashInspectionPane != nullptr
&& this->flashInspectionPane->state.activated
&& this->flashInspectionPane->state.attached
) {
this->flashInspectionPane->deactivate();
}
}
}
void InsightWindow::onEepromInspectionPaneStateChanged() {
this->eepromInspectionButton->setChecked(this->eepromInspectionPane->state.activated);
if (
this->eepromInspectionPane->state.activated
&& this->eepromInspectionPane->state.attached
&& this->ramInspectionPane != nullptr
&& this->ramInspectionPane->state.activated
&& this->ramInspectionPane->state.attached
) {
// Both panes cannot be attached and activated at the same time.
this->ramInspectionPane->deactivate();
if (this->eepromInspectionPane->state.activated && this->eepromInspectionPane->state.attached) {
if (
this->ramInspectionPane != nullptr
&& this->ramInspectionPane->state.activated
&& this->ramInspectionPane->state.attached
) {
this->ramInspectionPane->deactivate();
}
if (
this->flashInspectionPane != nullptr
&& this->flashInspectionPane->state.activated
&& this->flashInspectionPane->state.attached
) {
this->flashInspectionPane->deactivate();
}
}
}
void InsightWindow::onFlashInspectionPaneStateChanged() {
this->flashInspectionButton->setChecked(this->flashInspectionPane->state.activated);
if (this->flashInspectionPane->state.activated && this->flashInspectionPane->state.attached) {
if (
this->ramInspectionPane != nullptr
&& this->ramInspectionPane->state.activated
&& this->ramInspectionPane->state.attached
) {
this->ramInspectionPane->deactivate();
}
if (
this->eepromInspectionPane != nullptr
&& this->eepromInspectionPane->state.activated
&& this->eepromInspectionPane->state.attached
) {
this->eepromInspectionPane->deactivate();
}
}
}

4
src/Insight/UserInterfaces/InsightWindow/InsightWindow.hpp
View File

@@ -93,12 +93,14 @@ namespace Bloom
Widgets::PanelWidget* bottomPanel = nullptr;
Widgets::TargetMemoryInspectionPane* ramInspectionPane = nullptr;
Widgets::TargetMemoryInspectionPane* eepromInspectionPane = nullptr;
Widgets::TargetMemoryInspectionPane* flashInspectionPane = nullptr;
std::map<
Targets::TargetMemoryType,
Widgets::TargetMemoryInspectionPaneSettings
> memoryInspectionPaneSettingsByMemoryType;
QToolButton* ramInspectionButton = nullptr;
QToolButton* eepromInspectionButton = nullptr;
QToolButton* flashInspectionButton = nullptr;
QWidget* footer = nullptr;
Widgets::Label* targetStatusLabel = nullptr;
@@ -137,9 +139,11 @@ namespace Bloom
void toggleTargetRegistersPane();
void toggleRamInspectionPane();
void toggleEepromInspectionPane();
void toggleFlashInspectionPane();
void onRegistersPaneStateChanged();
void onRamInspectionPaneStateChanged();
void onEepromInspectionPaneStateChanged();
void onFlashInspectionPaneStateChanged();
void onProgrammingModeEnabled();
void onProgrammingModeDisabled();
};

13
src/Insight/UserInterfaces/InsightWindow/Stylesheets/InsightWindow.qss
View File

@@ -211,7 +211,8 @@ QScrollBar::sub-line:vertical {
}
#bottom-menu-bar #ram-inspection-btn,
#bottom-menu-bar #eeprom-inspection-btn {
#bottom-menu-bar #eeprom-inspection-btn,
#bottom-menu-bar #flash-inspection-btn {
position: relative;
border: none;
min-height: 22px;
@@ -225,14 +226,20 @@ QScrollBar::sub-line:vertical {
min-width: 99px;
}
#bottom-menu-bar #flash-inspection-btn {
min-width: 85px;
}
#bottom-menu-bar #ram-inspection-btn #ram-inspection-btn-icon,
#bottom-menu-bar #eeprom-inspection-btn #eeprom-inspection-btn-icon {
#bottom-menu-bar #eeprom-inspection-btn #eeprom-inspection-btn-icon,
#bottom-menu-bar #flash-inspection-btn #flash-inspection-btn-icon {
margin-left: 6px;
margin-top: 1px;
}
#bottom-menu-bar #ram-inspection-btn #ram-inspection-btn-label,
#bottom-menu-bar #eeprom-inspection-btn #eeprom-inspection-btn-label {
#bottom-menu-bar #eeprom-inspection-btn #eeprom-inspection-btn-label,
#bottom-menu-bar #flash-inspection-btn #flash-inspection-btn-label {
color: #999a9d;
margin-left: 5px;
}

51
src/Insight/UserInterfaces/InsightWindow/UiFiles/InsightWindow.ui
View File

@@ -352,6 +352,57 @@
</layout>
</widget>
</item>
<item>
<widget class="QToolButton" name="flash-inspection-btn">
<property name="toolTip">
<string>Inspect FLASH</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="disabled">
<bool>false</bool>
</property>
<layout class="QHBoxLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item alignment="Qt::AlignLeft">
<widget class="SvgWidget" name="flash-inspection-btn-icon">
<property name="containerHeight">
<number>22</number>
</property>
<property name="containerWidth">
<number>26</number>
</property>
<property name="svgFilePath">
<string>:/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon.svg</string>
</property>
<property name="disabledSvgFilePath">
<string>:/compiled/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/Images/memory-inspection-icon-disabled.svg</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignLeft">
<widget class="Label" name="flash-inspection-btn-label">
<property name="text">
<string>FLASH</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignLeft">
<spacer name="horizontal-spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="horizontal-spacer">
<property name="orientation">

4
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/MemoryRegionManager/MemoryRegionManagerWindow.cpp
View File

@@ -8,6 +8,7 @@
#include "src/Insight/UserInterfaces/InsightWindow/Widgets/ErrorDialogue/ErrorDialogue.hpp"
#include "src/Services/PathService.hpp"
#include "src/Helpers/EnumToStringMappings.hpp"
#include "src/Exceptions/Exception.hpp"
namespace Bloom::Widgets
@@ -28,8 +29,7 @@ namespace Bloom::Widgets
this->setWindowFlag(Qt::Window);
this->setObjectName("memory-region-manager-window");
this->setWindowTitle(
"Memory Regions - "
+ QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM")
"Memory Regions - " + EnumToStringMappings::targetMemoryTypes.at(this->memoryDescriptor.type).toUpper()
);
auto windowUiFile = QFile(

3
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/CreateSnapshotWindow/CreateSnapshotWindow.cpp
View File

@@ -9,6 +9,7 @@
#include "src/Insight/InsightSignals.hpp"
#include "src/Services/PathService.hpp"
#include "src/Helpers/EnumToStringMappings.hpp"
#include "src/Exceptions/Exception.hpp"
namespace Bloom::Widgets
@@ -28,7 +29,7 @@ namespace Bloom::Widgets
this->setWindowFlag(Qt::Window);
this->setObjectName("create-snapshot-window");
this->setWindowTitle(
"New Snapshot - " + QString(memoryType == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM")
"New Snapshot - " + EnumToStringMappings::targetMemoryTypes.at(memoryType).toUpper()
);
auto windowUiFile = QFile(

11
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotDiff/SnapshotDiff.cpp
View File

@@ -12,6 +12,7 @@
#include "src/Insight/UserInterfaces/InsightWindow/Widgets/ConfirmationDialog.hpp"
#include "src/Services/PathService.hpp"
#include "src/Helpers/EnumToStringMappings.hpp"
#include "src/Exceptions/Exception.hpp"
#include "src/Insight/InsightSignals.hpp"
@@ -81,7 +82,13 @@ namespace Bloom::Widgets
this->dataASecondaryLabel->setText(snapshotA.createdDate.toString("dd/MM/yyyy hh:mm"));
this->dataBSecondaryLabel->setVisible(false);
this->restoreBytesAction = new ContextMenuAction("Restore Selection", std::nullopt, this);
this->restoreBytesAction = new ContextMenuAction(
"Restore Selection",
[this] (const std::unordered_map<Targets::TargetMemoryAddress, ByteItem*>&) {
return this->memoryDescriptor.access.writeableDuringDebugSession;
},
this
);
QObject::connect(
this->restoreBytesAction,
@@ -329,7 +336,7 @@ namespace Bloom::Widgets
"Restore selected bytes",
"This operation will write " + QString::number(sortedByteItemsByAddress.size())
+ " byte(s) to the target's "
+ QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM")
+ EnumToStringMappings::targetMemoryTypes.at(this->memoryDescriptor.type).toUpper()
+ ".<br/><br/>Are you sure you want to proceed?",
"Proceed",
std::nullopt,

9
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotManager.cpp
View File

@@ -14,6 +14,7 @@
#include "src/Insight/InsightWorker/InsightWorker.hpp"
#include "src/Services/PathService.hpp"
#include "src/Helpers/EnumToStringMappings.hpp"
#include "src/Exceptions/Exception.hpp"
#include "src/Logger/Logger.hpp"
@@ -495,8 +496,8 @@ namespace Bloom::Widgets
auto* confirmationDialog = new ConfirmationDialog(
"Restore snapshot",
"This operation will overwrite the entire address range of the target's "
+ QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM")
+ " with the contents of the selected snapshot.<br/><br/>Are you sure you want to proceed?",
+ EnumToStringMappings::targetMemoryTypes.at(this->memoryDescriptor.type).toUpper()
+ " with the contents of the selected snapshot.<br/><br/>Are you sure you want to proceed?",
"Proceed",
std::nullopt,
this
@@ -611,7 +612,9 @@ namespace Bloom::Widgets
&& this->data.has_value()
);
this->restoreSnapshotAction->setEnabled(
this->selectedSnapshotItems.size() == 1 && this->targetState == Targets::TargetState::STOPPED
this->memoryDescriptor.access.writeableDuringDebugSession
&& this->selectedSnapshotItems.size() == 1
&& this->targetState == Targets::TargetState::STOPPED
);
menu->exec(sourcePosition);

11
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/SnapshotManager/SnapshotViewer/SnapshotViewer.cpp
View File

@@ -17,6 +17,7 @@
#include "src/Insight/UserInterfaces/InsightWindow/Widgets/ConfirmationDialog.hpp"
#include "src/Services/PathService.hpp"
#include "src/Helpers/EnumToStringMappings.hpp"
#include "src/Exceptions/Exception.hpp"
#include "src/Insight/InsightSignals.hpp"
@@ -123,7 +124,13 @@ namespace Bloom::Widgets
memoryRegionsLayout->insertWidget(0, this->memoryRegionListView);
}
this->restoreBytesAction = new ContextMenuAction("Restore Selection", std::nullopt, this);
this->restoreBytesAction = new ContextMenuAction(
"Restore Selection",
[this] (const std::unordered_map<Targets::TargetMemoryAddress, ByteItem*>&) {
return this->memoryDescriptor.access.writeableDuringDebugSession;
},
this
);
this->hexViewerWidget = new HexViewerWidget(
this->memoryDescriptor,
@@ -214,7 +221,7 @@ namespace Bloom::Widgets
"Restore selected bytes",
"This operation will write " + QString::number(sortedByteItemsByAddress.size())
+ " byte(s) to the target's "
+ QString(this->memoryDescriptor.type == Targets::TargetMemoryType::EEPROM ? "EEPROM" : "RAM")
+ EnumToStringMappings::targetMemoryTypes.at(this->memoryDescriptor.type).toUpper()
+ ".<br/><br/>Are you sure you want to proceed?",
"Proceed",
std::nullopt,

9
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp
View File

@@ -13,6 +13,7 @@
#include "src/Insight/InsightWorker/Tasks/ReadStackPointer.hpp"
#include "src/Services/PathService.hpp"
#include "src/Helpers/EnumToStringMappings.hpp"
#include "src/Exceptions/Exception.hpp"
namespace Bloom::Widgets
@@ -35,11 +36,9 @@ namespace Bloom::Widgets
{
this->setObjectName("target-memory-inspection-pane");
const auto memoryName = QString(
this->targetMemoryDescriptor.type == TargetMemoryType::EEPROM
? "Internal EEPROM"
: "Internal RAM"
);
const auto memoryName = "Internal " + EnumToStringMappings::targetMemoryTypes.at(
this->targetMemoryDescriptor.type
).toUpper();
this->setWindowTitle("Memory Inspection - " + memoryName);
this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);