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

LazDebuggerFp: debugln for function calling (watch-eval)

Browse Source
This commit is contained in:
Martin 2022-06-30 02:26:55 +02:00
parent 9fb4edfbe5
commit 0429c822c1
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/fpdebug/fpdbgcallcontextinfo.pas
View File

@ -93,6 +93,9 @@ type
implementation
var
FPDBG_FUNCCALL: PLazLoggerLogGroup;
{ TFpValueCallParamStringByRef }
function TFpValueCallParamStringByRef.GetDwarfDataAddress(out
@ -377,6 +380,7 @@ begin
if FOrigStackPtr <> 0 then
FDbgThread.SetStackPointerRegisterValue(FOrigStackPtr);
debugln(FPDBG_FUNCCALL, ['CallRoutine END (CTX DESTROY)']);
end;
function TFpDbgInfoCallContext.WriteStack: Boolean;
@ -578,5 +582,7 @@ begin
AVal := TFpValueConstString.Create(s);
end;
initialization
FPDBG_FUNCCALL := DebugLogger.FindOrRegisterLogGroup('FPDBG_FUNCCALL' {$IFDEF FPDBG_FUNCCALL} , True {$ENDIF} );
end.

10
components/fpdebug/fpdbgcontroller.pas
View File

@ -421,7 +421,7 @@ uses
FpImgReaderBase, FpDbgCommon;
var
DBG_VERBOSE, DBG_WARNINGS, FPDBG_COMMANDS: PLazLoggerLogGroup;
DBG_VERBOSE, DBG_WARNINGS, FPDBG_COMMANDS, FPDBG_FUNCCALL: PLazLoggerLogGroup;
{ TDbgControllerCallRoutineCmd }
@ -451,6 +451,7 @@ end;
procedure TDbgControllerCallRoutineCmd.Init;
begin
debugln(FPDBG_FUNCCALL, ['CallRoutine INIT - Cmd.Init - ProcessLoop starts']);
inherited Init;
FCallContext.WriteStack;
@ -569,6 +570,7 @@ end;
procedure TDbgControllerCallRoutineCmd.RestoreOriginalCode;
begin
debugln(FPDBG_FUNCCALL, ['CallRoutine -- << Restore orig Code']);
if not FProcess.WriteInstructionCode(FOriginalInstructionPointer, Length(FOriginalCode), FOriginalCode[0]) then
raise Exception.Create('Failed to restore the original code at the instruction-pointer');
end;
@ -582,11 +584,13 @@ end;
procedure TDbgControllerCallRoutineCmd.StoreInstructionPointer;
begin
debugln(FPDBG_FUNCCALL, ['CallRoutine -- >> Store IP']);
FOriginalInstructionPointer := FController.CurrentThread.GetInstructionPointerRegisterValue;
end;
procedure TDbgControllerCallRoutineCmd.RestoreInstructionPointer;
begin
debugln(FPDBG_FUNCCALL, ['CallRoutine -- << Restore IP']);
{$ifdef cpui386}
FController.CurrentThread.SetRegisterValue('eip', FOriginalInstructionPointer);
{$else}
@ -604,6 +608,7 @@ end;
procedure TDbgControllerCallRoutineCmd.RestoreRegisters;
begin
debugln(FPDBG_FUNCCALL, ['CallRoutine -- << RestoreRegisters']);
FController.CurrentThread.RestoreRegisters;
end;
@ -614,6 +619,7 @@ end;
procedure TDbgControllerCallRoutineCmd.StoreRegisters;
begin
debugln(FPDBG_FUNCCALL, ['CallRoutine -- >> StoreRegisters']);
FController.CurrentThread.StoreRegisters;
end;
@ -1937,6 +1943,7 @@ function TDbgController.Call(const FunctionAddress: TFpDbgMemLocation;
var
Context: TFpDbgInfoCallContext;
begin
debugln(FPDBG_FUNCCALL, ['CallRoutine BEGIN']);
Context := TFpDbgInfoCallContext.Create(ABaseContext, AMemReader, AMemConverter, FCurrentProcess, FCurrentThread);
Context.AddReference;
InitializeCommand(TDbgControllerCallRoutineCmd.Create(self, FunctionAddress, Context));
@ -1947,6 +1954,7 @@ initialization
DBG_VERBOSE := DebugLogger.FindOrRegisterLogGroup('DBG_VERBOSE' {$IFDEF DBG_VERBOSE} , True {$ENDIF} );
DBG_WARNINGS := DebugLogger.FindOrRegisterLogGroup('DBG_WARNINGS' {$IFDEF DBG_WARNINGS} , True {$ENDIF} );
FPDBG_COMMANDS := DebugLogger.FindOrRegisterLogGroup('FPDBG_COMMANDS' {$IFDEF FPDBG_COMMANDS} , True {$ENDIF} );
FPDBG_FUNCCALL := DebugLogger.FindOrRegisterLogGroup('FPDBG_FUNCCALL' {$IFDEF FPDBG_FUNCCALL} , True {$ENDIF} );
end.

6
components/fpdebug/fpdbginfo.pas
View File

@ -632,6 +632,9 @@ function dbgs(ADbgSymbolKind: TDbgSymbolKind): String; overload;
implementation
var
FPDBG_FUNCCALL: PLazLoggerLogGroup;
function dbgs(ADbgSymbolKind: TDbgSymbolKind): String;
begin
Result := '';
@ -751,6 +754,7 @@ end;
procedure TFpDbgAbstractCallContext.SetError(const Message: string);
begin
debugln(FPDBG_FUNCCALL, ['CallRoutine -- !!! Ctx.SetError: ', Message]);
FIsValid := False;
FMessage := Message;
end;
@ -1859,5 +1863,7 @@ begin
FHasInfo := True;
end;
initialization
FPDBG_FUNCCALL := DebugLogger.FindOrRegisterLogGroup('FPDBG_FUNCCALL' {$IFDEF FPDBG_FUNCCALL} , True {$ENDIF} );
end.