paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-22 07:39:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

FpDebug: asm-unwind, check if result is in readable memory, and try to find result-after-call-instr.

Browse Source
This commit is contained in:
Martin 2025-02-26 18:42:22 +01:00
parent f1941c9cce
commit 4b04ea627b
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/fpdebug/fpdbgdisasx86.pp
View File

@ -5702,6 +5702,7 @@ var
Val: Int64; Val: Int64;
ClearRecValList, ForceDifferentBranch: Boolean; ClearRecValList, ForceDifferentBranch: Boolean;
FullName: String; FullName: String;
WeakResultAddress, WeakResultStackPtr, WeakResultFramePtr: TDBGPtr;
begin begin
Result := False; Result := False;
NewAddr := AnAddress; NewAddr := AnAddress;
@ -5710,6 +5711,8 @@ begin
StartStack := AStackPtr; StartStack := AStackPtr;
CurConditionalForwardAddr := -1; CurConditionalForwardAddr := -1;
BackwardJumpAddress.Address := 0; BackwardJumpAddress.Address := 0;
WeakResultAddress := 0;
try
{$PUSH}{$R-}{$Q-} {$PUSH}{$R-}{$Q-}
MaxAddr := AnAddress + MAX_SEARCH_ADDR; MaxAddr := AnAddress + MAX_SEARCH_ADDR;
@ -5773,19 +5776,30 @@ begin
Val := 0; Val := 0;
if instr.X86Instruction.OperCnt = 1 then if instr.X86Instruction.OperCnt = 1 then
Val := ValueFromMem(CurAddr[Instr.X86Instruction.Operand[1].CodeIndex], Instr.X86Instruction.Operand[1].ByteCount, Instr.X86Instruction.Operand[1].FormatFlags); Val := ValueFromMem(CurAddr[Instr.X86Instruction.Operand[1].CodeIndex], Instr.X86Instruction.Operand[1].ByteCount, Instr.X86Instruction.Operand[1].FormatFlags);
NewAddr := 0; Tmp := 0;
if FProcess.Mode = dm32 then begin if FProcess.Mode = dm32 then begin
if not FProcess.ReadData(NewStack, 4, NewAddr, RSize) then if not FProcess.ReadData(NewStack, 4, Tmp, RSize) then
exit; exit;
inc(NewStack, 4 + Val); inc(NewStack, 4 + Val);
end end
else begin else begin
if not FProcess.ReadData(NewStack, 8, NewAddr, RSize) then if not FProcess.ReadData(NewStack, 8, Tmp, RSize) then
exit; exit;
inc(NewStack, 8 + Val); inc(NewStack, 8 + Val);
end; end;
if not IsAfterCallInstruction(Tmp) then begin
if (WeakResultAddress = 0) and (not FLastErrWasMem) then begin
WeakResultAddress := Tmp;
WeakResultStackPtr := NewStack;
WeakResultFramePtr := NewFrame;
end;
ForceDifferentBranch := True;
continue;
end;
Result := True; Result := True;
AnAddress := NewAddr; AnAddress := Tmp;
AStackPtr := NewStack; AStackPtr := NewStack;
AFramePtr := NewFrame; AFramePtr := NewFrame;
exit; exit;
@ -6193,6 +6207,15 @@ begin
end; end;
end; end;
if ClearRecValList then ARegisterValueList.Clear; if ClearRecValList then ARegisterValueList.Clear;
finally
if (not Result) and (WeakResultAddress <> 0) then begin
Result := True;
AnAddress := WeakResultAddress;
AStackPtr := WeakResultStackPtr;
AFramePtr := WeakResultFramePtr;
end;
end;
end; end;
{ TDbgStackUnwinderIntelDisAssembler } { TDbgStackUnwinderIntelDisAssembler }