paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-11 01:19:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Removed some ifdefs

Browse Source 
* Aligned GCurrentcontext

git-svn-id: trunk@9155 -
This commit is contained in:
marc 2006-04-21 18:51:31 +00:00
parent f5574b19f9
commit 54214d098c
2 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debugger/windebug/fpwd/fpwdglobal.pas
View File

@ -57,6 +57,7 @@ var
GCurrentProcess: TDbgProcess = nil;
GCurrentThread: TDbgThread = nil;
GProcessMap: TMap;
function GetProcess(const AID: Integer; var AProcess: TDbgProcess): Boolean;
@ -69,6 +70,7 @@ begin
// then Log('Unknown Process ID %u', [AID]);
end;
var
_UnAligendContext: record
C: TContext;
@ -76,13 +78,12 @@ var
end;
initialization
GState := dsStop;
GProcessMap := TMap.Create(itu4, SizeOf(TDbgProcess));
PtrUInt(GCurrentContext) := (PtrUInt(@_UnAligendContext) + 15) and not PtrUInt($F);
GCurrentContext := Pointer((PtrUInt(@_UnAligendContext) + 15) and not PtrUInt($F));
finalization
FreeAndNil(GProcessMap)

47
debugger/windebug/fpwd/fpwdloop.pas
View File

@ -1,4 +1,4 @@
{ $Id $ }
{ $Id$ }
{
---------------------------------------------------------------------------
fpwdloop.pas - FP standalone windows debugger - Debugger main loop
@ -59,11 +59,9 @@ begin
WriteLN(Format('hProcess: 0x%x', [AEvent.CreateProcessInfo.hProcess]));
WriteLN(Format('hThread: 0x%x', [AEvent.CreateProcessInfo.hThread]));
WriteLN('Base adress: ', FormatAdress(AEvent.CreateProcessInfo.lpBaseOfImage));
// WriteLN('Base adress64: $', IntToHex(PInt64(@AEvent.CreateProcessInfo.lpBaseOfImage)^, 16));
WriteLN(Format('Debugsize: %d', [AEvent.CreateProcessInfo.nDebugInfoSize]));
WriteLN(Format('Debugoffset: %d', [AEvent.CreateProcessInfo.dwDebugInfoFileOffset]));
if AEvent.CreateProcessInfo.lpBaseOfImage <> nil
then DumpPEImage(AEvent.CreateProcessInfo.hProcess, TDbgPtr(AEvent.CreateProcessInfo.lpBaseOfImage));
@ -81,6 +79,8 @@ begin
end;
procedure HandleException(const AEvent: TDebugEvent);
const
PARAMCOLS = 12 - SizeOf(Pointer);
var
N: Integer;
Info0: QWORD;
@ -116,39 +116,26 @@ begin
else
Write(' Unknown code: ', AEvent.Exception.ExceptionRecord.ExceptionCode);
end;
{$ifdef cpui386}
Info0 := Cardinal(AEvent.Exception.ExceptionRecord.ExceptionAddress);
{$else}
Info0 := AEvent.Exception64.ExceptionRecord.ExceptionAddress;
{$endif}
Info0 := PtrUInt(AEvent.Exception.ExceptionRecord.ExceptionAddress);
Write(' at: ', FormatAdress(Info0));
Write(' Flags:', Format('%x', [AEvent.Exception.ExceptionRecord.ExceptionFlags]), ' [');
if AEvent.Exception.ExceptionRecord.ExceptionFlags = 0
then Write('Continuable')
else Write('Not continuable');
Write(']');
{$ifdef cpui386}
Write(' ParamCount:', AEvent.Exception.ExceptionRecord.NumberParameters);
{$else}
Write(' ParamCount:', AEvent.Exception64.ExceptionRecord.NumberParameters);
{$endif}
case AEvent.Exception.ExceptionRecord.ExceptionCode of
EXCEPTION_ACCESS_VIOLATION: begin
{$ifdef cpui386}
Info0 := AEvent.Exception.ExceptionRecord.ExceptionInformation[0];
Info1Str := IntToHex(AEvent.Exception.ExceptionRecord.ExceptionInformation[1], 8);
{$else}
Info0 := AEvent.Exception64.ExceptionRecord.ExceptionInformation[0];
Info1Str := IntToHex(AEvent.Exception64.ExceptionRecord.ExceptionInformation[1], 16);
{$endif}
Info1Str := FormatAdress(AEvent.Exception.ExceptionRecord.ExceptionInformation[1]);
case Info0 of
0: begin
Write(' Read of address: $', Info1Str);
Write(' Read of address: ', Info1Str);
end;
1: begin
Write(' Write of address: $', Info1Str);
Write(' Write of address: ', Info1Str);
end;
end;
end;
@ -156,29 +143,16 @@ begin
WriteLN;
Write(' Info: ');
{$ifdef cpui386}
with AEvent.Exception.ExceptionRecord do
for n := Low(ExceptionInformation) to high(ExceptionInformation) do
begin
Write(IntToHex(ExceptionInformation[n], 8), ' ');
if n and 7 = 7
Write(IntToHex(ExceptionInformation[n], SizeOf(Pointer) * 2), ' ');
if n and (PARAMCOLS - 1) = (PARAMCOLS - 1)
then begin
WriteLN;
Write(' ');
end;
end;
{$else}
with AEvent.Exception64.ExceptionRecord do
for n := Low(ExceptionInformation) to high(ExceptionInformation) do
begin
Write(IntToHex(ExceptionInformation[n], 16), ' ');
if n and 3 = 3
then begin
WriteLN;
Write(' ');
end;
end;
{$endif}
WriteLn;
GState := dsPause;
end;
@ -333,7 +307,6 @@ begin
end;
if not WaitForDebugEvent(MDebugEvent, 10) then Continue;
GCurrentProcess := nil;
GCurrentThread := nil;
if not GetProcess(MDebugEvent.dwProcessId, GCurrentPRocess) and (GMainProcess <> nil) then Continue;
@ -347,7 +320,7 @@ begin
else WriteLN('LOOP: ID:', MDebugEvent.dwTHreadID, ' -> H:', GCurrentThread.Handle);
end;
FillChar(GCurrentContext, SizeOf(GCurrentContext), $EE);
FillChar(GCurrentContext^, SizeOf(GCurrentContext^), $EE);
if GCurrentThread <> nil
then begin