Changeset 418

Timestamp:

Sep 4, 2012, 1:16:13 PM (12 years ago)

Author:

chronos

Message:

• Fixed: Show debug info from external debug file in exception handling.

File:

• ExceptionLogger/CustomLineInfo.pas (modified) (2 diffs)

ExceptionLogger/CustomLineInfo.pas

@@ -71 +71 @@
   dirstab,              { stab with current directory info }
   filestab   : tstab;   { stab with current file info }
-  filename,
-  dbgfn : shortstring;
-
+  filename: shortstring;
+  dbgfn : string;
+
+
+var
+  Crc32Tbl : array[0..255] of cardinal;
+
+procedure MakeCRC32Tbl;
+var
+  crc : cardinal;
+  i,n : integer;
+begin
+  for i:=0 to 255 do
+   begin
+     crc:=i;
+     for n:=1 to 8 do
+      if (crc and 1)<>0 then
+       crc:=(crc shr 1) xor cardinal($edb88320)
+      else
+       crc:=crc shr 1;
+     Crc32Tbl[i]:=crc;
+   end;
+end;
+
+Function UpdateCrc32(InitCrc:cardinal;const InBuf;InLen:LongInt):cardinal;
+  var
+    i : LongInt;
+    p : pchar;
+  begin
+    if Crc32Tbl[1]=0 then
+     MakeCrc32Tbl;
+    p:=@InBuf;
+    Result:=not InitCrc;
+    for i:=1 to InLen do
+     begin
+       UpdateCrc32:=Crc32Tbl[byte(Result) xor byte(p^)] xor (Result shr 8);
+       inc(p);
+     end;
+    Result:=not Result;
+  end;
+
+  function CheckDbgFile(var e:TExeFile;const fn:string;dbgcrc:cardinal):boolean;
+  var
+    c      : cardinal;
+    ofm    : word;
+    g      : file;
+  begin
+    CheckDbgFile:=false;
+    assign(g,fn);
+    {$I-}
+     ofm:=filemode;
+     filemode:=$40;
+     reset(g,1);
+     filemode:=ofm;
+    {$I+}
+    if ioresult<>0 then
+     exit;
+    { We reuse the buffer from e here to prevent too much stack allocation }
+    c:=0;
+    repeat
+      blockread(g,e.buf,e.bufsize,e.bufcnt);
+      c:=UpdateCrc32(c,e.buf,e.bufcnt);
+    until e.bufcnt<e.bufsize;
+    close(g);
+    CheckDbgFile:=(dbgcrc=c);
+  end;
+
+  function ReadDebugLink(var e:TExeFile;var dbgfn:string):boolean;
+  var
+    dbglink : array[0..512] of char;
+    i,
+    dbglinklen,
+    dbglinkofs : longint;
+    dbgcrc     : cardinal;
+  begin
+    ReadDebugLink:=false;
+    if not FindExeSection(e,'.gnu_debuglink',dbglinkofs,dbglinklen) then
+      exit;
+    if dbglinklen>sizeof(dbglink)-1 then
+      exit;
+    fillchar(dbglink,sizeof(dbglink),0);
+    seek(e.f,dbglinkofs);
+    blockread(e.f,dbglink,dbglinklen);
+    dbgfn:=strpas(dbglink);
+    if length(dbgfn)=0 then
+      exit;
+    i:=align(length(dbgfn)+1,4);
+    if (i+4)>dbglinklen then
+      exit;
+    move(dbglink[i],dbgcrc,4);
+    { current dir }
+    if CheckDbgFile(e,dbgfn,dbgcrc) then
+      begin
+        ReadDebugLink:=true;
+        exit;
+      end;
+    { executable dir }
+    i:=length(e.filename);
+    while (i>0) and not(e.filename[i] in AllowDirectorySeparators) do
+      dec(i);
+    if i>0 then
+      begin
+        dbgfn:=copy(e.filename,1,i)+dbgfn;
+        if CheckDbgFile(e,dbgfn,dbgcrc) then
+          begin
+            ReadDebugLink:=true;
+            exit;
+          end;
+      end;
+  end;
 
 function OpenStabs(addr : pointer) : boolean;
@@ -243 +350 @@
       Delete(func,i,255);
    end;
-  if e.isopen then
-    CloseStabs;
+//  if e.isopen then
+//    CloseStabs;
   GetLineInfo:=true;
 end;