Implement support for detecting if a given target address is in a Procedure

Linkage Table section. Use that additional information to skip PLT entries
while stepping. Fixes #6974.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39823 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/apps/debugger/ThreadHandler.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright 2009, Ingo Weinhold, [email protected].
+ * Copyright 2010, Rene Gollent, [email protected].
  * Distributed under the terms of the MIT License.
  */
 
@@ -589,6 +590,33 @@ ThreadHandler::_HandleSingleStepStep(CpuState* cpuState)
 			if (fStepStatement->ContainsAddress(cpuState->InstructionPointer())) {
 				_SingleStepThread(cpuState->InstructionPointer());
 				return true;
+			} else {
+				StackTrace* stackTrace = fThread->GetStackTrace();
+				Reference<StackTrace> stackTraceReference(stackTrace);
+
+				if (stackTrace == NULL && cpuState != NULL) {
+					if (fDebuggerInterface->GetArchitecture()->CreateStackTrace(
+							fThread->GetTeam(), this, cpuState, stackTrace) == B_OK) {
+						stackTraceReference.SetTo(stackTrace, true);
+					}
+				}
+
+				if (stackTrace != NULL) {
+					StackFrame *frame = stackTrace->FrameAt(0);
+					Image* image = frame->GetImage();
+					ImageDebugInfo* info = NULL;
+					if (GetImageDebugInfo(image, info) != B_OK)
+						return false;
+
+					Reference<ImageDebugInfo>(info, true);
+
+					if (info->GetAddressSectionType(
+						cpuState->InstructionPointer())
+						== ADDRESS_SECTION_TYPE_PLT) {
+						_SingleStepThread(cpuState->InstructionPointer());
+						return true;
+					}
+				}
 			}
 			return false;
 		}

src/apps/debugger/debug_info/DebuggerImageDebugInfo.cpp

@@ -86,6 +86,13 @@ DebuggerImageDebugInfo::GetType(GlobalTypeCache* cache,
 }
 
 
+AddressSectionType
+DebuggerImageDebugInfo::GetAddressSectionType(target_addr_t address)
+{
+	return ADDRESS_SECTION_TYPE_UNKNOWN;
+}
+
+
 status_t
 DebuggerImageDebugInfo::CreateFrame(Image* image,
 	FunctionInstance* functionInstance, CpuState* cpuState,

src/apps/debugger/debug_info/DebuggerImageDebugInfo.h

@@ -29,6 +29,7 @@ public:
 									BObjectList<FunctionDebugInfo>& functions);
 	virtual	status_t			GetType(GlobalTypeCache* cache,
 									const BString& name, Type*& _type);
+	virtual AddressSectionType	GetAddressSectionType(target_addr_t address);
 	virtual	status_t			CreateFrame(Image* image,
 									FunctionInstance* functionInstance,
 									CpuState* cpuState,

src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp

@@ -429,6 +429,30 @@ DwarfImageDebugInfo::GetType(GlobalTypeCache* cache,
 }
 
 
+AddressSectionType
+DwarfImageDebugInfo::GetAddressSectionType(target_addr_t address)
+{
+	address -= fRelocationDelta;
+	ElfFile* file = fFile->GetElfFile();
+
+	ElfSection* section = file->GetSection(".text");
+	if (section != NULL && address >= section->LoadAddress()
+		&& address < section->LoadAddress() + section->Size()) {
+			file->PutSection(section);
+			return ADDRESS_SECTION_TYPE_FUNCTION;
+	}
+
+	section = file->GetSection(".plt");
+	if (section != NULL && address >= section->LoadAddress()
+		&& address < section->LoadAddress() + section->Size()) {
+			file->PutSection(section);
+			return ADDRESS_SECTION_TYPE_PLT;
+	}
+
+	return ADDRESS_SECTION_TYPE_UNKNOWN;
+}
+
+
 status_t
 DwarfImageDebugInfo::CreateFrame(Image* image,
 	FunctionInstance* functionInstance, CpuState* cpuState,

src/apps/debugger/debug_info/DwarfImageDebugInfo.h

@@ -1,5 +1,6 @@
 /*
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Copyright 2010, Rene Gollent, rene@gollent.com.
  * Distributed under the terms of the MIT License.
  */
 #ifndef DWARF_IMAGE_DEBUG_INFO_H
@@ -10,6 +11,7 @@
 
 #include <util/OpenHashTable.h>
 
+#include "AddressSectionTypes.h"
 #include "ImageInfo.h"
 #include "SpecificImageDebugInfo.h"
 #include "Type.h"
@@ -50,6 +52,9 @@ public:
 									BObjectList<FunctionDebugInfo>& functions);
 	virtual	status_t			GetType(GlobalTypeCache* cache,
 									const BString& name, Type*& _type);
+
+	virtual AddressSectionType	GetAddressSectionType(target_addr_t address);
+
 	virtual	status_t			CreateFrame(Image* image,
 									FunctionInstance* functionInstance,
 									CpuState* cpuState,

src/apps/debugger/debug_info/ImageDebugInfo.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Copyright 2010, Rene Gollent, rene@gollent.com.
  * Distributed under the terms of the MIT License.
  */
 
@@ -90,6 +91,21 @@ ImageDebugInfo::GetType(GlobalTypeCache* cache, const BString& name,
 }
 
 
+AddressSectionType
+ImageDebugInfo::GetAddressSectionType(target_addr_t address) const
+{
+	AddressSectionType type = ADDRESS_SECTION_TYPE_UNKNOWN;
+	for (int32 i = 0; SpecificImageDebugInfo* specificInfo
+			= fSpecificInfos.ItemAt(i); i++) {
+		type = specificInfo->GetAddressSectionType(address);
+		if (type != ADDRESS_SECTION_TYPE_UNKNOWN)
+			break;
+	}
+
+	return type;
+}
+
+
 int32
 ImageDebugInfo::CountFunctions() const
 {

src/apps/debugger/debug_info/ImageDebugInfo.h

@@ -1,5 +1,6 @@
 /*
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Copyright 2010, Rene Gollent, rene@gollent.com.
  * Distributed under the terms of the MIT License.
  */
 #ifndef IMAGE_DEBUG_INFO_H
@@ -11,6 +12,7 @@
 #include <ObjectList.h>
 #include <Referenceable.h>
 
+#include "AddressSectionTypes.h"
 #include "ImageInfo.h"
 #include "Types.h"
 
@@ -39,6 +41,8 @@ public:
 			status_t			GetType(GlobalTypeCache* cache,
 									const BString& name, Type*& _type);
 									// returns a reference
+			AddressSectionType	GetAddressSectionType(target_addr_t address)
+									const;
 
 			int32				CountFunctions() const;
 			FunctionInstance*	FunctionAt(int32 index) const;

src/apps/debugger/debug_info/SpecificImageDebugInfo.h

@@ -9,6 +9,7 @@
 #include <ObjectList.h>
 #include <Referenceable.h>
 
+#include "AddressSectionTypes.h"
 #include "Types.h"
 
 
@@ -43,6 +44,8 @@ public:
 	virtual	status_t			GetType(GlobalTypeCache* cache,
 									const BString& name, Type*& _type) = 0;
 									// returns a reference
+	virtual AddressSectionType	GetAddressSectionType(target_addr_t address)
+									= 0;
 
 	virtual	status_t			CreateFrame(Image* image,
 									FunctionInstance* functionInstance,

src/apps/debugger/types/AddressSectionTypes.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2010, Rene Gollent, rene@gollent.com.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef ADDRESS_SECTION_TYPES_H
+#define ADDRESS_SECTION_TYPES_H
+
+
+enum AddressSectionType {
+	ADDRESS_SECTION_TYPE_UNKNOWN = 0,
+	ADDRESS_SECTION_TYPE_FUNCTION,
+	ADDRESS_SECTION_TYPE_PLT
+};
+
+
+#endif	// ADDRESS_SECTION_TYPES_H