Skip to content

Remember the last checked access types in the TTD next/prev memory access dialog (Fixes #1109) #1147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xusheng6 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Remember the last checked access types in the TTD next/prev memory access dialog (Fixes #1109) #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions ui/ttdmemorywidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ limitations under the License.
#include <QToolButton>
#include <QPropertyAnimation>
#include <QFrame>
#include <QSettings>
#include <map>

// ColumnVisibilityDialog implementation
Expand Down Expand Up @@ -1131,6 +1132,12 @@ void TTDMemorySidebarWidget::setParametersAndQueryInNewTab(uint64_t startAddr, u


// TTDMemoryAccessNextPrevDialog implementation

// The access types the user last checked, remembered so the dialog reopens with the same selection.
// An unset/zero value means the user has not picked anything yet, in which case the selection is
// guessed from the address.
constexpr auto TTDMemoryAccessTypesKey = "ui/debugger/ttd/memoryAccessTypes";

TTDMemoryAccessNextPrevDialog::TTDMemoryAccessNextPrevDialog(QWidget* parent, BinaryViewRef data, uint64_t startAddr, uint64_t endAddr)
: QDialog(parent), m_data(data)
{
Expand All @@ -1157,16 +1164,31 @@ TTDMemoryAccessNextPrevDialog::TTDMemoryAccessNextPrevDialog(QWidget* parent, Bi
addressLayout->addWidget(m_endAddressEdit);
inputLayout->addRow("Address Range:", addressLayout);

// Access type checkboxes — default to X if address is in a function, otherwise RW
bool hasFunction = m_data && !m_data->GetAnalysisFunctionsContainingAddress(startAddr).empty();
// Access type checkboxes — restore the last selection the user made; if there is none,
// default to X if the address is in a function, otherwise RW
auto savedAccessType = QSettings().value(TTDMemoryAccessTypesKey, 0).toUInt();
auto defaultAccessType = static_cast<TTDMemoryAccessType>(
savedAccessType & (TTDMemoryRead | TTDMemoryWrite | TTDMemoryExecute));
if (defaultAccessType == 0)
{
bool hasFunction = m_data && !m_data->GetAnalysisFunctionsContainingAddress(startAddr).empty();
defaultAccessType = hasFunction ? TTDMemoryExecute
: static_cast<TTDMemoryAccessType>(TTDMemoryRead | TTDMemoryWrite);
}

QHBoxLayout* accessLayout = new QHBoxLayout();
m_readAccessCheck = new QCheckBox("Read");
m_readAccessCheck->setChecked(!hasFunction);
m_readAccessCheck->setChecked(defaultAccessType & TTDMemoryRead);
m_writeAccessCheck = new QCheckBox("Write");
m_writeAccessCheck->setChecked(!hasFunction);
m_writeAccessCheck->setChecked(defaultAccessType & TTDMemoryWrite);
m_executeAccessCheck = new QCheckBox("Execute");
m_executeAccessCheck->setChecked(hasFunction);
m_executeAccessCheck->setChecked(defaultAccessType & TTDMemoryExecute);

// Remember the selection as soon as it changes, so it survives closing the dialog
connect(m_readAccessCheck, &QCheckBox::toggled, this, &TTDMemoryAccessNextPrevDialog::saveAccessTypes);
connect(m_writeAccessCheck, &QCheckBox::toggled, this, &TTDMemoryAccessNextPrevDialog::saveAccessTypes);
connect(m_executeAccessCheck, &QCheckBox::toggled, this, &TTDMemoryAccessNextPrevDialog::saveAccessTypes);

accessLayout->addWidget(m_readAccessCheck);
accessLayout->addWidget(m_writeAccessCheck);
accessLayout->addWidget(m_executeAccessCheck);
Expand Down Expand Up @@ -1218,6 +1240,15 @@ TTDMemoryAccessType TTDMemoryAccessNextPrevDialog::getSelectedAccessTypes()
return accessType;
}

void TTDMemoryAccessNextPrevDialog::saveAccessTypes()
{
// Do not remember an empty selection, it would cause the next dialog to fall back to the
// address-based default rather than to what the user actually picked
TTDMemoryAccessType accessType = getSelectedAccessTypes();
if (accessType != 0)
QSettings().setValue(TTDMemoryAccessTypesKey, static_cast<uint32_t>(accessType));
}

void TTDMemoryAccessNextPrevDialog::findNext()
{
if (!m_controller || !m_controller->IsTTD())
Expand Down
1 change: 1 addition & 0 deletions ui/ttdmemorywidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ class TTDMemoryAccessNextPrevDialog : public QDialog
private Q_SLOTS:
void findNext();
void findPrev();
void saveAccessTypes();
};


Expand Down