Changeset 2859 for trunk/kLdr/kLdr.h

Timestamp:

Nov 6, 2006, 5:48:53 AM (19 years ago)

Author:

bird

Message:

More debugging.

File:

• trunk/kLdr/kLdr.h (modified) (10 diffs)

trunk/kLdr/kLdr.h

@@ -64 +64 @@
 #define NIL_KLDRADDR    (~(uint64_t)0)
 
+/** @def PRI_KLDRADDR
+ * printf format type. */
+#ifdef _MSC_VER
+# define PRI_KLDRADDR    "I64x"
+#else
+# define PRI_KLDRADDR    "llx"
+#endif
+
+
 /** The kLdr size type. */
 typedef uint64_t KLDRSIZE;
@@ -70 +79 @@
 /** Pointer to a const kLdr size. */
 typedef const KLDRSIZE *PCKLDRSIZE;
+
+/** @def PRI_KLDRSIZE
+ * printf format type. */
+#ifdef _MSC_VER
+# define PRI_KLDRSIZE    "I64x"
+#else
+# define PRI_KLDRSIZE    "llx"
+#endif
 
 
@@ -404 +421 @@
      * Set to -1 if no file backing (like BSS). */
     off_t           cbFile;
+    /** The relative virtual address when mapped.
+     * Set to NIL_KLDRADDR if the segment isn't supposed to be mapped. */
+    KLDRADDR        RVA;
+    /** The size of the segment including the alignment gap up to the next segment when mapped. */
+    size_t          cbMapped;
     /** The address the segment was mapped at by kLdrModMap().
      * Set to 0 if not mapped. */
     uintptr_t       MapAddress;
-    /** The size of the segment including the alignment gap up to the next segment when mapped. */
-    size_t          cbMapped;
 } KLDRSEG;
 /** Pointer to a loader segment. */
@@ -551 +571 @@
 /** Special import module ordinal value used to indicate that there is no
  * specific module associated with the requested symbol. */
-#define NIL_KLDRMOD_IMPORT                 (~(uint32_t)0)
+#define NIL_KLDRMOD_IMPORT                  (~(uint32_t)0)
 
 /** Special symbol ordinal value used to indicate that the symbol
  * only has a string name. */
-#define NIL_KLDRMOD_SYM_ORDINAL            (~(uint32_t)0)
+#define NIL_KLDRMOD_SYM_ORDINAL             (~(uint32_t)0)
 
 
@@ -601 +621 @@
  * @param   pMod        The module which fixups are begin applied.
  * @param   iImport     The import module ordinal number or NIL_KLDRMOD_IMPORT.
- * @param   uSymbol     The symbol ordinal number or NIL_KLDRMOD_SYM_ORDINAL.
- * @param   pszSymbol   The symbol name. Can be NULL if uSymbol isn't nil.
+ * @param   iSymbol     The symbol ordinal number or NIL_KLDRMOD_SYM_ORDINAL.
+ * @param   pszSymbol   The symbol name. Can be NULL if iSymbol isn't nil.
  * @param   puValue     Where to store the symbol value.
  * @param   pfKind      Where to store the symbol kind flags.
  * @param   pvUser      The user parameter specified to the relocation function.
  */
-typedef int FNKLDRMODGETIMPORT(PKLDRMOD pMod, uint32_t iImport, uint32_t uSymbol, const char *pszSymbol,
+typedef int FNKLDRMODGETIMPORT(PKLDRMOD pMod, uint32_t iImport, uint32_t iSymbol, const char *pszSymbol,
                                PKLDRADDR puValue, uint32_t *pfKind, void *pvUser);
 /** Pointer to a import callback. */
@@ -619 +639 @@
  *
  * @param   pMod        The module which symbols are being enumerated.s
- * @param   uSymbol     The symbol ordinal number or NIL_KLDRMOD_SYM_ORDINAL.
+ * @param   iSymbol     The symbol ordinal number or NIL_KLDRMOD_SYM_ORDINAL.
  * @param   pszSymbol   The symbol name. This can be NULL if there is a symbol ordinal.
  *                      This can also be an empty string if the symbol doesn't have a name
@@ -627 +647 @@
  * @param   pvUser      The user parameter specified to kLdrModEnumSymbols().
  */
-typedef int FNKLDRMODENUMSYMS(PKLDRMOD pMod, uint32_t uSymbol, const char *pszSymbol,
+typedef int FNKLDRMODENUMSYMS(PKLDRMOD pMod, uint32_t iSymbol, const char *pszSymbol,
                               KLDRADDR uValue, uint32_t fKind, void *pvUser);
 /** Pointer to a symbol enumerator callback. */
@@ -652 +672 @@
  */
 typedef int FNKLDRENUMDBG(PKLDRMOD pMod, uint32_t iDbgInfo, KLDRDBGINFOTYPE enmType, int16_t iMajorVer, int16_t iMinorVer,
-                          off_t offFile, KLDRADDR LinkAddress, off_t cb, const char *pszExtFile, void *pvUser);
+                          off_t offFile, KLDRADDR LinkAddress, KLDRSIZE cb, const char *pszExtFile, void *pvUser);
 /** Pointer to a debug info enumberator callback. */
 typedef FNKLDRENUMDBG *PFNKLDRENUMDBG;
@@ -661 +681 @@
 int     kLdrModClose(PKLDRMOD pMod);
 
-int     kLdrModQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t uSymbol,
+int     kLdrModQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t iSymbol,
                            const char *pszSymbol, PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser,
                            PKLDRADDR puValue, uint32_t *pfKind);
@@ -730 +750 @@
 
     /** @copydoc kLdrModQuerySymbol */
-    int (* pfnQuerySymbol)(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t uSymbol,
+    int (* pfnQuerySymbol)(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t iSymbol,
                            const char *pszSymbol, PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser,
                            PKLDRADDR puValue, uint32_t *pfKind);