[haiku-commits] haiku: hrev43513 - in src/apps/debugger: arch model debug_info arch/x86
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 16 Dec 2011 04:47:41 +0100 (CET)
hrev43513 adds 2 changesets to branch 'master'
old head: 09aaa658b0fa53eff3ad4cd5a44cf488bdfc1e3c
new head: 26334a8a66a1365b8fbd135a9dacc8fe897b6d38
----------------------------------------------------------------------------
a9bec97: Add previous CPU state member and associated accessors.
Used to store the unwound state of the CPU from this frame,
which will form the actual state of the following frame. Needed
in order to properly support continuation of unwinding from a
partial stack trace.
26334a8: Fix unwinding of partial stack traces.
- Architecture::CreateStackTrace() now uses the last frame's
PreviousCpuState() as the basis to continue unwinding when passed
a partial trace to continue from, rather than the (incorrect) actual
cpu state of that frame, which would have resulted in the last frame
being duplicated in the trace.
- Renamed variables to be more clear.
[ Rene Gollent <anevilyak@xxxxxxxxx> ]
----------------------------------------------------------------------------
8 files changed, 44 insertions(+), 22 deletions(-)
src/apps/debugger/arch/Architecture.cpp | 30 ++++++++--------
src/apps/debugger/arch/Architecture.h | 2 +-
src/apps/debugger/arch/x86/ArchitectureX86.cpp | 5 ++-
.../debugger/debug_info/DwarfImageDebugInfo.cpp | 6 ++-
src/apps/debugger/debug_info/DwarfImageDebugInfo.h | 2 +-
.../debugger/debug_info/SpecificImageDebugInfo.h | 2 +-
src/apps/debugger/model/StackFrame.cpp | 14 +++++++
src/apps/debugger/model/StackFrame.h | 5 +++
############################################################################
Commit: a9bec97e472fd70d446da9b0fb1eff28dd0f0549
URL: http://cgit.haiku-os.org/haiku/commit/?id=a9bec97
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Fri Dec 16 03:40:32 2011 UTC
Add previous CPU state member and associated accessors.
Used to store the unwound state of the CPU from this frame,
which will form the actual state of the following frame. Needed
in order to properly support continuation of unwinding from a
partial stack trace.
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/model/StackFrame.cpp
b/src/apps/debugger/model/StackFrame.cpp
index 14f81ff..6cb760c 100644
--- a/src/apps/debugger/model/StackFrame.cpp
+++ b/src/apps/debugger/model/StackFrame.cpp
@@ -25,6 +25,7 @@ StackFrame::StackFrame(stack_frame_type type, CpuState*
cpuState,
:
fType(type),
fCpuState(cpuState),
+ fPreviousCpuState(NULL),
fFrameAddress(frameAddress),
fInstructionPointer(instructionPointer),
fReturnAddress(0),
@@ -49,6 +50,7 @@ StackFrame::~StackFrame()
SetImage(NULL);
SetFunction(NULL);
+ SetPreviousCpuState(NULL);
fDebugInfo->ReleaseReference();
fCpuState->ReleaseReference();
@@ -81,6 +83,18 @@ StackFrame::Init()
void
+StackFrame::SetPreviousCpuState(CpuState* state)
+{
+ if (fPreviousCpuState != NULL)
+ fPreviousCpuState->ReleaseReference();
+
+ fPreviousCpuState = state;
+
+ if (fPreviousCpuState != NULL)
+ fPreviousCpuState->AcquireReference();
+}
+
+void
StackFrame::SetReturnAddress(target_addr_t address)
{
fReturnAddress = address;
diff --git a/src/apps/debugger/model/StackFrame.h
b/src/apps/debugger/model/StackFrame.h
index e4c2f975..0e30d53 100644
--- a/src/apps/debugger/model/StackFrame.h
+++ b/src/apps/debugger/model/StackFrame.h
@@ -55,6 +55,10 @@ public:
target_addr_t InstructionPointer() const
{
return fInstructionPointer; }
+ CpuState* GetPreviousCpuState()
const
+ {
return fPreviousCpuState; }
+ void
SetPreviousCpuState(CpuState* state);
+
target_addr_t ReturnAddress() const { return
fReturnAddress; }
void
SetReturnAddress(target_addr_t address);
@@ -89,6 +93,7 @@ private:
private:
stack_frame_type fType;
CpuState* fCpuState;
+ CpuState* fPreviousCpuState;
target_addr_t fFrameAddress;
target_addr_t fInstructionPointer;
target_addr_t fReturnAddress;
############################################################################
Revision: hrev43513
Commit: 26334a8a66a1365b8fbd135a9dacc8fe897b6d38
URL: http://cgit.haiku-os.org/haiku/commit/?id=26334a8
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Fri Dec 16 03:43:38 2011 UTC
Fix unwinding of partial stack traces.
- Architecture::CreateStackTrace() now uses the last frame's
PreviousCpuState() as the basis to continue unwinding when passed
a partial trace to continue from, rather than the (incorrect) actual
cpu state of that frame, which would have resulted in the last frame
being duplicated in the trace.
- Renamed variables to be more clear.
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/arch/Architecture.cpp
b/src/apps/debugger/arch/Architecture.cpp
index 084b8ee..c58be0e 100644
--- a/src/apps/debugger/arch/Architecture.cpp
+++ b/src/apps/debugger/arch/Architecture.cpp
@@ -100,7 +100,7 @@ Architecture::CreateStackTrace(Team* team,
StackTrace* stackTrace = NULL;
ObjectDeleter<StackTrace> stackTraceDeleter;
- StackFrame* frame = NULL;
+ StackFrame* nextFrame = NULL;
if (useExistingTrace)
stackTrace = _stackTrace;
@@ -115,8 +115,8 @@ Architecture::CreateStackTrace(Team* team,
// if we're passed an already existing partial stack trace,
// attempt to continue building it from where it left off.
if (stackTrace->CountFrames() > 0) {
- frame = stackTrace->FrameAt(stackTrace->CountFrames() - 1);
- cpuState = frame->GetCpuState();
+ nextFrame = stackTrace->FrameAt(stackTrace->CountFrames() - 1);
+ cpuState = nextFrame->GetPreviousCpuState();
}
while (cpuState != NULL) {
@@ -152,42 +152,42 @@ Architecture::CreateStackTrace(Team* team,
// If the CPU state's instruction pointer is actually the
return address
// of the next frame, we let the architecture fix that.
- if (frame != NULL
- && frame->ReturnAddress() ==
cpuState->InstructionPointer()) {
- UpdateStackFrameCpuState(frame, image,
+ if (nextFrame != NULL
+ && nextFrame->ReturnAddress() ==
cpuState->InstructionPointer()) {
+ UpdateStackFrameCpuState(nextFrame, image,
functionDebugInfo, cpuState);
}
// create the frame using the debug info
- StackFrame* previousFrame = NULL;
+ StackFrame* frame = NULL;
CpuState* previousCpuState = NULL;
if (function != NULL) {
status_t error =
functionDebugInfo->GetSpecificImageDebugInfo()
- ->CreateFrame(image, function, cpuState,
previousFrame,
+ ->CreateFrame(image, function, cpuState, frame,
previousCpuState);
if (error != B_OK && error != B_UNSUPPORTED)
break;
}
// If we have no frame yet, let the architecture create it.
- if (previousFrame == NULL) {
+ if (frame == NULL) {
status_t error = CreateStackFrame(image,
functionDebugInfo,
- cpuState, frame == NULL, previousFrame,
previousCpuState);
+ cpuState, nextFrame == NULL, frame,
previousCpuState);
if (error != B_OK)
break;
}
cpuStateReference.SetTo(previousCpuState, true);
- previousFrame->SetImage(image);
- previousFrame->SetFunction(function);
+ frame->SetImage(image);
+ frame->SetFunction(function);
- if (!stackTrace->AddFrame(previousFrame)) {
- delete previousFrame;
+ if (!stackTrace->AddFrame(frame)) {
+ delete frame;
return B_NO_MEMORY;
}
- frame = previousFrame;
+ frame = nextFrame;
cpuState = previousCpuState;
if (--maxStackDepth == 0)
break;
diff --git a/src/apps/debugger/arch/Architecture.h
b/src/apps/debugger/arch/Architecture.h
index 1f0d40b..845af2e 100644
--- a/src/apps/debugger/arch/Architecture.h
+++ b/src/apps/debugger/arch/Architecture.h
@@ -67,7 +67,7 @@ public:
virtual status_t CreateStackFrame(Image* image,
FunctionDebugInfo* function,
CpuState* cpuState, bool isTopFrame,
-
StackFrame*& _previousFrame,
+
StackFrame*& _frame,
CpuState*& _previousCpuState) = 0;
// returns reference to previous frame
// and CPU state; returned CPU state
diff --git a/src/apps/debugger/arch/x86/ArchitectureX86.cpp
b/src/apps/debugger/arch/x86/ArchitectureX86.cpp
index 61269a7..cc856ce 100644
--- a/src/apps/debugger/arch/x86/ArchitectureX86.cpp
+++ b/src/apps/debugger/arch/x86/ArchitectureX86.cpp
@@ -265,7 +265,7 @@ ArchitectureX86::CreateCpuState(const void* cpuStateData,
size_t size,
status_t
ArchitectureX86::CreateStackFrame(Image* image, FunctionDebugInfo* function,
- CpuState* _cpuState, bool isTopFrame, StackFrame*& _previousFrame,
+ CpuState* _cpuState, bool isTopFrame, StackFrame*& _frame,
CpuState*& _previousCpuState)
{
CpuStateX86* cpuState = dynamic_cast<CpuStateX86*>(_cpuState);
@@ -382,11 +382,12 @@ ArchitectureX86::CreateStackFrame(Image* image,
FunctionDebugInfo* function,
previousCpuState->SetIntRegister(X86_REGISTER_EBP,
previousFramePointer);
previousCpuState->SetIntRegister(X86_REGISTER_EIP,
returnAddress);
+ frame->SetPreviousCpuState(previousCpuState);
}
frame->SetReturnAddress(returnAddress);
- _previousFrame = frameReference.Detach();
+ _frame = frameReference.Detach();
_previousCpuState = previousCpuState;
return B_OK;
}
diff --git a/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
b/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
index 45d1388..7731e5a 100644
--- a/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
+++ b/src/apps/debugger/debug_info/DwarfImageDebugInfo.cpp
@@ -495,7 +495,7 @@ DwarfImageDebugInfo::GetAddressSectionType(target_addr_t
address)
status_t
DwarfImageDebugInfo::CreateFrame(Image* image,
FunctionInstance* functionInstance, CpuState* cpuState,
- StackFrame*& _previousFrame, CpuState*& _previousCpuState)
+ StackFrame*& _frame, CpuState*& _previousCpuState)
{
DwarfFunctionDebugInfo* function =
dynamic_cast<DwarfFunctionDebugInfo*>(
functionInstance->GetFunctionDebugInfo());
@@ -634,9 +634,11 @@ DwarfImageDebugInfo::CreateFrame(Image* image,
instructionPointer, functionInstance->Address() -
fRelocationDelta,
subprogramEntry->Variables(), subprogramEntry->Blocks());
- _previousFrame = frameReference.Detach();
+ _frame = frameReference.Detach();
_previousCpuState = previousCpuStateReference.Detach();
+ frame->SetPreviousCpuState(_previousCpuState);
+
return B_OK;
}
diff --git a/src/apps/debugger/debug_info/DwarfImageDebugInfo.h
b/src/apps/debugger/debug_info/DwarfImageDebugInfo.h
index e0ea796..4fde30c 100644
--- a/src/apps/debugger/debug_info/DwarfImageDebugInfo.h
+++ b/src/apps/debugger/debug_info/DwarfImageDebugInfo.h
@@ -61,7 +61,7 @@ public:
virtual status_t CreateFrame(Image* image,
FunctionInstance* functionInstance,
CpuState* cpuState,
-
StackFrame*& _previousFrame,
+
StackFrame*& _frame,
CpuState*& _previousCpuState);
virtual status_t GetStatement(FunctionDebugInfo*
function,
target_addr_t address,
diff --git a/src/apps/debugger/debug_info/SpecificImageDebugInfo.h
b/src/apps/debugger/debug_info/SpecificImageDebugInfo.h
index 2778c88..ee14134 100644
--- a/src/apps/debugger/debug_info/SpecificImageDebugInfo.h
+++ b/src/apps/debugger/debug_info/SpecificImageDebugInfo.h
@@ -53,7 +53,7 @@ public:
virtual status_t CreateFrame(Image* image,
FunctionInstance* functionInstance,
CpuState* cpuState,
-
StackFrame*& _previousFrame,
+
StackFrame*& _Frame,
CpuState*& _previousCpuState) = 0;
// returns reference to previous frame
// and CPU state; returned CPU state
Other related posts:
