From 842abf97c1ebcfcf783c71a053ebff8da95de50a Mon Sep 17 00:00:00 2001 From: Martin Date: Sun, 12 Dec 2021 19:20:40 +0100 Subject: [PATCH] FpDebug: Remove some asserts that were to strict. The check is done in ReadThreadState. If that has already been done, the functions do not need the requirement. --- components/fpdebug/fpdbglinuxclasses.pas | 6 +++--- components/fpdebug/fpdbgwinclasses.pas | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/fpdebug/fpdbglinuxclasses.pas b/components/fpdebug/fpdbglinuxclasses.pas index ce60a23ad5..08ec49a55c 100644 --- a/components/fpdebug/fpdbglinuxclasses.pas +++ b/components/fpdebug/fpdbglinuxclasses.pas @@ -775,7 +775,7 @@ end; function TDbgLinuxThread.GetInstructionPointerRegisterValue: TDbgPtr; begin - {$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgLinuxThread.GetInstructionPointerRegisterValue');{$ENDIF} + //{$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgLinuxThread.GetInstructionPointerRegisterValue');{$ENDIF} assert(FIsPaused, 'TDbgLinuxThread.GetInstructionPointerRegisterValue: FIsPaused'); Result := 0; @@ -789,7 +789,7 @@ end; function TDbgLinuxThread.GetStackBasePointerRegisterValue: TDbgPtr; begin - {$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgLinuxThread.GetStackBasePointerRegisterValue');{$ENDIF} + //{$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgLinuxThread.GetStackBasePointerRegisterValue');{$ENDIF} assert(FIsPaused, 'TDbgLinuxThread.GetStackBasePointerRegisterValue: FIsPaused'); Result := 0; @@ -803,7 +803,7 @@ end; function TDbgLinuxThread.GetStackPointerRegisterValue: TDbgPtr; begin - {$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgLinuxThread.GetStackPointerRegisterValue');{$ENDIF} + //{$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgLinuxThread.GetStackPointerRegisterValue');{$ENDIF} assert(FIsPaused, 'TDbgLinuxThread.GetStackPointerRegisterValue: FIsPaused'); Result := 0; diff --git a/components/fpdebug/fpdbgwinclasses.pas b/components/fpdebug/fpdbgwinclasses.pas index 421030f241..e6fa30f7ce 100644 --- a/components/fpdebug/fpdbgwinclasses.pas +++ b/components/fpdebug/fpdbgwinclasses.pas @@ -1765,7 +1765,7 @@ end; procedure TDbgWinThread.SetRegisterValue(AName: string; AValue: QWord); begin - {$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgWinThread.SetRegisterValue');{$ENDIF} + //{$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgWinThread.SetRegisterValue');{$ENDIF} assert(MDebugEvent.dwProcessId <> 0, 'TDbgWinThread.SetRegisterValue: MDebugEvent.dwProcessId <> 0'); if not ReadThreadState then @@ -1821,7 +1821,7 @@ end; function TDbgWinThread.GetInstructionPointerRegisterValue: TDbgPtr; begin - {$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgWinThread.GetInstructionPointerRegisterValue');{$ENDIF} + //{$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgWinThread.GetInstructionPointerRegisterValue');{$ENDIF} assert(MDebugEvent.dwProcessId <> 0, 'TDbgWinThread.GetInstructionPointerRegisterValue: MDebugEvent.dwProcessId <> 0'); Result := 0; @@ -1840,7 +1840,7 @@ end; function TDbgWinThread.GetStackBasePointerRegisterValue: TDbgPtr; begin - {$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgWinThread.GetStackBasePointerRegisterValue');{$ENDIF} + //{$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgWinThread.GetStackBasePointerRegisterValue');{$ENDIF} assert(MDebugEvent.dwProcessId <> 0, 'TDbgWinThread.GetStackBasePointerRegisterValue: MDebugEvent.dwProcessId <> 0'); Result := 0; @@ -1859,7 +1859,7 @@ end; function TDbgWinThread.GetStackPointerRegisterValue: TDbgPtr; begin - {$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgWinThread.GetStackPointerRegisterValue');{$ENDIF} + //{$IFDEF FPDEBUG_THREAD_CHECK}AssertFpDebugThreadId('TDbgWinThread.GetStackPointerRegisterValue');{$ENDIF} assert(MDebugEvent.dwProcessId <> 0, 'TDbgWinThread.GetStackPointerRegisterValue: MDebugEvent.dwProcessId <> 0'); Result := 0;