Restrict the address range dumped in crash reports.

haiku · Jan 23, 2013 · b68166e · b68166e
1 parent e449bae
commit b68166e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/apps/debugger/controllers/DebugReportGenerator.cpp b/src/apps/debugger/controllers/DebugReportGenerator.cpp
@@ -341,8 +341,11 @@ DebugReportGenerator::_DumpDebuggedThreadInfo(BString& _output,
 		if (frame->CountParameters() == 0
 			&& frame->CountLocalVariables() == 0) {
 			// only dump the topmost frame
-			if (i == 0)
-				_DumpStackFrameMemory(_output, thread->GetCpuState());
+			if (i == 0) {
+				_DumpStackFrameMemory(_output, thread->GetCpuState(),
+					frame->FrameAddress(), thread->GetTeam()->GetArchitecture()
+						->StackGrowthDirection());
+			}
 			continue;
 		}
 
@@ -384,19 +387,29 @@ DebugReportGenerator::_DumpDebuggedThreadInfo(BString& _output,
 
 void
 DebugReportGenerator::_DumpStackFrameMemory(BString& _output,
-	CpuState* state)
+	CpuState* state, target_addr_t framePointer, uint8 stackDirection)
 {
-	target_addr_t address = state->StackPointer();
-	if (fCurrentBlock == NULL || !fCurrentBlock->Contains(address)) {
-		fListener->InspectRequested(address, this);
+	target_addr_t startAddress;
+	target_addr_t endAddress;
+	if (stackDirection == STACK_GROWTH_DIRECTION_POSITIVE) {
+		startAddress = framePointer;
+		endAddress = state->StackPointer();
+	} else {
+		startAddress = state->StackPointer();
+		endAddress = framePointer;
+	}
+
+	if (fCurrentBlock == NULL || !fCurrentBlock->Contains(startAddress)) {
+		fListener->InspectRequested(startAddress, this);
 		status_t result = B_OK;
 		do {
 			result = acquire_sem(fTeamDataSem);
 		} while (result == B_INTERRUPTED);
 	}
+
 	_output << "\t\t\tFrame memory:\n";
-	UiUtils::DumpMemory(_output, 3, fCurrentBlock, address, 1, 16,
-		fCurrentBlock->BaseAddress() + fCurrentBlock->Size() - address);
+	UiUtils::DumpMemory(_output, 3, fCurrentBlock, startAddress, 1, 16,
+		endAddress - startAddress);
 }
 
 

diff --git a/src/apps/debugger/controllers/DebugReportGenerator.h b/src/apps/debugger/controllers/DebugReportGenerator.h
@@ -60,7 +60,9 @@ class DebugReportGenerator : public BLooper, private Team::Listener,
 			status_t			_DumpDebuggedThreadInfo(BString& _output,
 									::Thread* thread);
 			void				_DumpStackFrameMemory(BString& _output,
-									CpuState* state);
+									CpuState* state,
+									target_addr_t framePointer,
+									uint8 stackDirection);
 
 			status_t			_ResolveValueIfNeeded(ValueNode* node,
 									StackFrame* frame, int32 maxDepth);