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

fpDebug: Revert of files accidentally committed in r46119 #afc3882ca7

Browse Source 
git-svn-id: trunk@46120 -
This commit is contained in:
joost 2014-09-03 14:44:07 +00:00
parent afc3882ca7
commit d28ad93b73
6 changed files with 14 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/fpdebug/app/fpd/fpd.lpi
View File

@ -31,8 +31,6 @@
<RunParams> <RunParams>
<local> <local>
<FormatVersion Value="1"/> <FormatVersion Value="1"/>
<CommandLineParams Value="\home\CNOC\joost\svn\ranger\newserver\RangerServer2"/>
<LaunchingApplication PathPlusParams="\usr\bin\gnome-terminal -e $(TargetCmdLine)"/>
</local> </local>
</RunParams> </RunParams>
<RequiredPackages Count="1"> <RequiredPackages Count="1">
@ -40,11 +38,16 @@
<PackageName Value="fpdebug"/> <PackageName Value="fpdebug"/>
</Item1> </Item1>
</RequiredPackages> </RequiredPackages>
<Units Count="1"> <Units Count="2">
<Unit0> <Unit0>
<Filename Value="fpd.lpr"/> <Filename Value="fpd.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit0> </Unit0>
<Unit1>
<Filename Value="..\dbgclasses.pp"/>
<IsPartOfProject Value="True"/>
<UnitName Value="dbgclasses"/>
</Unit1>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
@ -57,33 +60,17 @@
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Parsing>
<SyntaxOptions>
<IncludeAssertionCode Value="True"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<Checks>
<IOChecks Value="True"/>
<RangeChecks Value="True"/>
<OverflowChecks Value="True"/>
<StackChecks Value="True"/>
</Checks>
<VerifyObjMethodCallValidity Value="True"/>
<TargetCPU Value="x86_64"/>
</CodeGeneration>
<Linking> <Linking>
<Debugging>
<DebugInfoType Value="dsDwarf3"/>
<UseHeaptrc Value="True"/>
<TrashVariables Value="True"/>
</Debugging>
<Options> <Options>
<PassLinkerOptions Value="True"/>
<LinkerOptions Value="-sectcreate __TEXT __info_plist Info.plist"/> <LinkerOptions Value="-sectcreate __TEXT __info_plist Info.plist"/>
</Options> </Options>
</Linking> </Linking>
<Other> <Other>
<CustomOptions Value="-dFPDBG_DWARF_VERBOSE -dFPDBG_DWARF_SEARCH"/> <CompilerMessages>
<MsgFileName Value=""/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other> </Other>
</CompilerOptions> </CompilerOptions>
<Debugging> <Debugging>

2
components/fpdebug/app/fpd/fpdcommand.pas
View File

@ -692,7 +692,7 @@ begin
end; end;
WriteLN('Callstack:'); WriteLN('Callstack:');
//ACallStack := GController.CurrentProcess.MainThread.CreateCallStackEntryList; ACallStack := GController.CurrentProcess.MainThread.CreateCallStackEntryList;
try try
for i := 0 to ACallStack.Count-1 do for i := 0 to ACallStack.Count-1 do
begin begin

2
components/fpdebug/fpdbgclasses.pp
View File

@ -648,8 +648,6 @@ function TDbgProcess.AddBreak(const ALocation: TDbgPtr): TDbgBreakpoint;
begin begin
Result := OSDbgClasses.DbgBreakpointClass.Create(Self, ALocation); Result := OSDbgClasses.DbgBreakpointClass.Create(Self, ALocation);
FBreakMap.Add(ALocation, Result); FBreakMap.Add(ALocation, Result);
if (GetInstructionPointerRegisterValue=ALocation) and not assigned(FCurrentBreakpoint) then
FCurrentBreakpoint := Result;
end; end;
constructor TDbgProcess.Create(const AName: string; const AProcessID, AThreadID: Integer; AOnLog: TOnLog); constructor TDbgProcess.Create(const AName: string; const AProcessID, AThreadID: Integer; AOnLog: TOnLog);

2
components/fpdebug/fpdbgdwarfdataclasses.pas
View File

@ -1045,7 +1045,7 @@ var
else else
begin // append to existing begin // append to existing
GapAvail := FTableListGaps[ATableListIndex].EndTable; GapAvail := FTableListGaps[ATableListIndex].EndTable;
//assert(AEntry^.EndIndex + AEntry^.LeadHigh - AEntry^.LeadLow + 1 + GapAvail <= FEndTableNextFreeIndex); assert(AEntry^.EndIndex + AEntry^.LeadHigh - AEntry^.LeadLow + 1 + GapAvail <= FEndTableNextFreeIndex);
AtEnd := AEntry^.EndIndex + AEntry^.EndHigh - AEntry^.EndLow + 1 + GapAvail = FEndTableNextFreeIndex; AtEnd := AEntry^.EndIndex + AEntry^.EndHigh - AEntry^.EndLow + 1 + GapAvail = FEndTableNextFreeIndex;
ANeeded := ALeadByte - AEntry^.EndHigh; ANeeded := ALeadByte - AEntry^.EndHigh;

7
components/fpdebug/fpdbglinuxclasses.pas
View File

@ -153,13 +153,8 @@ type
start_stack : dword; start_stack : dword;
signal : longint; signal : longint;
reserved : longint; reserved : longint;
{$ifdef i386}
u_ar0 : ^user_regs_struct32; u_ar0 : ^user_regs_struct32;
u_fpstate : ^user_fpregs_struct32; u_fpstate : ^user_fpregs_struct32;
{$else}
u_ar0 : DWord;
u_fpstate : DWord;
{$endif}
magic : dword; magic : dword;
u_comm : array[0..31] of char; u_comm : array[0..31] of char;
u_debugreg : array[0..7] of longint; u_debugreg : array[0..7] of longint;
@ -352,7 +347,7 @@ begin
e := fpgeterrno; e := fpgeterrno;
if e <> 0 then if e <> 0 then
begin begin
log('Failed to read dr'+inttostr(ind)+'-debug register offset '+inttostr(qword(GetDebugRegOffset(ind)))+'. Errcode: '+inttostr(e)); log('Failed to read dr'+inttostr(ind)+'-debug register. Errcode: '+inttostr(e));
result := false; result := false;
end end
else else

27
components/fpdebug/fpdebug.lpk
View File

@ -11,33 +11,6 @@
<OtherUnitFiles Value="."/> <OtherUnitFiles Value="."/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Parsing>
<SyntaxOptions>
<IncludeAssertionCode Value="True"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<Checks>
<IOChecks Value="True"/>
<RangeChecks Value="True"/>
<OverflowChecks Value="True"/>
<StackChecks Value="True"/>
</Checks>
<VerifyObjMethodCallValidity Value="True"/>
</CodeGeneration>
<Linking>
<Debugging>
<DebugInfoType Value="dsDwarf3"/>
<UseHeaptrc Value="True"/>
<TrashVariables Value="True"/>
</Debugging>
</Linking>
<Other>
<CustomOptions Value="-dFPDBG_DWARF_VERBOSE
-dFPDBG_DWARF_VERBOSE_LOAD
-dFPDBG_DWARF_WARNINGS
-aln"/>
</Other>
</CompilerOptions> </CompilerOptions>
<Description Value="A set of helperclasses for implementing a debugger. <Description Value="A set of helperclasses for implementing a debugger.