Various fixes for TTD.Memory and TTD.Calls

Author: xusheng6

core/adapters/dbgengttdadapter.h

@@ -47,7 +47,7 @@ namespace BinaryNinjaDebugger {
 		bool Quit() override;
 
 		// TTD Memory Analysis Methods
-		std::vector<TTDMemoryEvent> GetMemoryAccessForAddress(uint64_t startAddress, uint64_t endAddress, TTDMemoryAccessType accessType = TTDMemoryRead) override;
+		std::vector<TTDMemoryEvent> GetTTDMemoryAccessForAddress(uint64_t startAddress, uint64_t endAddress, TTDMemoryAccessType accessType = TTDMemoryRead) override;
 		TTDPosition GetCurrentTTDPosition() override;
 		bool SetTTDPosition(const TTDPosition& position) override;
 

core/debugadapter.cpp

@@ -179,7 +179,7 @@ Ref<Settings> DebugAdapter::GetAdapterSettings()
 
 
 // TTD (Time Travel Debugging) default implementations
-std::vector<TTDMemoryEvent> DebugAdapter::GetMemoryAccessForAddress(uint64_t startAddress, uint64_t endAddress, TTDMemoryAccessType accessType)
+std::vector<TTDMemoryEvent> DebugAdapter::GetTTDMemoryAccessForAddress(uint64_t startAddress, uint64_t endAddress, TTDMemoryAccessType accessType)
 {
 	// Default implementation returns empty results for adapters that don't support TTD
 	return {};

core/debugadapter.h

@@ -309,11 +309,6 @@ namespace BinaryNinjaDebugger {
 
 		virtual bool SupportFeature(DebugAdapterCapacity feature) = 0;
 
-		// TTD (Time Travel Debugging) methods - provide default implementations that return empty results
-		virtual std::vector<TTDMemoryEvent> GetMemoryAccessForAddress(uint64_t startAddress, uint64_t endAddress, TTDMemoryAccessType accessType = TTDMemoryRead);
-		virtual TTDPosition GetCurrentTTDPosition();
-		virtual bool SetTTDPosition(const TTDPosition& position);
-
 		// This is implemented by the (base) DebugAdapter class.
 		// Sub-classes should use it to post debugger events directly (only when needed).
 		void PostDebuggerEvent(const DebuggerEvent& event);

core/debuggercontroller.cpp

@@ -2824,7 +2824,7 @@ std::vector<TTDMemoryEvent> DebuggerController::GetTTDMemoryAccessForAddress(uin
 
 	if (m_adapter)
 	{
-		events = m_adapter->GetMemoryAccessForAddress(startAddress, endAddress, accessType);
+		events = m_adapter->GetTTDMemoryAccessForAddress(startAddress, endAddress, accessType);
 	}
 
 	return events;

ui/ttdcallswidget.cpp

@@ -322,10 +322,8 @@ void TTDCallsQueryWidget::onCellDoubleClicked(int row, int column)
 	// Handle double-click events - navigate to addresses or time travel
 	if (row < 0 || row >= m_resultsTable->rowCount())
 		return;
-	
-	LogicalColumn logicalCol = getLogicalColumnFromVisual(column);
-	
-	if (logicalCol == TimeStartColumn || logicalCol == TimeEndColumn)
+
+	if (column == TimeStartColumn || column == TimeEndColumn)
 	{
 		// Handle time travel for both time start and time end columns
 		QTableWidgetItem* timeItem = m_resultsTable->item(row, column);
@@ -349,25 +347,20 @@ void TTDCallsQueryWidget::onCellDoubleClicked(int row, int column)
 					TTDPosition pos(sequence, step);
 					if (m_controller->SetTTDPosition(pos))
 					{
-						// After time traveling, navigate to the function address
-						int functionAddrVisualColumn = getVisualColumnFromLogical(FunctionAddressColumn);
-						if (functionAddrVisualColumn >= 0)
+						QTableWidgetItem* funcAddrItem = m_resultsTable->item(row, FunctionAddressColumn);
+						if (funcAddrItem && m_data)
 						{
-							QTableWidgetItem* funcAddrItem = m_resultsTable->item(row, functionAddrVisualColumn);
-							if (funcAddrItem && m_data)
+							QString funcAddrStr = funcAddrItem->text();
+							if (funcAddrStr.startsWith("0x", Qt::CaseInsensitive))
 							{
-								QString funcAddrStr = funcAddrItem->text();
-								if (funcAddrStr.startsWith("0x", Qt::CaseInsensitive))
+								bool ok;
+								uint64_t funcAddress = funcAddrStr.mid(2).toULongLong(&ok, 16);
+								if (ok)
 								{
-									bool ok;
-									uint64_t funcAddress = funcAddrStr.mid(2).toULongLong(&ok, 16);
-									if (ok)
+									ViewFrame* frame = ViewFrame::viewFrameForWidget(this);
+									if (frame)
 									{
-										ViewFrame* frame = ViewFrame::viewFrameForWidget(this);
-										if (frame)
-										{
-											frame->navigate(m_data, funcAddress);
-										}
+										frame->navigate(m_data, funcAddress);
 									}
 								}
 							}
@@ -377,7 +370,7 @@ void TTDCallsQueryWidget::onCellDoubleClicked(int row, int column)
 			}
 		}
 	}
-	else if (logicalCol == FunctionAddressColumn || logicalCol == ReturnAddressColumn)
+	else if (column == FunctionAddressColumn || column == ReturnAddressColumn)
 	{
 		// Navigate to address in Binary Ninja
 		QTableWidgetItem* item = m_resultsTable->item(row, column);
@@ -403,36 +396,6 @@ void TTDCallsQueryWidget::onCellDoubleClicked(int row, int column)
 	}
 }
 
-TTDCallsQueryWidget::LogicalColumn TTDCallsQueryWidget::getLogicalColumnFromVisual(int visualColumn) const
-{
-	int logicalIndex = 0;
-	for (int i = 0; i < m_columnVisibility.size(); ++i)
-	{
-		if (m_columnVisibility[i])
-		{
-			if (logicalIndex == visualColumn)
-				return static_cast<LogicalColumn>(i);
-			logicalIndex++;
-		}
-	}
-	return IndexColumn; // fallback
-}
-
-int TTDCallsQueryWidget::getVisualColumnFromLogical(LogicalColumn logicalColumn) const
-{
-	int visualIndex = 0;
-	for (int i = 0; i <= static_cast<int>(logicalColumn); ++i)
-	{
-		if (m_columnVisibility[i])
-		{
-			if (i == static_cast<int>(logicalColumn))
-				return visualIndex;
-			visualIndex++;
-		}
-	}
-	return -1; // not visible
-}
-
 void TTDCallsQueryWidget::updateColumnVisibility()
 {
 	// Apply column visibility settings

ui/ttdcallswidget.h

@@ -94,11 +94,6 @@ class TTDCallsQueryWidget : public QWidget
 	void setupContextMenu();
 	void updateColumnVisibility();
 
-	// Helper method to map visual column index to logical column
-	LogicalColumn getLogicalColumnFromVisual(int visualColumn) const;
-	// Helper method to get visual column index from logical column
-	int getVisualColumnFromLogical(LogicalColumn logicalColumn) const;
-
 public:
 	TTDCallsQueryWidget(QWidget* parent, BinaryViewRef data);
 	virtual ~TTDCallsQueryWidget();

ui/ttdmemorywidget.cpp

@@ -300,43 +300,6 @@ void TTDMemoryQueryWidget::updateColumnVisibility()
 	}
 }
 
-TTDMemoryQueryWidget::LogicalColumn TTDMemoryQueryWidget::getLogicalColumnFromVisual(int visualColumn) const
-{
-	if (visualColumn < 0 || visualColumn >= m_resultsTable->columnCount())
-		return static_cast<LogicalColumn>(-1); // Invalid
-	
-	int currentVisualIndex = 0;
-	for (int logicalIndex = 0; logicalIndex < m_columnVisibility.size(); ++logicalIndex)
-	{
-		if (m_columnVisibility[logicalIndex]) // Column is visible
-		{
-			if (currentVisualIndex == visualColumn)
-				return static_cast<LogicalColumn>(logicalIndex);
-			currentVisualIndex++;
-		}
-	}
-	
-	return static_cast<LogicalColumn>(-1); // Not found
-}
-
-int TTDMemoryQueryWidget::getVisualColumnFromLogical(LogicalColumn logicalColumn) const
-{
-	if (logicalColumn < 0 || logicalColumn >= m_columnVisibility.size())
-		return -1; // Invalid
-	
-	if (!m_columnVisibility[logicalColumn])
-		return -1; // Column is hidden
-	
-	int visualIndex = 0;
-	for (int i = 0; i < logicalColumn; ++i)
-	{
-		if (m_columnVisibility[i]) // Column is visible
-			visualIndex++;
-	}
-	
-	return visualIndex;
-}
-
 void TTDMemoryQueryWidget::performQuery()
 {
 	if (!m_controller || !m_controller->IsTTD())
@@ -458,15 +421,11 @@ void TTDMemoryQueryWidget::onCellDoubleClicked(int row, int column)
 	// Handle double-click events - navigate to address or position
 	if (row < 0 || row >= m_resultsTable->rowCount())
 		return;
-	
-	// Get the logical column type from the visual column index
-	LogicalColumn logicalColumn = getLogicalColumnFromVisual(column);
-	
-	if (logicalColumn == TimeStartColumn)
+
+	if (column == TimeStartColumn || column == TimeEndColumn)
 	{
 		// Parse position and navigate to it
-		int timeStartVisualColumn = getVisualColumnFromLogical(TimeStartColumn);
-		QTableWidgetItem* posItem = m_resultsTable->item(row, timeStartVisualColumn);
+		QTableWidgetItem* posItem = m_resultsTable->item(row, column);
 		if (posItem && m_controller)
 		{
 			QString posStr = posItem->text();
@@ -482,25 +441,20 @@ void TTDMemoryQueryWidget::onCellDoubleClicked(int row, int column)
 					TTDPosition pos(sequence, step);
 					if (m_controller->SetTTDPosition(pos))
 					{
-						// After time traveling, also navigate to the instruction pointer
-						int ipVisualColumn = getVisualColumnFromLogical(IPColumn);
-						if (ipVisualColumn >= 0)
+						QTableWidgetItem* ipItem = m_resultsTable->item(row, IPColumn);
+						if (ipItem && m_data)
 						{
-							QTableWidgetItem* ipItem = m_resultsTable->item(row, ipVisualColumn);
-							if (ipItem && m_data)
+							QString ipStr = ipItem->text();
+							if (ipStr.startsWith("0x", Qt::CaseInsensitive))
 							{
-								QString ipStr = ipItem->text();
-								if (ipStr.startsWith("0x", Qt::CaseInsensitive))
+								bool ok;
+								uint64_t ipAddress = ipStr.mid(2).toULongLong(&ok, 16);
+								if (ok)
 								{
-									bool ok;
-									uint64_t ipAddress = ipStr.mid(2).toULongLong(&ok, 16);
-									if (ok)
+									ViewFrame* frame = ViewFrame::viewFrameForWidget(this);
+									if (frame)
 									{
-										ViewFrame* frame = ViewFrame::viewFrameForWidget(this);
-										if (frame)
-										{
-											frame->navigate(m_data, ipAddress);
-										}
+										frame->navigate(m_data, ipAddress);
 									}
 								}
 							}
@@ -515,7 +469,7 @@ void TTDMemoryQueryWidget::onCellDoubleClicked(int row, int column)
 			}
 		}
 	}
-	else if (logicalColumn == AddressColumn || logicalColumn == IPColumn)
+	else if (column == AddressColumn || column == IPColumn)
 	{
 		// Navigate to address in disassembly view
 		QTableWidgetItem* addrItem = m_resultsTable->item(row, column);

ui/ttdmemorywidget.h

@@ -111,11 +111,6 @@ class TTDMemoryQueryWidget : public QWidget
 	void setupContextMenu();
 	void updateColumnVisibility();
 
-	// Helper method to map visual column index to logical column
-	LogicalColumn getLogicalColumnFromVisual(int visualColumn) const;
-	// Helper method to get visual column index from logical column
-	int getVisualColumnFromLogical(LogicalColumn logicalColumn) const;
-
 public:
 	TTDMemoryQueryWidget(QWidget* parent, BinaryViewRef data);
 	virtual ~TTDMemoryQueryWidget();

ui/ui.cpp

@@ -41,12 +41,12 @@ limitations under the License.
 #include "progresstask.h"
 #include "debuggerinfowidget.h"
 #include "ttdmemorywidget.h"
+#include "ttdcallswidget.h"
 #include "freeversion.h"
 #include <QTimer>
 
 #ifdef WIN32
 	#include "ttdrecord.h"
-	#include "ttdcallswidget.h"
 	#include "scriptingconsole.h"
 #endif