jcl-checkins-diff Mailing List for JEDI Code Library (Page 79)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1933
          http://svn.sourceforge.net/jcl/?rev=1933&view=rev
Author:   ahuser
Date:     2007-02-15 13:02:59 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
Added false positive elimination

Modified Paths:
--------------
    trunk/jcl/source/common/JclResources.pas
    trunk/jcl/source/windows/JclDebug.pas

Modified: trunk/jcl/source/common/JclResources.pas
===================================================================

--- trunk/jcl/source/common/JclResources.pas	2007-02-15 19:32:00 UTC (rev 1932)
+++ trunk/jcl/source/common/JclResources.pas	2007-02-15 21:02:59 UTC (rev 1933)
@@ -821,10 +821,12 @@
   RsDebugAssertValidString  = 'Invalid string passed to AssertValid';
 
   // TMapFiles
-  RsDebugMapFileExtension = '.map'; // do not localize
   RsDebugNoProcessInfo    = 'Unable to obtain process information';
   RsDebugSnapshot         = 'Failure creating toolhelp32 snapshot';
 
+  // JclDebugInfoExport
+  RsUnknownFunctionAt     = 'Unknown function at %s';
+
 //=== JclDotNet ==============================================================
 resourcestring
   RsEUnknownCLRVersion = '"%s" is not a known CLR version';

Modified: trunk/jcl/source/windows/JclDebug.pas
===================================================================
--- trunk/jcl/source/windows/JclDebug.pas	2007-02-15 19:32:00 UTC (rev 1932)
+++ trunk/jcl/source/windows/JclDebug.pas	2007-02-15 21:02:59 UTC (rev 1933)
@@ -238,17 +238,6 @@
     property LineNumberErrors: Integer read FLineNumberErrors;
   end;
 
-// JCL binary debug data generator and scanner
-const
-  JclDbgDataSignature = $4742444A; // JDBG
-  JclDbgDataResName   = 'JCLDEBUG';
-  JclDbgFileExtension = '.jdbg';
-
-  JclDbgHeaderVersion = 1; // JCL 1.11 and 1.20
-
-  MapFileExtension    = '.map';
-  DrcFileExtension    = '.drc';
-
 type
   PJclDbgHeader = ^TJclDbgHeader;
   TJclDbgHeader = packed record
@@ -416,6 +405,7 @@
   TJclDebugInfoExports = class(TJclDebugInfoSource)
   private
     FBorImage: TJclPeBorImage;
+    function IsAddressInThisExportedFunction(Addr: PByteArray; FunctionStartAddr: Cardinal): Boolean;
   public
     destructor Destroy; override;
     function InitializeSource: Boolean; override;
@@ -665,20 +655,6 @@
 function JclCreateExceptFrameList(AIgnoreLevels: Integer): TJclExceptFrameList;
 function JclLastExceptFrameList: TJclExceptFrameList;
 
-// Global exceptional stack tracker enable routines and variables
-type
-  TJclStackTrackingOption =
-    (stStack, stExceptFrame, stRawMode, stAllModules, stStaticModuleList,
-     stDelayedTrace, stTraceEAbort, stMainThreadOnly);
-  TJclStackTrackingOptions = set of TJclStackTrackingOption;
-
-var
-  JclStackTrackingOptions: TJclStackTrackingOptions = [stStack];
-
-  { JclDebugInfoSymbolPaths specifies a list of paths, separated by ';', in
-    which the DebugInfoSymbol scanner should look for symbol information. }
-  JclDebugInfoSymbolPaths: string = '';
-
 function JclStartExceptionTracking: Boolean;
 function JclStopExceptionTracking: Boolean;
 function JclExceptionTrackingActive: Boolean;
@@ -770,6 +746,31 @@
   EnvironmentVarAlternateNtSymbolPath = '_NT_ALTERNATE_SYMBOL_PATH'; // do not localize
   MaxStackTraceItems = 4096;
 
+// JCL binary debug data generator and scanner
+const
+  JclDbgDataSignature = $4742444A; // JDBG
+  JclDbgDataResName   = 'JCLDEBUG'; // do not localize
+  JclDbgHeaderVersion = 1; // JCL 1.11 and 1.20
+
+  JclDbgFileExtension = '.jdbg'; // do not localize
+  JclMapFileExtension = '.map';  // do not localize
+  DrcFileExtension = '.drc';  // do not localize
+
+// Global exceptional stack tracker enable routines and variables
+type
+  TJclStackTrackingOption =
+    (stStack, stExceptFrame, stRawMode, stAllModules, stStaticModuleList,
+     stDelayedTrace, stTraceEAbort, stMainThreadOnly);
+  TJclStackTrackingOptions = set of TJclStackTrackingOption;
+
+var
+  JclStackTrackingOptions: TJclStackTrackingOptions = [stStack];
+
+  { JclDebugInfoSymbolPaths specifies a list of paths, separated by ';', in
+    which the DebugInfoSymbol scanner should look for symbol information. }
+  JclDebugInfoSymbolPaths: string = '';
+
+
 {$IFDEF UNITVERSIONING}
 const
   UnitVersioning: TUnitVersionInfo = (
@@ -787,7 +788,8 @@
   {$IFDEF MSWINDOWS}
   JclRegistry,
   {$ENDIF MSWINDOWS}
-  JclHookExcept, JclLogic, JclStrings, JclSysInfo, JclSysUtils, JclWin32;
+  JclHookExcept, JclLogic, JclStrings, JclSysInfo, JclSysUtils, JclWin32,
+  JclResources;
 
 //=== Helper assembler routines ==============================================
 
@@ -2766,7 +2768,7 @@
 var
   MapFileName: TFileName;
 begin
-  MapFileName := ChangeFileExt(FileName, MapFileExtension);
+  MapFileName := ChangeFileExt(FileName, JclMapFileExtension);
   Result := FileExists(MapFileName);
   if Result then
     FScanner := TJclMapScanner.Create(MapFileName, Module);
@@ -2837,6 +2839,48 @@
   inherited Destroy;
 end;
 
+function TJclDebugInfoExports.IsAddressInThisExportedFunction(Addr: PByteArray; FunctionStartAddr: Cardinal): Boolean;
+begin
+  Dec(Cardinal(Addr), 6);
+  while Cardinal(Addr) > FunctionStartAddr do
+  begin
+    if (Addr[0] = $C2) and // ret $xxxx
+         (((Addr[3] = $90) and (Addr[4] = $90) and (Addr[5] = $90)) or // nop
+          ((Addr[3] = $CC) and (Addr[4] = $CC) and (Addr[5] = $CC))) then // int 3
+    begin
+      Result := False;
+      Exit;
+    end
+    else
+    if (Addr[0] = $C3) and // ret
+         (((Addr[1] = $90) and (Addr[2] = $90) and (Addr[3] = $90)) or // nop
+          ((Addr[1] = $CC) and (Addr[2] = $CC) and (Addr[3] = $CC))) then // int 3
+    begin
+      Result := False;
+      Exit;
+    end
+    else
+    if (Addr[0] = $E9) and // jmp rel-far
+         (((Addr[5] = $90) and (Addr[6] = $90) and (Addr[7] = $90)) or // nop
+          ((Addr[5] = $CC) and (Addr[6] = $CC) and (Addr[7] = $CC))) then // int 3
+    begin
+      Result := False;
+      Exit;
+    end
+    else
+    if (Addr[0] = $EB) and // jmp rel-near
+         (((Addr[2] = $90) and (Addr[3] = $90) and (Addr[4] = $90)) or // nop
+          ((Addr[2] = $CC) and (Addr[3] = $CC) and (Addr[4] = $CC))) then // int 3
+    begin
+      Result := False;
+      Exit;
+    end;
+
+    Dec(Cardinal(Addr));
+  end;
+  Result := True;
+end;
+
 function TJclDebugInfoExports.GetLocationInfo(const Addr: Pointer; var Info: TJclLocationInfo): Boolean;
 var
   I, BasePos: Integer;
@@ -2890,6 +2934,14 @@
         begin
           Info.Address := Addr;
           Info.DebugInfo := Self;
+
+          { Check if we have a valid address in an exported function. }
+          if not IsAddressInThisExportedFunction(Addr, FModule + Items[I].Address) then
+          begin
+            Info.UnitName := '[' + AnsiLowerCase(ExtractFileName(GetModulePath(FModule))) + ']';
+            Info.ProcedureName := Format(RsUnknownFunctionAt, [Info.ProcedureName]);
+          end;
+
           Break;
         end;
       end;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr (20)	May (48)	Jun (8)	Jul (23)	Aug (41)	Sep (42)	Oct (22)	Nov (17)	Dec (36)
2007	Jan (43)	Feb (42)	Mar (17)	Apr (39)	May (16)	Jun (35)	Jul (37)	Aug (47)	Sep (49)	Oct (9)	Nov (52)	Dec (37)
2008	Jan (48)	Feb (21)	Mar (7)	Apr (2)	May (5)	Jun (17)	Jul (17)	Aug (40)	Sep (58)	Oct (38)	Nov (19)	Dec (32)
2009	Jan (67)	Feb (46)	Mar (54)	Apr (34)	May (37)	Jun (52)	Jul (67)	Aug (72)	Sep (48)	Oct (35)	Nov (27)	Dec (12)
2010	Jan (56)	Feb (46)	Mar (19)	Apr (14)	May (21)	Jun (3)	Jul (13)	Aug (48)	Sep (34)	Oct (51)	Nov (16)	Dec (32)
2011	Jan (36)	Feb (14)	Mar (12)	Apr (3)	May (5)	Jun (24)	Jul (15)	Aug (30)	Sep (21)	Oct (4)	Nov (25)	Dec (23)
2012	Jan (45)	Feb (42)	Mar (19)	Apr (14)	May (13)	Jun (7)	Jul (3)	Aug (46)	Sep (21)	Oct (10)	Nov (2)	Dec
2013	Jan (5)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

jcl-checkins-diff Mailing List for JEDI Code Library (Page 79)

jcl-checkins-diff — SVN file check-in notifications with file differences included