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

DBG: small refactor in start up brk code

Browse Source 
git-svn-id: trunk@36121 -
This commit is contained in:
martin 2012-03-17 16:05:04 +00:00
parent 6742733b9a
commit 9f6e6a8186
1 changed files with 41 additions and 5 deletions

46
debugger/gdbmidebugger.pp
View File

@ -4141,11 +4141,19 @@ function TGDBMIDebuggerCommandStartDebugging.DoExecute: Boolean;
Cmd := '-exec-run';
rval := '';
R.State := dsError;
FTheDebugger.FMainAddrBreak.Clear(Self);
while true do begin
SetMainBrk;
if not FTheDebugger.FMainAddrBreak.Enabled
then exit; // failed to find a main breakpoint
then begin
(* TODO:
If no main break can be set, it may still be possible (desirable) to run
the app, without debug-capacbilities
*)
SetDebuggerState(dsError);
exit; // failed to find a main breakpoint
end;
// RUN
if not ExecuteCommand(Cmd, R)
@ -4159,6 +4167,11 @@ function TGDBMIDebuggerCommandStartDebugging.DoExecute: Boolean;
if R.State = dsRun
then begin
ProcessRunning(s2, R);
if pos('reason="exited-normally"', s2) > 0 then begin
// app has already run
R.State := dsStop;
break;
end;
R.State := dsRun; // restore cmd state
s := s + s2 + R.Values;
Cmd := '-exec-continue'; // untill we hit one of the breakpoints
@ -4181,16 +4194,31 @@ function TGDBMIDebuggerCommandStartDebugging.DoExecute: Boolean;
end;
if R.State <> dsRun
if DebuggerState = dsError then
exit;
if not(R.State in [dsRun, dsStop])
then begin
SetDebuggerState(dsError);
exit;
end;
FTheDebugger.FMainAddrBreak.Clear(Self);
if R.State = dsStop then begin
{$IFDEF DBG_VERBOSE}
debugln('Debugger INIT failed. App has already run');
{$ENDIF}
SetDebuggerState(dsError);
exit;
//if (DebuggerState = dsStop) then // and (tfHasSymbols in TargetInfo^.TargetFlags)
// SetDebuggerState(dsInit); // make sure state changes are triggered
//SetDebuggerState(dsStop);
//exit;
end;
SetDebuggerState(dsRun); // TODO: should not be needed here
FTheDebugger.FMainAddrBreak.Clear(Self);
// and we should ave hit a breakpoint
//List := TGDBMINameValueList.Create(R.Values);
//Reason := List.Values['reason'];
@ -4226,6 +4254,7 @@ function TGDBMIDebuggerCommandStartDebugging.DoExecute: Boolean;
if Result <> 0 then exit;
end;
SetDebuggerState(dsError); // no PID found
end;
var
@ -4349,7 +4378,11 @@ begin
TargetInfo^.TargetPID := RunToMain(EntryPoint);
if DebuggerState = dsError
then exit;
then begin
Result := False;
FSuccess := False;
Exit;
end;
if TargetInfo^.TargetPID = 0
then begin
@ -4359,6 +4392,9 @@ begin
Exit;
end;
//if DebuggerState = dsStop
//then exit;
DebugLn('[Debugger] Target PID: %u', [TargetInfo^.TargetPID]);
// they may still exist from prev run, addr will be checked