Skip to content

Commit f4c7e1c

Browse files
committed
Enable TTD menu/widgets on Linux/macOS
1 parent 825f36b commit f4c7e1c

4 files changed

Lines changed: 11 additions & 15 deletions

File tree

core/adapters/esrevenadapter.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,8 +2279,6 @@ bool EsrevenAdapter::SupportFeature(DebugAdapterCapacity feature)
22792279
case DebugAdapterSupportTTD:
22802280
{
22812281
bool ttdSupported = m_canReverseContinue && m_canReverseStep;
2282-
LogInfo("SupportFeature(DebugAdapterSupportTTD): m_canReverseContinue=%d, m_canReverseStep=%d, returning %d",
2283-
m_canReverseContinue, m_canReverseStep, ttdSupported);
22842282
return ttdSupported;
22852283
}
22862284
default:

ui/controlswidget.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ void DebugControlsWidget::performLaunch()
278278
bool isLocalLaunch = true;
279279
auto adapter = m_controller->GetAdapterType();
280280
if ((adapter == "DBGENG_TTD") || (adapter == "LOCAL_WINDOWS_KERNEL") || (adapter == "WINDOWS_KERNEL") ||
281-
(adapter == "WINDOWS_DUMP_FILE") || (adapter == "Corellium") || (adapter == "GDB RSP"))
281+
(adapter == "WINDOWS_DUMP_FILE") || (adapter == "Corellium") || (adapter == "GDB RSP") ||
282+
(adapter == "esReven"))
282283
{
283284
isLocalLaunch = false;
284285
}

ui/ui.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
396396
return controller->IsConnected() && (!controller->IsRunning()) && controller->IsTTD();
397397
};
398398

399-
[[maybe_unused]] auto connectedToTTD = [=](const UIActionContext& ctxt) {
399+
auto connectedToTTD = [=](const UIActionContext& ctxt) {
400400
if (!ctxt.binaryView)
401401
return false;
402402
if (!DebuggerController::ControllerExists(ctxt.binaryView))
@@ -1303,12 +1303,13 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
13031303
UIAction(
13041304
[=](const UIActionContext& ctxt) { installTTD(ctxt); }));
13051305
debuggerMenu->addAction("Install WinDbg/TTD", "TTD");
1306+
#endif
13061307

13071308
// TTD Memory Access context menu items (Query All — opens sidebar with results)
13081309
UIAction::registerAction("TTD Memory Access\\Read");
13091310
context->globalActions()->bindAction("TTD Memory Access\\Read",
13101311
UIAction(
1311-
[=](const UIActionContext& ctxt) {
1312+
[=, this](const UIActionContext& ctxt) {
13121313
if (!ctxt.binaryView)
13131314
return;
13141315

@@ -1326,7 +1327,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
13261327
UIAction::registerAction("TTD Memory Access\\Write");
13271328
context->globalActions()->bindAction("TTD Memory Access\\Write",
13281329
UIAction(
1329-
[=](const UIActionContext& ctxt) {
1330+
[=, this](const UIActionContext& ctxt) {
13301331
if (!ctxt.binaryView)
13311332
return;
13321333

@@ -1344,7 +1345,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
13441345
UIAction::registerAction("TTD Memory Access\\Read/Write");
13451346
context->globalActions()->bindAction("TTD Memory Access\\Read/Write",
13461347
UIAction(
1347-
[=](const UIActionContext& ctxt) {
1348+
[=, this](const UIActionContext& ctxt) {
13481349
if (!ctxt.binaryView)
13491350
return;
13501351

@@ -1362,7 +1363,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
13621363
UIAction::registerAction("TTD Memory Access\\Execute");
13631364
context->globalActions()->bindAction("TTD Memory Access\\Execute",
13641365
UIAction(
1365-
[=](const UIActionContext& ctxt) {
1366+
[=, this](const UIActionContext& ctxt) {
13661367
if (!ctxt.binaryView)
13671368
return;
13681369

@@ -1380,7 +1381,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
13801381
UIAction::registerAction("TTD Memory Access\\Read/Write/Execute");
13811382
context->globalActions()->bindAction("TTD Memory Access\\Read/Write/Execute",
13821383
UIAction(
1383-
[=](const UIActionContext& ctxt) {
1384+
[=, this](const UIActionContext& ctxt) {
13841385
if (!ctxt.binaryView)
13851386
return;
13861387

@@ -1399,7 +1400,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
13991400
UIAction::registerAction("TTD Memory Access (Next/Prev)");
14001401
context->globalActions()->bindAction("TTD Memory Access (Next/Prev)",
14011402
UIAction(
1402-
[=](const UIActionContext& ctxt) {
1403+
[=, this](const UIActionContext& ctxt) {
14031404
if (!ctxt.binaryView)
14041405
return;
14051406

@@ -1416,7 +1417,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
14161417

14171418
// TTD Calls menu actions
14181419
UIAction::registerAction("TTD Calls\\Kernel32 Calls");
1419-
context->globalActions()->bindAction("TTD Calls\\Kernel32 Calls", UIAction([=](const UIActionContext& ctxt) {
1420+
context->globalActions()->bindAction("TTD Calls\\Kernel32 Calls", UIAction([=, this](const UIActionContext& ctxt) {
14201421
auto controller = DebuggerController::GetController(ctxt.binaryView);
14211422
if (!controller || !controller->IsConnected())
14221423
return;
@@ -1567,8 +1568,6 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
15671568
return controller->CanTTDNavigateForward();
15681569
}));
15691570
debuggerMenu->addAction("TTD Navigate Forward", "TTD");
1570-
1571-
#endif
15721571
}
15731572

15741573

ui/uinotification.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ void NotificationListener::OnContextMenuCreated(UIContext *context, View* view,
192192
menu.addAction("Debugger", "Create Stack View", "Misc");
193193
menu.addAction("Debugger", "Override IP", "Misc");
194194
menu.addAction("Debugger", "Rebase to Remote Base...", "Misc");
195-
#ifdef WIN32
196195
// TTD Memory Access context menu items
197196
menu.addAction("Debugger", "Navigate to TTD Timestamp...", "TTD");
198197
menu.addAction("Debugger", "Add TTD Bookmark...", "TTD");
@@ -205,5 +204,4 @@ void NotificationListener::OnContextMenuCreated(UIContext *context, View* view,
205204
menu.addAction("Debugger", "TTD Memory Access (Next/Prev)", "TTD");
206205
// TTD Calls context menu item
207206
menu.addAction("Debugger", "TTD Calls\\Kernel32 Calls", "TTD");
208-
#endif
209207
}

0 commit comments

Comments
 (0)