Changeset 3530 for trunk/kDbg/kDbgModPE.cpp

Timestamp:

Aug 20, 2007, 5:42:03 AM (18 years ago)

Author:

bird

Message:

Made the generic pe module build too.

File:

• trunk/kDbg/kDbgModPE.cpp (moved) (moved from trunk/kDbg/kDbgModPE-generic.cpp ) (15 diffs)

trunk/kDbg/kDbgModPE.cpp

@@ -31 +31 @@
 #include "kDbgInternal.h"
 #include <kLdrModPE.h>
+#include <string.h>
 
 
@@ -72 +73 @@
                         ("off=" PRI_KDBGADDR " VirtualSize=%x\n", off, pModPe->aSections[iSegment].Misc.VirtualSize),
                         KDBG_ERR_INVALID_ADDRESS);
-        *puRVA = pModPe->aSections[iSegment].VirtualAddress + off;
+        *puRVA = pModPe->aSections[iSegment].VirtualAddress + (uint32_t)off;
         return 0;
     }
@@ -80 +81 @@
         kDbgAssertMsgReturn(off < pModPe->cbImage, ("off=" PRI_KDBGADDR ", cbImage=%x\n", off, pModPe->cbImage),
                             KDBG_ERR_INVALID_ADDRESS);
-        *puRVA = off;
+        *puRVA = (uint32_t)off;
         return 0;
     }
@@ -119 +120 @@
  * @copydoc KDBGMODOPS::pfnQueryLine
  */
-static int rtDbgModPEQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
+static int kDbgModPeQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
 {
     PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
@@ -150 +151 @@
         }
 #endif
-        rc = VERR_NOT_IMPLEMENTED;
+        rc = KDBG_ERR_NOT_IMPLEMENTED;
     }
     return rc;
@@ -159 +160 @@
  * @copydoc KDBGMODOPS::pfnQuerySymbol
  */
-static int rtDbgModPEQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
+static int kDbgModPeQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
 {
     PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
@@ -175 +176 @@
         {
             SYMBOL_INFO Sym;
-            char        achBuffer[sizeof(SYMBOL_INFO) + RTDBG_SYMBOL_MAX];
+            char        achBuffer[sizeof(SYMBOL_INFO) + KDBG_SYMBOL_MAX];
         } Buf;
         Buf.Sym.SizeOfStruct = sizeof(SYMBOL_INFO);
-        Buf.Sym.MaxNameLen = RTDBG_SYMBOL_MAX;
+        Buf.Sym.MaxNameLen = KDBG_SYMBOL_MAX;
         if (g_pfnSymFromAddr(pModPe->hSymInst, pModPe->ImageBase + uRVA, &off, &Buf.Sym))
         {
@@ -193 +194 @@
             if ((Buf.Sym.Flags & (SYMFLAG_VALUEPRESENT | SYMFLAG_CONSTANT)) == (SYMFLAG_VALUEPRESENT | SYMFLAG_CONSTANT))
             {
-                pSym->iSegment   = RTDBGSEG_ABS;
+                pSym->iSegment   = KDBGSEG_ABS;
                 pSym->offSegment = (KDBGADDR)Buf.Sym.Value;
                 pSym->RVA        = (KDBGADDR)Buf.Sym.Value;
@@ -214 +215 @@
         }
 #endif
-        rc = VERR_NOT_IMPLEMENTED;
+        rc = KDBG_ERR_NOT_IMPLEMENTED;
     }
     return rc;
@@ -223 +224 @@
  * @copydoc KDBGMODOPS::pfnClose
  */
-static int rtDbgModPEClose(PKDBGMOD pMod)
+static int kDbgModPeClose(PKDBGMOD pMod)
 {
     PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
@@ -234 +235 @@
     //kDbgAssertMsgFailed(("SymInitialize failed: Err=%d rc=%Rrc\n", Err, rc));
     //return rc;
-    return VERR_NOT_IMPLEMENTED;
+    return KDBG_ERR_NOT_IMPLEMENTED;
 }
 
@@ -241 +242 @@
  * Methods for a PE module.
  */
-static const KDBGMODOPS g_rtDbgModPEOps =
-{
-    "PE (dbghelp)",
-    rtDbgModPEClose,
-    rtDbgModPEQuerySymbol,
-    rtDbgModPEQueryLine
+static const KDBGMODOPS g_kDbgModPeOps =
+{
+    "PE",
+    kDbgModPeClose,
+    kDbgModPeQuerySymbol,
+    kDbgModPeQueryLine
 };
 
@@ -267 +268 @@
      */
     IMAGE_FILE_HEADER FHdr;
-    int rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
-    AssertRCReturn(rc, rc);
+    int rc = kDbgHlpReadAt(pFile, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr));
+    kDbgAssertRCReturn(rc, rc);
 
     uint32_t cbImage;
     if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32))
-        rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
-                          &cbImage, sizeof(cbImage), NULL);
+        rc = kDbgHlpReadAt(pFile, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
+                           &cbImage, sizeof(cbImage));
     else if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER64))
-        rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
-                          &cbImage, sizeof(cbImage), NULL);
+        rc = kDbgHlpReadAt(pFile, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
+                           &cbImage, sizeof(cbImage));
     else
-        AssertFailedReturn(VERR_BAD_EXE_FORMAT);
-    AssertRCReturn(rc, rc);
+        kDbgAssertFailedReturn(KDBG_ERR_BAD_EXE_FORMAT);
+    kDbgAssertRCReturn(rc, rc);
 
     /*
      * Allocate the module and read/construct the section headers.
      */
-    PKDBGMODPE pModPe = (PKDBGMODPE)RTMemAlloc(KDBG_OFFSETOF(KDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
-    AssertReturn(pModPe, KDBG_ERR_NO_MEMORY);
+    PKDBGMODPE pModPe = (PKDBGMODPE)kDbgHlpAlloc(KDBG_OFFSETOF(KDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
+    kDbgAssertReturn(pModPe, KDBG_ERR_NO_MEMORY);
     pModPe->Core.u32Magic   = KDBGMOD_MAGIC;
-    pModPe->Core.pOps       = &g_rtDbgModPEOps;
-    pModPe->Core.File       = File;
+    pModPe->Core.pOps       = &g_kDbgModPeOps;
+    pModPe->Core.pFile      = pFile;
     pModPe->cbImage         = cbImage;
     pModPe->cSections       = 1 + FHdr.NumberOfSections;
-    rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
-                      &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections, NULL);
+    rc = kDbgHlpReadAt(pFile, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
+                       &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections);
     if (!rc)
     {
@@ -345 +346 @@
             g_pfnSymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | SYMOPT_ALLOW_ABSOLUTE_SYMBOLS);
 
-            RTFileSeek(File, 0, RTFILE_SEEK_BEGIN, NULL); /* don't know if this is required or not... */
+            kDbgHlpSeek(pFile, 0); /* don't know if this is required or not... */
             DWORD64 ImageBase = g_pfnSymLoadModule64(hSymInst, (HANDLE)File, pszModulePath, NULL, 0x00400000, 0);
             if (ImageBase)
@@ -367 +368 @@
         }
 #endif
-        rc = VERR_NOT_IMPLEMENTED;
+        rc = KDBG_ERR_NOT_IMPLEMENTED;
     }
     else
-        AssertRC(rc);
+        kDbgAssertRC(rc);
 
     kDbgHlpFree(pModPe);