Simplified conditional breakpoint implementation and removed redundant code

Co-authored-by: AdamR05 <215697996+AdamR05@users.noreply.github.com>

Author: 3rdit

core/debuggercontroller.cpp

@@ -32,7 +32,6 @@ DebuggerController::DebuggerController(BinaryViewRef data): BinaryDataNotificati
 	m_data = data;
 	m_data->RegisterNotification(this);
 	m_viewStart = m_data->GetStart();
-	m_originalFileBase = m_data->GetStart();
 
 	m_state = new DebuggerState(data, this);
 	m_adapter = nullptr;

core/debuggercontroller.h

@@ -85,8 +85,6 @@ namespace BinaryNinjaDebugger {
 		// this does not change even if we add the debugger memory region. In the future, this should be provided by
 		// the binary view -- we will no longer need to track it ourselves
 		uint64_t m_viewStart;
-		// Preserves original file base before rebasing - never updated, used for file VA to offset conversion
-		uint64_t m_originalFileBase;
 
 		//	inline static std::vector<DbgRef<DebuggerController>> g_debuggerControllers;
 		static DbgRef<DebuggerController>* g_debuggerControllers;
@@ -395,7 +393,6 @@ namespace BinaryNinjaDebugger {
 		bool ReAddDebuggerMemoryRegion();
 
 		uint64_t GetViewFileSegmentsStart() { return m_viewStart; }
-		uint64_t GetOriginalFileBase() { return m_originalFileBase; }
 
 		bool ComputeExprValueAPI(const LowLevelILInstruction& instr, intx::uint512& value);
 		bool ComputeExprValue(const LowLevelILInstruction& instr, intx::uint512& value);

core/debuggerstate.cpp

@@ -753,67 +753,47 @@ std::optional<ModuleNameAndOffset> DebuggerBreakpoints::FindBreakpointKey(const
 }
 
 
-std::optional<ModuleNameAndOffset> DebuggerBreakpoints::FindConditionKey(const ModuleNameAndOffset& address)
+std::string DebuggerBreakpoints::GetConditionAbsolute(const uint64_t address)
 {
-	if (m_conditions.contains(address))
-		return address;
-
-	// absolute address comparison (handles module name differences)
-	// assumes conditions are stored with valid, resolvable module names
-	const uint64_t targetAbsolute = m_state->GetModules()->RelativeAddressToAbsolute(address);
-	for (const auto& [key, _] : m_conditions)
-	{
-		if (const uint64_t conditionAbsolute = m_state->GetModules()->RelativeAddressToAbsolute(key);
-			conditionAbsolute == targetAbsolute)
-			return key;
-	}
-
-	// if the address has empty module name, it might be a file virtual address?
-	// try converting to an offset by subtracting the original file base.
-	if (address.module.empty())
+	for (const auto& [key, condition] : m_conditions)
 	{
-		if (const uint64_t originalBase = m_state->GetController()->GetOriginalFileBase();
-			address.offset >= originalBase)
-		{
-			const uint64_t fileOffset = address.offset - originalBase;
-			const std::string& mainFile = m_state->GetController()->GetData()->GetFile()->GetOriginalFilename();
-			for (const auto& [key, _] : m_conditions)
-			{
-				if (key.offset == fileOffset && DebugModule::IsSameBaseModule(mainFile, key.module))
-					return key;
-			}
-		}
+		if (m_state->GetModules()->RelativeAddressToAbsolute(key) == address)
+			return condition;
 	}
-
-	return std::nullopt;
-}
-
-
-std::string DebuggerBreakpoints::GetConditionAbsolute(const uint64_t address)
-{
-	const ModuleNameAndOffset info = m_state->GetModules()->AbsoluteAddressToRelative(address);
-	return GetConditionOffset(info);
+	return "";
 }
 
 
 std::string DebuggerBreakpoints::GetConditionOffset(const ModuleNameAndOffset& address)
 {
-	if (const auto key = FindConditionKey(address))
-		return m_conditions[*key];
+	auto actualKey = FindBreakpointKey(address);
+	if (!actualKey)
+		return "";
+
+	if (const auto it = m_conditions.find(*actualKey); it != m_conditions.end())
+		return it->second;
 	return "";
 }
 
 
 bool DebuggerBreakpoints::HasConditionAbsolute(const uint64_t address)
 {
-	const ModuleNameAndOffset info = m_state->GetModules()->AbsoluteAddressToRelative(address);
-	return HasConditionOffset(info);
+	for (const auto& [key, _] : m_conditions)
+	{
+		if (m_state->GetModules()->RelativeAddressToAbsolute(key) == address)
+			return true;
+	}
+	return false;
 }
 
 
 bool DebuggerBreakpoints::HasConditionOffset(const ModuleNameAndOffset& address)
 {
-	return FindConditionKey(address).has_value();
+	auto actualKey = FindBreakpointKey(address);
+	if (!actualKey)
+		return false;
+
+	return m_conditions.contains(*actualKey);
 }
 
 

core/debuggerstate.h

@@ -116,10 +116,6 @@ namespace BinaryNinjaDebugger {
 		// Helper to find the actual key in m_breakpoints matching the given address,
 		// handling module name differences via absolute address comparison
 		std::optional<ModuleNameAndOffset> FindBreakpointKey(const ModuleNameAndOffset& address);
-
-		// Helper to find the actual key in m_conditions matching the given address,
-		// handling module name differences and file address fallback
-		std::optional<ModuleNameAndOffset> FindConditionKey(const ModuleNameAndOffset& address);
 	};
 
 

core/ffi.cpp

@@ -945,31 +945,13 @@ bool BNDebuggerSetBreakpointConditionRelative(BNDebuggerController* controller,
 
 char* BNDebuggerGetBreakpointConditionAbsolute(BNDebuggerController* controller, uint64_t address)
 {
-	const DebuggerState* state = controller->object->GetState();
-	if (!state)
-		return BNDebuggerAllocString("");
-
-	DebuggerBreakpoints* breakpoints = state->GetBreakpoints();
-	if (!breakpoints)
-		return BNDebuggerAllocString("");
-
-	const std::string condition = breakpoints->GetConditionAbsolute(address);
-	return BNDebuggerAllocString(condition.c_str());
+	return BNDebuggerAllocString(controller->object->GetBreakpointCondition(address).c_str());
 }
 
 
 char* BNDebuggerGetBreakpointConditionRelative(BNDebuggerController* controller, const char* module, uint64_t offset)
 {
-	const DebuggerState* state = controller->object->GetState();
-	if (!state)
-		return BNDebuggerAllocString("");
-
-	DebuggerBreakpoints* breakpoints = state->GetBreakpoints();
-	if (!breakpoints)
-		return BNDebuggerAllocString("");
-
-	const std::string condition = breakpoints->GetConditionOffset(ModuleNameAndOffset(module, offset));
-	return BNDebuggerAllocString(condition.c_str());
+	return BNDebuggerAllocString(controller->object->GetBreakpointCondition(ModuleNameAndOffset(module, offset)).c_str());
 }
 
 

ui/breakpointswidget.cpp

@@ -577,10 +577,7 @@ void DebugBreakpointsWidget::editCondition()
 		QLineEdit::Normal, QString::fromStdString(currentCondition), &ok);
 
 	if (ok)
-	{
 		m_controller->SetBreakpointCondition(bp.location(), newCondition.trimmed().toStdString());
-		updateContent();
-	}
 }