Changeset 3528

Timestamp:

Aug 20, 2007, 4:43:13 AM (18 years ago)

Author:

bird

Message:

Some refactoring and OS abstraction by instroducing kDbgHlp.

Location:

trunk/kDbg

Files:

• Makefile.kmk (copied) (copied from trunk/kProfile/Makefile.kmk ) (2 diffs, 2 props)
• kDbg.h (copied) (copied from trunk/kProfile/dbg.h ) (17 diffs, 2 props)
• kDbgBase.h (copied) (copied from trunk/kProfile/kDbgBase.h ) (3 diffs, 1 prop)
• kDbgHlp.h (added)
• kDbgHlpCrt.cpp (added)
• kDbgInternal.h (copied) (copied from trunk/kProfile/DBGInternal.h ) (7 diffs, 2 props)
• kDbgLine.cpp (copied) (copied from trunk/kProfile/dbgline.cpp ) (4 diffs, 2 props)
• kDbgModPE-generic.cpp (copied) (copied from trunk/kProfile/dbgModPE-generic.cpp ) (18 diffs, 2 props)
• kDbgModPE-win.cpp (copied) (copied from trunk/kProfile/dbgModPE-win.cpp ) (26 diffs, 2 props)
• kDbgModule.cpp (copied) (copied from trunk/kProfile/dbgmodule.cpp ) (11 diffs, 2 props)
• kDbgSymbol.cpp (copied) (copied from trunk/kProfile/dbgsymbol.cpp ) (4 diffs, 2 props)

trunk/kDbg/Makefile.kmk

@@ -1 @@
-# $Id: $
+# $Id$
 ## @file
+# kDbg - The Debug Info Reader.
 #
-# kProfiler Mark 2
+
 #
-# Copyright (c) 2006 knut st. osmundsen <bird-src-spam@anduin.net.de>
-#
+# Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
 #
 # This file is part of kLIBC.
@@ -28 +28 @@
 include $(PATH_KBUILD)/header.kmk
 
-#LIBRARIES   = kPrf2GC kPrf2R0
-DLLS        = kPrf2
-PROGRAMS    = kPrf2Read
-
+#
+# kDbg - The profiler module.
+#
+DLLS += kDbg
+kDbg_TEMPLATE = kStuffDLL
+kDbg_DEFS = KDBG_BUILDING KDBG_RESIDES_IN_DLL
+kDbg_INCS = ../kLdr
+kDbg_SOURCES := \
+        kDbgModule.cpp \
+        kDbgModPE-$(if $(eq $(BUILD_TARGET),win),win,generic).cpp \
+        \
+        kDbgLine.cpp \
+        \
+        kDbgSymbol.cpp \
+        \
+        kDbgHlpCrt.cpp
 
 #
-# Our template.
+# kDbgStatic - The profiler module.
 #
-TEMPLATE_kPrf2 = kProfiler Template
-TEMPLATE_kPrf2_TOOL             = GCC3
-TEMPLATE_kPrf2_TOOL.os2         = GCC3OMF
-TEMPLATE_kPrf2_TOOL.win.x86     = VCC70
-TEMPLATE_kPrf2_TOOL.win.amd64   = VCC80AMD64
-TEMPLATE_kPrf2_ASTOOL           = YASM
-TEMPLATE_kPrf2_ASTOOL.os2       = NASM
+LIBRARIES += kDbgStatic
+kDbgStatic_TEMPLATE = kStuffLIB
+kDbgStatic_DEFS = KDBG_BUILDING
+kDbgStatic_INCS = ../kLdr
+kDbgStatic_SOURCES = $(kDbg_SOURCES)
 
-TEMPLATE_kPrf2_SDKS.win         = WINPSDK
-
-TEMPLATE_kPrf2_DEFS.freebsd     = KPRF_OS_FREEBSD
-TEMPLATE_kPrf2_DEFS.linux       = KPRF_OS_LINUX
-TEMPLATE_kPrf2_DEFS.os2         = KPRF_OS_OS2
-TEMPLATE_kPrf2_DEFS.win         = KPRF_OS_WINDOWS
-
-TEMPLATE_kPrf2_CXXFLAGS.freebsd = -g
-TEMPLATE_kPrf2_CXXFLAGS.linux   = -g
-TEMPLATE_kPrf2_CXXFLAGS.os2     = -g
-TEMPLATE_kPrf2_CXXFLAGS.win     = -Zi -Zl -MD -W3 -GF -GR-
-ifneq ($(BUILD_TYPE),debug)
-TEMPLATE_kPrf2_CXXFLAGS.freebsd+= -O3
-TEMPLATE_kPrf2_CXXFLAGS.linux  += -O3
-TEMPLATE_kPrf2_CXXFLAGS.os2    += -O3
-TEMPLATE_kPrf2_CXXFLAGS.win    += -O2xtg -Oi -Ob2
-endif
-
-TEMPLATE_kPrf2_ASFLAGS.freebsd  = -f elf
-TEMPLATE_kPrf2_ASFLAGS.linux    = -f elf
-TEMPLATE_kPrf2_ASFLAGS.os2      = -f omf
-TEMPLATE_kPrf2_ASFLAGS.win.x86  = -f win32 -g cv8
-TEMPLATE_kPrf2_ASFLAGS.win.amd64 = -f win64 -g cv8
-
-#TEMPLATE_kPrf2_INCS.win            = \
-#       $(PATH_DEV)/x86.win32/vcc70/include \
-#       $(PATH_DEV)/x86.win32/sdk200209/include
-
-TEMPLATE_kPrf2_LDFLAGS.freebsd  = -g
-TEMPLATE_kPrf2_LDFLAGS.linux    = -g
-TEMPLATE_kPrf2_LDFLAGS.os2      = -g
-TEMPLATE_kPrf2_LDFLAGS.win      = /DEBUG
-
-TEMPLATE_kPrf2_LIBS.freebsd     =
-TEMPLATE_kPrf2_LIBS.linux       =
-TEMPLATE_kPrf2_LIBS.os2         =
-TEMPLATE_kPrf2_LIBS.win        = \
-        $(PATH_SDK_WINPSDK_LIB)/psapi.Lib
-TEMPLATE_kPrf2_LIBS.win.x86     = \
-        $(PATH_TOOL_VCC70_LIB)/msvcrt.lib \
-        $(PATH_TOOL_VCC70_LIB)/msvcprt.lib \
-        $(PATH_TOOL_VCC70_LIB)/oldnames.lib
-
-
-#
-# kPrf2 - The profiler module.
-#
-kPrf2_TEMPLATE      = kPrf2
-kPrf2_DEFS.x86      = KPRF_BITS=32
-kPrf2_DEFS.amd64    = KPRF_BITS=64
-
-kPrf2_SOURCES       = \
-        kProfileR3.cpp
-#       kProfileGC.cpp
-#       kProfileR0.cpp
-
-kPrf2_SOURCES.win = \
-        dllmain-win.cpp \
-        prf$(BUILD_TARGET_ARCH)msc.asm \
-        kPrf2-win-$(BUILD_TARGET_ARCH).def
-prfx86msc.asm_DEFS.win.x86 = \
-        KPRF_ENTER=_KPrfEnter \
-        KPRF_LEAVE=_KPrfLeave
-
-
-
-#
-# kPrf2Read - The read & producer of statistics.
-#
-kPrf2Read_TEMPLATE = kPrf2
-kPrf2Read_SOURCES  = \
-        kPrf2Read.cpp
-
-# kDbg stuff
-KDBG_ROOT ?= $(PATH_CURRENT)/../kProfile
-kPrf2Read_INCS += $(KDBG_ROOT)
-kPrf2Read_SOURCES += \
-        dbgmodule.cpp \
-        dbgline.cpp \
-        dbgsymbol.cpp
-ifeq ($(BUILD_TARGET),win)
-kPrf2Read_SOURCES.win += dbgModPE-win.cpp
-else
-kPrf2Read_SOURCES += dbgModPE-generic.cpp
-endif
-
-# kLdr stuff
-KLDR_ROOT ?= $(PATH_CURRENT)/../kLdr
-kPrf2Read_INCS += $(KLDR_ROOT)
-
-# IPRT stuff
-VBOX_ROOT ?= y:/coding/vbox/svn/trunk
-kPrf2Read_INCS += $(VBOX_ROOT)/include
-kPrf2Read_DEFS += IN_RING3 IN_RT_R3 KDBG_USE_IPRT KCOMMON_ALREADY_INCLUDED_STD_TYPES
-ifeq ($(BUILD_TARGET),win)
-kPrf2Read_LIBS = \
-        $(VBOX_ROOT)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/lib/VBoxRT$(SUFF_LIB)
-else
-kPrf2Read_LIBS = \
-        $(VBOX_ROOT)/out/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)/bin/VBoxRT$(SUFF_DLL)
-endif
-
-
-#
-# A simple testcase.
-#
-PROGRAMS.win.x86 += tst
-tst_TOOL = VCC70
-tst_SDKS = WINPSDK
-tst_CFLAGS = -GH -Gh -Zi -Zl -GR- -GX- -GF- -MD -W3 -wd4244
-tst_SOURCES = tst.c
-tst.c_CFLAGS = -Od
-tst_LDFLAGS = /DEBUG
-tst_LIBS = \
-        $(PATH_TOOL_VCC70_LIB)/msvcrt.lib \
-        $(PATH_TOOL_VCC70_LIB)/msvcprt.lib \
-        $(PATH_TOOL_VCC70_LIB)/oldnames.lib \
-        $(PATH_kPrf2)/kPrf2.lib
+##
+## kDbgDump - Test program which dumps whatever is thrown at it.
+##
+#PROGRAMS += kDbgDump
+kDbgDump_TEMPLATE = kStuffEXE
+kDbgDump_SOURCES = kDbgDump.cpp
+kDbgDump_LIBS = $(TARGET_kDbgStatic)
 
 # Generate the rules
 include $(PATH_KBUILD)/footer.kmk
 
-
-#
-# Aliases for .cpp.h files so we can more easily do syntax checking from the editor.
-#
-CORE := $(wildcard *core*.cpp.h *core*.h.h)
-$(CORE:.h=.o) $(CORE:.h=.obj) : kProfileR3.o
-
-READ := $(wildcard *read*.cpp.h *read*.h.h)
-$(READ:.h=.o) $(READ:.h=.obj) : kPrf2Read.o
-

trunk/kDbg/kDbg.h

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /** @file
- *
- * kProfile Mark 2 - Debug Info Reader.
- *
- * Copyright (c) 2006 knut st. osmundsen <bird-src-spam@anduin.net.de>
- *
+ * kDbg - The Debug Info Reader.
+ */
+
+/*
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23 +23 @@
  */
 
-
-#ifndef __iprt_dbg_h__
-#define __iprt_dbg_h__
-
-#include <iprt/types.h>
-
-__BEGIN_DECLS
-
-/** @defgroup grp_rt_dbg    Debug Info Reader
- * @addtogroup grp_rt
+#ifndef ___kDbg_h___
+#define ___kDbg_h___
+
+#include "kDbgBase.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup grp_kDbg      Debug Info Reader
  * @{
  */
 
 /** The max filename path length used by the debug reader. */
-#define RTDBG_PATH_MAX      260
+#define KDBG_PATH_MAX       260
 
 /** The max symbol name length used by the debug reader. */
-#define RTDBG_SYMBOL_MAX    384
+#define KDBG_SYMBOL_MAX     384
+
+/** @name   kDbg Status codes
+ * (Success is indicated by the value 0.)
+ * @{ */
+#define KDBG_ERR_BASE                                   430000
+
+/** An API was given an invalid parameter. */
+#define KDBG_ERR_INVALID_PARAMETER                      (KDBG_ERR_BASE + 0)
+/** A pointer argument is not valid. */
+#define KDBG_ERR_INVALID_POINTER                        (KDBG_ERR_BASE + 1)
+/** A handle argument is not valid. */
+#define KDBG_ERR_INVALID_HANDLE                         (KDBG_ERR_BASE + 2)
+/** A parameter is out of range. */
+#define KDBG_ERR_OUT_OF_RANGE                           (KDBG_ERR_BASE + 3)
+/** Out of memory. */
+#define KDBG_ERR_NO_MEMORY                              (KDBG_ERR_BASE + 4)
+/** The specified file was not found. */
+#define KDBG_ERR_FILE_NOT_FOUND                         (KDBG_ERR_BASE + 5)
+/** Generic error. */
+#define KDBG_ERR_GENERAL_FAILURE                        (KDBG_ERR_BASE + 9)
+
+/** The (module) format isn't known to use. */
+#define KDBG_ERR_UNKOWN_FORMAT                          (KDBG_ERR_BASE + 10)
+/** The (module) format isn't supported by this kDbg build. */
+#define KDBG_ERR_FORMAT_NOT_SUPPORTED                   (KDBG_ERR_BASE + 11)
+/** A specified address or an address found in the debug info is invalid. */
+#define KDBG_ERR_INVALID_ADDRESS                        (KDBG_ERR_BASE + 12)
+
+/** @} */
 
 
@@ -48 +77 @@
  * The specified offset is relative to the image base. The image base is the lowest memory
  * address used by the image when loaded with the address assignments indicated in the image. */
-#define RTDBGSEG_RVA (-1)
+#define KDBGSEG_RVA (-1)
 /** Absolute segment. The offset isn't relative to anything. */
-#define RTDBGSEG_ABS (-2)
+#define KDBGSEG_ABS (-2)
 /** @} */
 
@@ -57 +86 @@
  * Line number details.
  */
-typedef struct RTDBGLINE
+typedef struct KDBGLINE
 {
     /** The relative virtual address. */
-    RTUINTPTR   RVA;
+    KDBGADDR    RVA;
     /** The offset into the segment. */
-    RTUINTPTR   offSegment;
+    KDBGADDR    offSegment;
     /** The segment number. */
     int32_t     iSegment;
@@ -70 +99 @@
     uint16_t    cchFile;
     /** The name of the file this line number relates to. */
-    char        szFile[RTDBG_PATH_MAX];
-} RTDBGLINE;
+    char        szFile[KDBG_PATH_MAX];
+} KDBGLINE;
 /** Pointer to line number details. */
-typedef RTDBGLINE *PRTDBGLINE;
+typedef KDBGLINE *PKDBGLINE;
 /** Pointer to const line number details. */
-typedef const RTDBGLINE *PCRTDBGLINE;
+typedef const KDBGLINE *PCKDBGLINE;
 /** Pointer to a pointer to line number details. */
-typedef PRTDBGLINE *PPRTDBGLINE;
+typedef PKDBGLINE *PPKDBGLINE;
 
 /**
@@ -90 +119 @@
  * @param   pLine       The line number to be duplicated.
  */
-RTDECL(PRTDBGLINE) RTDbgLineDup(PCRTDBGLINE pLine);
+KDBG_DECL(PKDBGLINE) kDbgLineDup(PCKDBGLINE pLine);
 
 /**
@@ -96 +125 @@
  *
  * @returns VINF_SUCCESS on success.
- * @returns VERR_INVALID_POINTER if a NULL pointer or an !VALID_PTR() is passed in.
+ * @returns KDBG_ERR_INVALID_POINTER if a NULL pointer or an !KDBG_VALID_PTR() is passed in.
  *
  * @param   pLine       The line number to be freed.
  */
-RTDECL(int) RTDbgLineFree(PRTDBGLINE pLine);
+KDBG_DECL(int) kDbgLineFree(PKDBGLINE pLine);
 
 
@@ -106 +135 @@
  * @{ */
 /** The symbol is weak. */
-#define RTDBGSYM_FLAGS_WEAK     BIT(0)
+#define KDBGSYM_FLAGS_WEAK      UINT32_C(0x00000000)
 /** The symbol is absolute.
  * (This also indicated by the segment number.) */
-#define RTDBGSYM_FLAGS_ABS      BIT(1)
+#define KDBGSYM_FLAGS_ABS       UINT32_C(0x00000001)
 /** The symbol is exported. */
-#define RTDBGSYM_FLAGS_EXPORTED BIT(2)
+#define KDBGSYM_FLAGS_EXPORTED  UINT32_C(0x00000002)
 /** The symbol is a function/method/procedure/whatever-executable-code. */
-#define RTDBGSYM_FLAGS_CODE     BIT(3)
+#define KDBGSYM_FLAGS_CODE      UINT32_C(0x00000004)
 /** The symbol is some kind of data. */
-#define RTDBGSYM_FLAGS_DATA     BIT(4)
+#define KDBGSYM_FLAGS_DATA      UINT32_C(0x00000008)
 /** @} */
 
@@ -121 +150 @@
  * Symbol details.
  */
-typedef struct RTDBGSYMBOL
+typedef struct KDBGSYMBOL
 {
     /** The relative virtual address. */
-    RTUINTPTR   RVA;
+    KDBGADDR    RVA;
     /** The symbol size.
      * This is not a reliable field, it could be a bad guess. Ignore if zero. */
-    RTUINTPTR   cb;
+    KDBGADDR    cb;
     /** The offset into the segment. */
-    RTUINTPTR   offSegment;
+    KDBGADDR    offSegment;
     /** The segment number. */
     int32_t     iSegment;
@@ -138 +167 @@
     uint16_t    cchName;
     /** The symbol name. */
-    char        szName[RTDBG_SYMBOL_MAX];
-} RTDBGSYMBOL;
+    char        szName[KDBG_SYMBOL_MAX];
+} KDBGSYMBOL;
 /** Pointer to symbol details. */
-typedef RTDBGSYMBOL *PRTDBGSYMBOL;
+typedef KDBGSYMBOL *PKDBGSYMBOL;
 /** Pointer to const symbol details. */
-typedef const RTDBGSYMBOL *PCRTDBGSYMBOL;
+typedef const KDBGSYMBOL *PCKDBGSYMBOL;
 /** Pointer to a pointer to symbol details. */
-typedef PRTDBGSYMBOL *PPRTDBGSYMBOL;
-
+typedef PKDBGSYMBOL *PPKDBGSYMBOL;
 
 /**
@@ -156 +184 @@
  *
  * @returns Pointer to the duplicate.
- *          This must be freed using RTDbgSymbolFree().
+ *          This must be freed using kDbgSymbolFree().
  * @param   pSymbol     The symbol to be freed.
  */
-RTDECL(PRTDBGSYMBOL) RTDbgSymbolDup(PCRTDBGSYMBOL pSymbol);
-
-/**
- * Frees a symbol obtained from the RTDbg API.
+KDBG_DECL(PKDBGSYMBOL) kDbgSymbolDup(PCKDBGSYMBOL pSymbol);
+
+/**
+ * Frees a symbol obtained from the kDbg API.
  *
  * @returns VINF_SUCCESS on success.
- * @returns VERR_INVALID_POINTER if a NULL pointer or an !VALID_PTR() is passed in.
+ * @returns KDBG_ERR_INVALID_POINTER if a NULL pointer or an !KDBG_VALID_PTR() is passed in.
  *
  * @param   pSymbol     The symbol to be freed.
  */
-RTDECL(int) RTDbgSymbolFree(PRTDBGSYMBOL pSymbol);
+KDBG_DECL(int) kDbgSymbolFree(PKDBGSYMBOL pSymbol);
 
 
 
 /** A debug module handle. */
-typedef struct RTDBGMOD *PRTDBGMOD;
+typedef struct KDBGMOD *PKDBGMOD;
 
 /**
@@ -183 +211 @@
  * @param   ppDbgMod            Where to store the debug module handle.
  */
-RTDECL(int) RTDbgModuleOpen(const char *pszModulePath, PRTDBGMOD *ppDbgMod);
+KDBG_DECL(int) kDbgModuleOpen(const char *pszModulePath, PKDBGMOD *ppDbgMod);
 
 /**
@@ -191 +219 @@
  * @param   pMod        The module handle.
  */
-RTDECL(int) RTDbgModuleClose(PRTDBGMOD pMod);
+KDBG_DECL(int) kDbgModuleClose(PKDBGMOD pMod);
 
 /**
@@ -206 +234 @@
  * @param   pSym        Where to store the symbol details.
  */
-RTDECL(int) RTDbgModuleQuerySymbol(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PRTDBGSYMBOL pSym);
+KDBG_DECL(int) kDbgModuleQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym);
 
 /**
@@ -220 +248 @@
  * @param   off         The offset into the segment.
  * @param   ppSym       Where to store the pointer to the symbol info.
- *                      Free the returned symbol using RTDbgSymbolFree().
- */
-RTDECL(int) RTDbgModuleQuerySymbolA(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PPRTDBGSYMBOL ppSym);
+ *                      Free the returned symbol using kDbgSymbolFree().
+ */
+KDBG_DECL(int) kDbgModuleQuerySymbolA(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PPKDBGSYMBOL ppSym);
 
 /**
@@ -237 +265 @@
  * @param   pLine       Where to store the line number details.
  */
-RTDECL(int) RTDbgModuleQueryLine(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PRTDBGLINE pLine);
+KDBG_DECL(int) kDbgModuleQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine);
 
 /**
@@ -251 +279 @@
  * @param   off         The offset into the segment.
  * @param   ppLine      Where to store the pointer to the line number info.
- *                      Free the returned line number using RTDbgLineFree().
- */
-RTDECL(int) RTDbgModuleQueryLineA(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PPRTDBGLINE ppLine);
-
-
-__END_DECLS
-
-/** @} */
-
+ *                      Free the returned line number using kDbgLineFree().
+ */
+KDBG_DECL(int) kDbgModuleQueryLineA(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PPKDBGLINE ppLine);
+
+
+/** @} */
+
+#ifdef __cplusplus
+}
 #endif
+
+#endif

trunk/kDbg/kDbgBase.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * kDbg - The Debug Info Reader, Base Definitions and Typedefs.
- *
+ */
+
+/*
  * Copyright (c) 2006-2007 knut st. osmundsen <bird@anduin.net>
  *
@@ -78 +79 @@
 
 
+/** @def KDBG_CALL
+ * The calling convention used by the kDbg functions. */
+#if defined(_MSC_VER) || defined(__OS2__)
+# define KDBG_CALL  __cdecl
+#else
+# define KDBG_CALL
+#endif
+
+#ifdef __DOXYGEN__
+/** @def KDBG_BUILDING
+ * Define KDBG_BUILDING to indicate that kDbg is being built.
+ */
+# define KDBG_BUILDING
+/** @def KDBG_RESIDES_IN_DLL
+ * Define KDBG_RESIDES_IN_DLL to indicate that kDbg resides in a DLL.
+ */
+# define KDBG_RESIDES_IN_DLL
+#endif
+
+/** @def KDBG_DECL
+ * Macro for defining public functions. */
+#if defined(KDBG_RESIDES_IN_DLL) \
+ && (defined(_MSC_VER) || defined(__OS2__))
+# ifdef KDBG_BUILDING
+#  define KDBG_DECL(type) __declspec(dllexport) type
+# else
+#  define KDBG_DECL(type) __declspec(dllimport) type
+# endif
+#else
+# define KDBG_DECL(type) type
+#endif
+
+/** @def KDBG_INLINE
+ * Macro for defining an inline function. */
+#ifdef __cplusplus
+# if defined(__GNUC__)
+#  define KDBG_INLINE(type) static inline type
+# else
+#  define KDBG_INLINE(type) inline type
+# endif
+#else
+# if defined(__GNUC__)
+#  define KDBG_INLINE(type) static __inline__ type
+# elif defined(_MSC_VER)
+#  define KDBG_INLINE(type) _inline type
+# else
+#  error "Port me"
+# endif
+#endif
+
+
+/** The kDbg address type. */
+typedef uint64_t KDBGADDR;
+/** Pointer to a kLdr address. */
+typedef KDBGADDR *PKDBGADDR;
+/** Pointer to a const kLdr address. */
+typedef const KDBGADDR *PCKDBGADDR;
+
+/** NIL address. */
+#define NIL_KDBGADDR    (~(uint64_t)0)
+
+/** @def PRI_KDBGADDR
+ * printf format type. */
+#ifdef _MSC_VER
+# define PRI_KDBGADDR    "I64x"
+#else
+# define PRI_KDBGADDR    "llx"
+#endif
+
+
 /** Get the minimum of two values. */
 #define KDBG_MIN(a, b)              ((a) <= (b) ? (a) : (b))
@@ -89 +160 @@
 #define KDBG_ALIGN_P(pv, align)     ( (void *)( ((uintptr_t)(pv) + ((align) - 1)) & ~(uintptr_t)((align) - 1) ) )
 /** Align a size_t value. */
-#define KDBG_ALIGN_ADDR(val, align) ( ((val) + ((align) - 1)) & ~(KLDRADDR)((align) - 1) )
+#define KDBG_ALIGN_ADDR(val, align) ( ((val) + ((align) - 1)) & ~(KDBGADDR)((align) - 1) )
 /** Number of elements in an array. */
 #define KDBG_ELEMENTS(a)            ( sizeof(a) / sizeof((a)[0]) )
+/** @def KDBG_VALID_PTR
+ * Checks if the specified pointer is a valid address or not. */
+#define KDBG_VALID_PTR(ptr)         ( (uintptr_t)(ptr) + 0x1000U >= 0x2000U )
 
 

trunk/kDbg/kDbgInternal.h

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /** @file
- *
- * kProfile Mark 2 - Debug Info Reader, Internal Header.
- *
- * Copyright (c) 2006 knut st. osmundsen <bird-src-spam@anduin.net.de>
- *
+ * kDbg - The Debug Info Reader, Internal Header.
+ */
+
+/*
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23 +23 @@
  */
 
-#ifndef __internal_DBGInternal_h__
-#define __internal_DBGInternal_h__
+#ifndef ___kDbgInternal_h___
+#define ___kDbgInternal_h___
 
-#include "dbg.h"
+#include "kDbgBase.h"
+#include "kDbgHlp.h"
+#include "kDbg.h"
 
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 
@@ -34 +38 @@
  * The debug module method table.
  */
-typedef struct RTDBGMODOPS
+typedef struct KDBGMODOPS
 {
     /** The name of the reader. */
@@ -48 +52 @@
      * @param   pMod        The module.
      */
-    DECLCALLBACKMEMBER(int, pfnClose)(PRTDBGMOD pMod);
+    int (*pfnClose)(PKDBGMOD pMod);
 
     /**
@@ -63 +67 @@
      * @param   pSym        Where to store the symbol details.
      */
-    DECLCALLBACKMEMBER(int, pfnQuerySymbol)(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PRTDBGSYMBOL pSym);
+    int (*pfnQuerySymbol)(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym);
 
     /**
@@ -78 +82 @@
      * @param   pLine       Where to store the line number details.
      */
-    DECLCALLBACKMEMBER(int, pfnQueryLine)(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR uOffset, PRTDBGLINE pLine);
+    int (*pfnQueryLine)(PKDBGMOD pMod, int32_t iSegment, KDBGADDR uOffset, PKDBGLINE pLine);
 
-} RTDBGMODOPS;
+} KDBGMODOPS;
 /** Pointer to a module method table. */
-typedef RTDBGMODOPS *PRTDBGMODOPS;
+typedef KDBGMODOPS *PKDBGMODOPS;
 /** Pointer to a const module method table. */
-typedef const RTDBGMODOPS *PCRTDBGMODOPS;
+typedef const KDBGMODOPS *PCKDBGMODOPS;
 
 
@@ -90 +94 @@
  * Internal representation of a debug module.
  */
-typedef struct RTDBGMOD
+typedef struct KDBGMOD
 {
-    /** Magic value (RTDBGMOD_MAGIC). */
+    /** Magic value (KDBGMOD_MAGIC). */
     uint32_t        u32Magic;
     /** The handle to the module. (If closed, this is NIL_RTFILE.) */
-    RTFILE          File;
+    PKDBGHLPFILE    pFile;
     /** Pointer to the method table. */
-    PCRTDBGMODOPS   pOps;
-} RTDBGMOD;
+    PCKDBGMODOPS    pOps;
+} KDBGMOD;
 
 
-/** The magic value for the debug module structure. (Some english writer) */
-#define RTDBGMOD_MAGIC      0x00000000
+/** The magic value for the debug module structure. (Some dead english writer) */
+#define KDBGMOD_MAGIC      0x00000000
 /** The magic value of a dead module structure. */
-#define RTDBGMOD_MAGIC_DEAD 0x00000000
+#define KDBGMOD_MAGIC_DEAD 0x00000001
 
 
-int rtDbgModPEOpen(RTFILE File, RTFOFF offHdr, const char *pszModulePath, PRTDBGMOD *ppDbgMod);
+int kdbgModPEOpen(PKDBGHLPFILE pFile, KDBGADDR offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod);
 
-
-__END_DECLS
+#ifdef __cplusplus
+}
 #endif
 
+#endif
+

trunk/kDbg/kDbgLine.cpp

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /** @file
- *
- * kProfile Mark 2 - Debug Info Line Number.
- *
- * Copyright (c) 2006 knut st. osmundsen <bird-src-spam@anduin.net.de>
- *
+ * kDbg - The Debug Info Read, Line Numbers.
+ */
+
+/*
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  * This file is part of kLIBC.
@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <iprt/err.h>
-#include <iprt/assert.h>
-#include <iprt/alloc.h>
+#include "kDbg.h"
+#include "kDbgInternal.h"
 
-#include "dbg.h"
-#include "kDbgBase.h"
 
 
@@ -45 +42 @@
  *
  * @returns Pointer to the duplicate.
- *          This must be freed using RTDbgSymbolFree().
+ *          This must be freed using kDbgSymbolFree().
  * @param   pLine       The line number to be duplicated.
  */
-RTDECL(PRTDBGLINE) RTDbgLineDup(PCRTDBGLINE pLine)
+KDBG_DECL(PKDBGLINE) kDbgLineDup(PCKDBGLINE pLine)
 {
-    AssertMsgReturn(VALID_PTR(pLine), ("%p\n", pLine), NULL);
-    size_t cb = KDBG_OFFSETOF(RTDBGLINE, szFile[pLine->cchFile + 1]);
-    return (PRTDBGLINE)RTMemDup(pLine, cb);
+    kDbgAssertMsgReturn(KDBG_VALID_PTR(pLine), ("%p\n", pLine), NULL);
+    size_t cb = KDBG_OFFSETOF(KDBGLINE, szFile[pLine->cchFile + 1]);
+    return (PKDBGLINE)kDbgHlpAllocDup(pLine, cb);
 }
 
@@ -59 +56 @@
  * Frees a line number obtained from the RTDbg API.
  *
- * @returns VINF_SUCCESS on success.
- * @returns VERR_INVALID_POINTER if a NULL pointer or an !VALID_PTR() is passed in.
+ * @returns 0 on success.
+ * @returns KDBG_ERR_INVALID_POINTER if a NULL pointer or an !KDBG_VALID_PTR() is passed in.
  *
  * @param   pLine       The line number to be freed.
  */
-RTDECL(int) RTDbgLineFree(PRTDBGLINE pLine)
+KDBG_DECL(int) kDbgLineFree(PKDBGLINE pLine)
 {
     if (!pLine)
-        return VERR_INVALID_POINTER;
-    AssertMsgReturn(VALID_PTR(pLine), ("%p\n", pLine), VERR_INVALID_POINTER);
+        return KDBG_ERR_INVALID_POINTER;
+    kDbgAssertMsgReturn(KDBG_VALID_PTR(pLine), ("%p\n", pLine), KDBG_ERR_INVALID_POINTER);
 
-    RTMemFree(pLine);
-    return VINF_SUCCESS;
+    kDbgHlpFree(pLine);
+    return 0;
 }
 

trunk/kDbg/kDbgModPE-generic.cpp

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /** @file
- *
- * kProfile Mark 2 - Debug Info Reader, DbgHelp Base Reader.
- *
- * Copyright (c) 2006 knut st. osmundsen <bird-src-spam@anduin.net.de>
- *
+ * kDbg - The Debug Info Reader, PE Module (Generic).
+ */
+
+/*
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  * This file is part of kLIBC.
@@ -25 +25 @@
  */
 
-
 /*******************************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
-#include <iprt/file.h>
-#include <iprt/string.h>
-#include <iprt/alloc.h>
-#include <iprt/assert.h>
-#include <iprt/asm.h>
-#include <iprt/err.h>
-#include <iprt/thread.h>
-#include <iprt/alloca.h>
-#include "kDbgBase.h"
-#include "DBGInternal.h"
-#include "kLdrModPE.h"
-
+#include "kDbg.h"
+#include "kDbgInternal.h"
+#include <kLdrModPE.h>
 
 
@@ -49 +39 @@
  * A dbghelp based PE debug reader.
  */
-typedef struct RTDBGMODPE
+typedef struct KDBGMODPE
 {
     /** The common module core. */
-    RTDBGMOD    Core;
+    KDBGMOD     Core;
     /** The image size. */
     uint32_t    cbImage;
@@ -59 +49 @@
     /** The section headers (variable size). The first section is the
      * implicit header section.*/
-    IMAGE_SECTION_HEADER    aSections[1];
-} RTDBGMODPE, *PRTDBGMODPE;
+    IMAGE_SECTION_HEADER aSections[1];
+} KDBGMODPE, *PKDBGMODPE;
 
 
@@ -73 +63 @@
  * @param   puRVA       Where to store the RVA on success.
  */
-static int rtDbgModPeSegOffToRVA(PRTDBGMODPE pModPe, int32_t iSegment, RTUINTPTR off, uint32_t *puRVA)
+static int rtDbgModPeSegOffToRVA(PKDBGMODPE pModPe, int32_t iSegment, KDBGADDR off, uint32_t *puRVA)
 {
     if (iSegment >= 0)
     {
-        AssertMsgReturn(iSegment < pModPe->cSections, ("iSegment=%RX32 cSections=%RX32\n", iSegment, pModPe->cSections),
-                        VERR_DBGMOD_INVALID_ADDRESS);
-        AssertMsgReturn(off < pModPe->aSections[iSegment].Misc.VirtualSize,
-                        ("off=%RTptr VirtualSize=%RX32\n", off, pModPe->aSections[iSegment].Misc.VirtualSize),
-                        VERR_DBGMOD_INVALID_ADDRESS);
+        kDbgAssertMsgReturn(iSegment < pModPe->cSections, ("iSegment=%x cSections=%x\n", iSegment, pModPe->cSections),
+                        KDBG_ERR_INVALID_ADDRESS);
+        kDbgAssertMsgReturn(off < pModPe->aSections[iSegment].Misc.VirtualSize,
+                        ("off=" PRI_KDBGADDR " VirtualSize=%x\n", off, pModPe->aSections[iSegment].Misc.VirtualSize),
+                        KDBG_ERR_INVALID_ADDRESS);
         *puRVA = pModPe->aSections[iSegment].VirtualAddress + off;
-        return VINF_SUCCESS;
-    }
-
-    if (iSegment == RTDBGSEG_RVA)
-    {
-        AssertMsgReturn(off < pModPe->cbImage, ("off=%RTptr, cbImage=%RX32\n", off, pModPe->cbImage),
-                        VERR_DBGMOD_INVALID_ADDRESS);
+        return 0;
+    }
+
+    if (iSegment == KDBGSEG_RVA)
+    {
+        kDbgAssertMsgReturn(off < pModPe->cbImage, ("off=" PRI_KDBGADDR ", cbImage=%x\n", off, pModPe->cbImage),
+                            KDBG_ERR_INVALID_ADDRESS);
         *puRVA = off;
-        return VINF_SUCCESS;
-    }
-    AssertMsgFailedReturn(("iSegment=%RI32\n", iSegment), VERR_DBGMOD_INVALID_ADDRESS);
+        return 0;
+    }
+    AssertMsgFailedReturn(("iSegment=%RI32\n", iSegment), KDBG_ERR_INVALID_ADDRESS);
 }
 
@@ -107 +97 @@
  * @param   poff        Where to store the segment offset.
  */
-static int rtDbgModPeRVAToSegOff(PRTDBGMODPE pModPe, uint32_t uRVA, int32_t *piSegment, RTUINTPTR *poff)
-{
-    AssertMsgReturn(uRVA < pModPe->cbImage, ("uRVA=%RX32, cbImage=%RX32\n", uRVA, pModPe->cbImage),
-                    VERR_DBGMOD_INVALID_ADDRESS);
+static int rtDbgModPeRVAToSegOff(PKDBGMODPE pModPe, uint32_t uRVA, int32_t *piSegment, KDBGADDR *poff)
+{
+    kDbgAssertMsgReturn(uRVA < pModPe->cbImage, ("uRVA=%x, cbImage=%x\n", uRVA, pModPe->cbImage),
+                    KDBG_ERR_INVALID_ADDRESS);
     for (int32_t iSegment = 0; iSegment < pModPe->cSections; iSegment++)
     {
@@ -119 +109 @@
             *poff = off;
             *piSegment = iSegment;
-            return VINF_SUCCESS;
-        }
-    }
-    AssertMsgFailedReturn(("uRVA=%RX32\n", uRVA), VERR_DBGMOD_INVALID_ADDRESS);
-}
-
-
-/**
- * @copydoc RTDBGMODOPS::pfnQueryLine
- */
-static DECLCALLBACK(int) rtDbgModPEQueryLine(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PRTDBGLINE pLine)
-{
-    PRTDBGMODPE pModPe = (PRTDBGMODPE)pMod;
+            return 0;
+        }
+    }
+    AssertMsgFailedReturn(("uRVA=%x\n", uRVA), KDBG_ERR_INVALID_ADDRESS);
+}
+
+
+/**
+ * @copydoc KDBGMODOPS::pfnQueryLine
+ */
+static DECLCALLBACK(int) rtDbgModPEQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
+{
+    PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
 
     /*
@@ -138 +128 @@
     uint32_t uRVA;
     int rc = rtDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
-    if (RT_SUCCESS(rc))
+    if (!rc)
     {
 #if 0
@@ -146 +136 @@
         if (g_pfnSymGetLineFromAddr64(pModPe->hSymInst, pModPe->ImageBase + uRVA, &off, &Line))
         {
-            pLine->RVA = (RTUINTPTR)(Line.Address - pModPe->ImageBase);
+            pLine->RVA = (KDBGADDR)(Line.Address - pModPe->ImageBase);
             rc = rtDbgModPeRVAToSegOff(pModPe, pLine->RVA, &pLine->iSegment, &pLine->offSegment);
             pLine->iLine = Line.LineNumber;
@@ -167 +157 @@
 
 /**
- * @copydoc RTDBGMODOPS::pfnQuerySymbol
- */
-static DECLCALLBACK(int) rtDbgModPEQuerySymbol(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PRTDBGSYMBOL pSym)
-{
-    PRTDBGMODPE pModPe = (PRTDBGMODPE)pMod;
+ * @copydoc KDBGMODOPS::pfnQuerySymbol
+ */
+static DECLCALLBACK(int) rtDbgModPEQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
+{
+    PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
 
     /*
@@ -178 +168 @@
     uint32_t uRVA;
     int rc = rtDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
-    if (RT_SUCCESS(rc))
+    if (!rc)
     {
 #if 0
@@ -194 +184 @@
             pSym->fFlags = 0;
             if (Buf.Sym.Flags & SYMFLAG_FUNCTION)
-                pSym->fFlags |= RTDBGSYM_FLAGS_CODE;
+                pSym->fFlags |= KDBGSYM_FLAGS_CODE;
             else if (Buf.Sym.Flags & SYMFLAG_CONSTANT)
-                pSym->fFlags |= RTDBGSYM_FLAGS_ABS; /** @todo SYMFLAG_CONSTANT must be tested - documentation is too brief to say what is really meant here.*/
+                pSym->fFlags |= KDBGSYM_FLAGS_ABS; /** @todo SYMFLAG_CONSTANT must be tested - documentation is too brief to say what is really meant here.*/
             else
-                pSym->fFlags |= RTDBGSYM_FLAGS_DATA;
+                pSym->fFlags |= KDBGSYM_FLAGS_DATA;
             if (Buf.Sym.Flags & SYMFLAG_EXPORT)
-                pSym->fFlags |= RTDBGSYM_FLAGS_EXPORTED;
+                pSym->fFlags |= KDBGSYM_FLAGS_EXPORTED;
             if ((Buf.Sym.Flags & (SYMFLAG_VALUEPRESENT | SYMFLAG_CONSTANT)) == (SYMFLAG_VALUEPRESENT | SYMFLAG_CONSTANT))
             {
                 pSym->iSegment   = RTDBGSEG_ABS;
-                pSym->offSegment = (RTUINTPTR)Buf.Sym.Value;
-                pSym->RVA        = (RTUINTPTR)Buf.Sym.Value;
+                pSym->offSegment = (KDBGADDR)Buf.Sym.Value;
+                pSym->RVA        = (KDBGADDR)Buf.Sym.Value;
             }
             else
             {
-                pSym->RVA        = (RTUINTPTR)(Buf.Sym.Address - pModPe->ImageBase);
+                pSym->RVA        = (KDBGADDR)(Buf.Sym.Address - pModPe->ImageBase);
                 rc = rtDbgModPeRVAToSegOff(pModPe, pSym->RVA, &pSym->iSegment, &pSym->offSegment);
             }
@@ -231 +221 @@
 
 /**
- * @copydoc RTDBGMODOPS::pfnClose
- */
-static DECLCALLBACK(int) rtDbgModPEClose(PRTDBGMOD pMod)
-{
-    PRTDBGMODPE pModPe = (PRTDBGMODPE)pMod;
+ * @copydoc KDBGMODOPS::pfnClose
+ */
+static DECLCALLBACK(int) rtDbgModPEClose(PKDBGMOD pMod)
+{
+    PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
 
     //if (g_pfnSymCleanup(pModPe->hSymInst))
-    //    return VINF_SUCCESS;
+    //    return 0;
     //
     //DWORD Err = GetLastError();
@@ -251 +241 @@
  * Methods for a PE module.
  */
-static const RTDBGMODOPS g_rtDbgModPEOps =
+static const KDBGMODOPS g_rtDbgModPEOps =
 {
     "PE (dbghelp)",
@@ -271 +261 @@
  *
  */
-int rtDbgModPEOpen(RTFILE File, RTFOFF offHdr, const char *pszModulePath, PRTDBGMOD *ppDbgMod)
+int kdbgModPEOpen(RTFILE File, int64_t offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod)
 {
     /*
@@ -277 +267 @@
      */
     IMAGE_FILE_HEADER FHdr;
-    int rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
+    int rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
     AssertRCReturn(rc, rc);
 
     uint32_t cbImage;
     if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32))
-        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
+        rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
                           &cbImage, sizeof(cbImage), NULL);
     else if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER64))
-        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
+        rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
                           &cbImage, sizeof(cbImage), NULL);
     else
@@ -294 +284 @@
      * Allocate the module and read/construct the section headers.
      */
-    PRTDBGMODPE pModPe = (PRTDBGMODPE)RTMemAlloc(KDBG_OFFSETOF(RTDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
-    AssertReturn(pModPe, VERR_NO_MEMORY);
-    pModPe->Core.u32Magic   = RTDBGMOD_MAGIC;
+    PKDBGMODPE pModPe = (PKDBGMODPE)RTMemAlloc(KDBG_OFFSETOF(KDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
+    AssertReturn(pModPe, KDBG_ERR_NO_MEMORY);
+    pModPe->Core.u32Magic   = KDBGMOD_MAGIC;
     pModPe->Core.pOps       = &g_rtDbgModPEOps;
     pModPe->Core.File       = File;
     pModPe->cbImage         = cbImage;
     pModPe->cSections       = 1 + FHdr.NumberOfSections;
-    rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
+    rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
                       &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections, NULL);
-    if (RT_SUCCESS(rc))
+    if (!rc)
     {
         PIMAGE_SECTION_HEADER pSH = &pModPe->aSections[0];
@@ -382 +372 @@
         AssertRC(rc);
 
-    RTMemFree(pModPe);
+    kDbgHlpFree(pModPe);
     return rc;
 }

trunk/kDbg/kDbgModPE-win.cpp

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /** @file
- *
- * kProfile Mark 2 - Debug Info Reader, DbgHelp Base Reader.
- *
- * Copyright (c) 2006 knut st. osmundsen <bird-src-spam@anduin.net.de>
- *
+ * kDbg - The Debug Info Reader, DbgHelp Based Reader.
+ */
+
+/*
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  * This file is part of kLIBC.
@@ -33 +33 @@
 #include <DbgHelp.h>
 
-#include <iprt/file.h>
-#include <iprt/string.h>
-#include <iprt/alloc.h>
-#include <iprt/assert.h>
-#include <iprt/asm.h>
-#include <iprt/err.h>
-#include <iprt/thread.h>
-#include <iprt/alloca.h>
-#include "kDbgBase.h"
-#include "DBGInternal.h"
-
-
-//#include "internal/ldrPE.h"
+#include "kDbgInternal.h"
+
 
 /*******************************************************************************
@@ -73 +62 @@
  * A dbghelp based PE debug reader.
  */
-typedef struct RTDBGMODPE
+typedef struct KDBGMODPE
 {
     /** The common module core. */
-    RTDBGMOD    Core;
+    KDBGMOD    Core;
     /** The image base. */
     DWORD64     ImageBase;
@@ -88 +77 @@
      * implicit header section.*/
     IMAGE_SECTION_HEADER    aSections[1];
-} RTDBGMODPE, *PRTDBGMODPE;
+} KDBGMODPE, *PKDBGMODPE;
 
 
@@ -101 +90 @@
  * @param   puRVA       Where to store the RVA on success.
  */
-static int rtDbgModPeSegOffToRVA(PRTDBGMODPE pModPe, int32_t iSegment, RTUINTPTR off, uint32_t *puRVA)
+static int rtDbgModPeSegOffToRVA(PKDBGMODPE pModPe, int32_t iSegment, KDBGADDR off, uint32_t *puRVA)
 {
     if (iSegment >= 0)
     {
-        AssertMsgReturn(iSegment < pModPe->cSections, ("iSegment=%RX32 cSections=%RX32\n", iSegment, pModPe->cSections),
-                        VERR_DBGMOD_INVALID_ADDRESS);
-        AssertMsgReturn(off < pModPe->aSections[iSegment].Misc.VirtualSize,
-                        ("off=%RTptr VirtualSize=%RX32\n", off, pModPe->aSections[iSegment].Misc.VirtualSize),
-                        VERR_DBGMOD_INVALID_ADDRESS);
+        kDbgAssertMsgReturn(iSegment < pModPe->cSections, ("iSegment=%x cSections=%x\n", iSegment, pModPe->cSections),
+                            KDBG_ERR_INVALID_ADDRESS);
+        kDbgAssertMsgReturn(off < pModPe->aSections[iSegment].Misc.VirtualSize,
+                            ("off=" PRI_KDBGADDR " VirtualSize=%x\n", off, pModPe->aSections[iSegment].Misc.VirtualSize),
+                            KDBG_ERR_INVALID_ADDRESS);
         *puRVA = pModPe->aSections[iSegment].VirtualAddress + off;
-        return VINF_SUCCESS;
-    }
-
-    if (iSegment == RTDBGSEG_RVA)
-    {
-        AssertMsgReturn(off < pModPe->cbImage, ("off=%RTptr, cbImage=%RX32\n", off, pModPe->cbImage),
-                        VERR_DBGMOD_INVALID_ADDRESS);
+        return 0;
+    }
+
+    if (iSegment == KDBGSEG_RVA)
+    {
+        kDbgAssertMsgReturn(off < pModPe->cbImage, ("off=" PRI_KDBGADDR ", cbImage=%x\n", off, pModPe->cbImage),
+                            KDBG_ERR_INVALID_ADDRESS);
         *puRVA = off;
-        return VINF_SUCCESS;
-    }
-    AssertMsgFailedReturn(("iSegment=%RI32\n", iSegment), VERR_DBGMOD_INVALID_ADDRESS);
+        return 0;
+    }
+    AssertMsgFailedReturn(("iSegment=%RI32\n", iSegment), KDBG_ERR_INVALID_ADDRESS);
 }
 
@@ -135 +124 @@
  * @param   poff        Where to store the segment offset.
  */
-static int rtDbgModPeRVAToSegOff(PRTDBGMODPE pModPe, uint32_t uRVA, int32_t *piSegment, RTUINTPTR *poff)
-{
-    AssertMsgReturn(uRVA < pModPe->cbImage, ("uRVA=%RX32, cbImage=%RX32\n", uRVA, pModPe->cbImage),
-                    VERR_DBGMOD_INVALID_ADDRESS);
+static int rtDbgModPeRVAToSegOff(PKDBGMODPE pModPe, uint32_t uRVA, int32_t *piSegment, KDBGADDR *poff)
+{
+    kDbgAssertMsgReturn(uRVA < pModPe->cbImage, ("uRVA=%x, cbImage=%x\n", uRVA, pModPe->cbImage),
+                    KDBG_ERR_INVALID_ADDRESS);
     for (int32_t iSegment = 0; iSegment < pModPe->cSections; iSegment++)
     {
@@ -147 +136 @@
             *poff = off;
             *piSegment = iSegment;
-            return VINF_SUCCESS;
-        }
-    }
-    AssertMsgFailedReturn(("uRVA=%RX32\n", uRVA), VERR_DBGMOD_INVALID_ADDRESS);
-}
-
-
-/**
- * @copydoc RTDBGMODOPS::pfnQueryLine
- */
-static DECLCALLBACK(int) rtDbgModPEQueryLine(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PRTDBGLINE pLine)
-{
-    PRTDBGMODPE pModPe = (PRTDBGMODPE)pMod;
+            return 0;
+        }
+    }
+    AssertMsgFailedReturn(("uRVA=%x\n", uRVA), KDBG_ERR_INVALID_ADDRESS);
+}
+
+
+/**
+ * @copydoc KDBGMODOPS::pfnQueryLine
+ */
+static DECLCALLBACK(int) rtDbgModPEQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
+{
+    PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
 
     /*
@@ -166 +155 @@
     uint32_t uRVA;
     int rc = rtDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
-    if (RT_SUCCESS(rc))
+    if (!rc)
     {
         DWORD64 off;
@@ -173 +162 @@
         if (g_pfnSymGetLineFromAddr64(pModPe->hSymInst, pModPe->ImageBase + uRVA, &off, &Line))
         {
-            pLine->RVA = (RTUINTPTR)(Line.Address - pModPe->ImageBase);
+            pLine->RVA = (KDBGADDR)(Line.Address - pModPe->ImageBase);
             rc = rtDbgModPeRVAToSegOff(pModPe, pLine->RVA, &pLine->iSegment, &pLine->offSegment);
             pLine->iLine = Line.LineNumber;
@@ -192 +181 @@
 
 /**
- * @copydoc RTDBGMODOPS::pfnQuerySymbol
- */
-static DECLCALLBACK(int) rtDbgModPEQuerySymbol(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PRTDBGSYMBOL pSym)
-{
-    PRTDBGMODPE pModPe = (PRTDBGMODPE)pMod;
+ * @copydoc KDBGMODOPS::pfnQuerySymbol
+ */
+static DECLCALLBACK(int) rtDbgModPEQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
+{
+    PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
 
     /*
@@ -203 +192 @@
     uint32_t uRVA;
     int rc = rtDbgModPeSegOffToRVA(pModPe, iSegment, off, &uRVA);
-    if (RT_SUCCESS(rc))
+    if (!rc)
     {
         DWORD64 off;
@@ -209 +198 @@
         {
             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))
         {
@@ -218 +207 @@
             pSym->fFlags = 0;
             if (Buf.Sym.Flags & SYMFLAG_FUNCTION)
-                pSym->fFlags |= RTDBGSYM_FLAGS_CODE;
+                pSym->fFlags |= KDBGSYM_FLAGS_CODE;
             else if (Buf.Sym.Flags & SYMFLAG_CONSTANT)
-                pSym->fFlags |= RTDBGSYM_FLAGS_ABS; /** @todo SYMFLAG_CONSTANT must be tested - documentation is too brief to say what is really meant here.*/
+                pSym->fFlags |= KDBGSYM_FLAGS_ABS; /** @todo SYMFLAG_CONSTANT must be tested - documentation is too brief to say what is really meant here.*/
             else
-                pSym->fFlags |= RTDBGSYM_FLAGS_DATA;
+                pSym->fFlags |= KDBGSYM_FLAGS_DATA;
             if (Buf.Sym.Flags & SYMFLAG_EXPORT)
-                pSym->fFlags |= RTDBGSYM_FLAGS_EXPORTED;
+                pSym->fFlags |= KDBGSYM_FLAGS_EXPORTED;
             if ((Buf.Sym.Flags & (SYMFLAG_VALUEPRESENT | SYMFLAG_CONSTANT)) == (SYMFLAG_VALUEPRESENT | SYMFLAG_CONSTANT))
             {
-                pSym->iSegment   = RTDBGSEG_ABS;
-                pSym->offSegment = (RTUINTPTR)Buf.Sym.Value;
-                pSym->RVA        = (RTUINTPTR)Buf.Sym.Value;
+                pSym->iSegment   = KDBGSEG_ABS;
+                pSym->offSegment = (KDBGADDR)Buf.Sym.Value;
+                pSym->RVA        = (KDBGADDR)Buf.Sym.Value;
             }
             else
             {
-                pSym->RVA        = (RTUINTPTR)(Buf.Sym.Address - pModPe->ImageBase);
+                pSym->RVA        = (KDBGADDR)(Buf.Sym.Address - pModPe->ImageBase);
                 rc = rtDbgModPeRVAToSegOff(pModPe, pSym->RVA, &pSym->iSegment, &pSym->offSegment);
             }
@@ -253 +242 @@
 
 /**
- * @copydoc RTDBGMODOPS::pfnClose
- */
-static DECLCALLBACK(int) rtDbgModPEClose(PRTDBGMOD pMod)
-{
-    PRTDBGMODPE pModPe = (PRTDBGMODPE)pMod;
+ * @copydoc KDBGMODOPS::pfnClose
+ */
+static DECLCALLBACK(int) rtDbgModPEClose(PKDBGMOD pMod)
+{
+    PKDBGMODPE pModPe = (PKDBGMODPE)pMod;
 
     if (g_pfnSymCleanup(pModPe->hSymInst))
-        return VINF_SUCCESS;
+        return 0;
 
     DWORD Err = GetLastError();
@@ -272 +261 @@
  * Methods for a PE module.
  */
-static const RTDBGMODOPS g_rtDbgModPEOps =
+static const KDBGMODOPS g_rtDbgModPEOps =
 {
     "PE (dbghelp)",
@@ -310 +299 @@
                 }
                 if (pFileInfo->dwFileVersionMS >= 0x60004)
-                    rc = VINF_SUCCESS;
+                    rc = 0;
                 else
                     rc = VERR_VERSION_MISMATCH;
@@ -355 +344 @@
         strcat(strrchr(pszPath, '\\'), s_szDbgHelp);
         int rc2 = rtDbgModPETryDbgHelp(pszPath, &FileVersionMS, &FileVersionLS);
-        if (RT_SUCCESS(rc))
+        if (!rc)
             return rc2;
         if (rc != VERR_VERSION_MISMATCH)
@@ -442 +431 @@
 {
     if (g_hDbgHelp)
-        return VINF_SUCCESS;
+        return 0;
 
     /* primitive locking - make some useful API for this kind of spinning! */
@@ -452 +441 @@
     {
         ASMAtomicXchgU32(&s_u32Lock, 0);
-        return VINF_SUCCESS;
+        return 0;
     }
 
@@ -460 +449 @@
     char szPath[260];
     int rc = rtDbgModPEFindDbgHelp(szPath, sizeof(szPath));
-    if (RT_FAILURE(rc))
+    if (rc)
     {
         ASMAtomicXchgU32(&s_u32Lock, 0);
@@ -520 +509 @@
                 *s_aFunctions[i].ppfn = pfn;
             }
-            if (RT_SUCCESS(rc))
+            if (!rc)
             {
                 ASMAtomicXchgSize(&g_hDbgHelp, hmod);
                 ASMAtomicXchgU32(&s_u32Lock, 0);
-                return VINF_SUCCESS;
+                return 0;
             }
         }
@@ -556 +545 @@
  *
  */
-int rtDbgModPEOpen(RTFILE File, RTFOFF offHdr, const char *pszModulePath, PRTDBGMOD *ppDbgMod)
+int kdbgModPEOpen(RTFILE File, int64_t offHdr, const char *pszModulePath, PKDBGMOD *ppDbgMod)
 {
     /*
@@ -562 +551 @@
      */
     IMAGE_FILE_HEADER FHdr;
-    int rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
+    int rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, FileHeader), &FHdr, sizeof(FHdr), NULL);
     AssertRCReturn(rc, rc);
 
     uint32_t cbImage;
     if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER32))
-        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
+        rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader.SizeOfImage),
                           &cbImage, sizeof(cbImage), NULL);
     else if (FHdr.SizeOfOptionalHeader == sizeof(IMAGE_OPTIONAL_HEADER64))
-        rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
+        rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS64, OptionalHeader.SizeOfImage),
                           &cbImage, sizeof(cbImage), NULL);
     else
@@ -580 +569 @@
      */
     rc = rtDbgModPELoadDbgHelp();
-    if (RT_FAILURE(rc))
+    if (rc)
         return rc;
 
@@ -586 +575 @@
      * Allocate the module and read/construct the section headers.
      */
-    PRTDBGMODPE pModPe = (PRTDBGMODPE)RTMemAlloc(KDBG_OFFSETOF(RTDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
-    AssertReturn(pModPe, VERR_NO_MEMORY);
-    pModPe->Core.u32Magic   = RTDBGMOD_MAGIC;
+    PKDBGMODPE pModPe = (PKDBGMODPE)RTMemAlloc(KDBG_OFFSETOF(KDBGMODPE, aSections[FHdr.NumberOfSections + 2]));
+    AssertReturn(pModPe, KDBG_ERR_NO_MEMORY);
+    pModPe->Core.u32Magic   = KDBGMOD_MAGIC;
     pModPe->Core.pOps       = &g_rtDbgModPEOps;
     pModPe->Core.File       = File;
     pModPe->cbImage         = cbImage;
     pModPe->cSections       = 1 + FHdr.NumberOfSections;
-    rc = RTFileReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
+    rc = kDbgHlpReadAt(File, offHdr + KDBG_OFFSETOF(IMAGE_NT_HEADERS32, OptionalHeader) + FHdr.SizeOfOptionalHeader,
                       &pModPe->aSections[1], sizeof(pModPe->aSections[0]) * FHdr.NumberOfSections, NULL);
-    if (RT_SUCCESS(rc))
+    if (!rc)
     {
         PIMAGE_SECTION_HEADER pSH = &pModPe->aSections[0];
@@ -671 +660 @@
         AssertRC(rc);
 
-    RTMemFree(pModPe);
+    kDbgHlpFree(pModPe);
     return rc;
 }

trunk/kDbg/kDbgModule.cpp

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /** @file
- *
- * kProfile Mark 2 - Debug Info Reader
- *
- * Copyright (c) 2006 knut st. osmundsen <bird-src-spam@anduin.net.de>
- *
+ * kDbg - The Debug Info Reader, Module API.
+ */
+
+/*
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  * This file is part of kLIBC.
@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef KDBG_USE_IPRT
-# include <iprt/file.h>
-# include <iprt/string.h>
-# include <iprt/err.h>
-# include <iprt/assert.h>
-# include <iprt/alloc.h>
-#else
-#endif
-
-#include "kDbgBase.h"
-#include "DBGInternal.h"
+#include "kDbg.h"
+#include "kDbgInternal.h"
+
 #include <kLdrModMZ.h>
 #include <kLdrModPE.h>
@@ -52 +44 @@
  * @param   ppDbgMod            Where to store the debug module handle.
  */
-RTDECL(int) RTDbgModuleOpen(const char *pszModulePath, PRTDBGMOD *ppDbgMod)
+KDBG_DECL(int) kDbgModuleOpen(const char *pszModulePath, PKDBGMOD *ppDbgMod)
 {
     /*
      * Validate input.
      */
-    AssertMsgReturn(VALID_PTR(pszModulePath), ("%p\n", pszModulePath), VERR_INVALID_POINTER);
-    AssertMsgReturn(*pszModulePath, ("%p\n", pszModulePath), VERR_INVALID_PARAMETER);
-    AssertMsgReturn(VALID_PTR(ppDbgMod), ("%p\n", ppDbgMod), VERR_INVALID_POINTER);
+    kDbgAssertPtrReturn(pszModulePath, KDBG_ERR_INVALID_POINTER);
+    kDbgAssertMsgReturn(*pszModulePath, ("%p\n", pszModulePath), KDBG_ERR_INVALID_PARAMETER);
+    kDbgAssertPtrReturn(ppDbgMod, KDBG_ERR_INVALID_POINTER);
     *ppDbgMod = NULL;
 
@@ -65 +57 @@
      * The file and try figure out the format.
      */
-    RTFILE File;
-    int rc = RTFileOpen(&File, pszModulePath, RTFILE_O_READ | RTFILE_O_DENY_WRITE | RTFILE_O_OPEN);
-    if (RT_FAILURE(rc))
+    PKDBGHLPFILE pFile;
+    int rc = kDbgHlpOpenRO(pszModulePath, &pFile);
+    if (rc)
         return rc;
 
-    RTFOFF offHdr = 0;
+    int64_t offHdr = 0;
     union
     {
@@ -77 +69 @@
         uint8_t     ab[16];
     } Buf;
-    rc = RTFileRead(File, &Buf, sizeof(Buf), NULL);
-    if (    RT_SUCCESS(rc)
+    rc = kDbgHlpRead(pFile, &Buf, sizeof(Buf));
+    if (    !rc
         &&  Buf.au16[0] == IMAGE_DOS_SIGNATURE)
     {
         /* new header? */
         uint32_t offNewHeader;
-        rc = RTFileReadAt(File, KDBG_OFFSETOF(IMAGE_DOS_HEADER, e_lfanew), &offNewHeader, sizeof(offNewHeader), NULL);
-        if (RT_SUCCESS(rc) && offNewHeader)
+        rc = kDbgHlpReadAt(pFile, KDBG_OFFSETOF(IMAGE_DOS_HEADER, e_lfanew), &offNewHeader, sizeof(offNewHeader));
+        if (!rc && offNewHeader)
         {
             offHdr = offNewHeader;
-            rc = RTFileReadAt(File, offNewHeader, &Buf, sizeof(Buf), NULL);
+            rc = kDbgHlpReadAt(pFile, offNewHeader, &Buf, sizeof(Buf));
         }
     }
-    if (RT_SUCCESS(rc))
+    if (!rc)
     {
         if (Buf.au16[0] == IMAGE_DOS_SIGNATURE)
-            rc = VERR_NOT_SUPPORTED;
+            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
 #ifdef IMAGE_NE_SIGNATURE
         else if (Buf.au16[0] == IMAGE_NE_SIGNATURE)
-            rc = VERR_NOT_SUPPORTED;
+            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
 #endif
 #ifdef IMAGE_LX_SIGNATURE
         else if (Buf.au16[0] == IMAGE_LX_SIGNATURE)
-            rc = VERR_NOT_SUPPORTED;
+            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
 #endif
 #ifdef IMAGE_LE_SIGNATURE
         else if (Buf.au16[0] == IMAGE_LE_SIGNATURE)
-            rc = VERR_NOT_SUPPORTED;
+            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
 #endif
 #ifdef IMAGE_ELF_SIGNATURE
         else if (Buf.au32[0] == IMAGE_ELF_SIGNATURE)
-            rc = VERR_NOT_SUPPORTED;
+            rc = KDBG_ERR_FORMAT_NOT_SUPPORTED;
 #endif
 #ifdef IMAGE_NT_SIGNATURE
         else if (Buf.au32[0] == IMAGE_NT_SIGNATURE)
-            rc = rtDbgModPEOpen(File, offHdr, pszModulePath, ppDbgMod);
+            rc = kdbgModPEOpen(pFile, offHdr, pszModulePath, ppDbgMod);
 #endif
         /** @todo there are a number of text file formats too which I want to support. */
         else
-            rc = VERR_NOT_SUPPORTED;
-
-    }
-
-    if (RT_FAILURE(rc))
-        RTFileClose(File);
+            rc = KDBG_ERR_UNKOWN_FORMAT;
+    }
+
+    if (rc)
+        kDbgHlpClose(pFile);
     return rc;
 }
@@ -133 +124 @@
  * @param   pMod        The debug module handle.
  */
-DECLINLINE(bool) rtDbgModIsValid(PRTDBGMOD pMod)
-{
-    AssertMsgReturn(VALID_PTR(pMod), ("%p", pMod), false);
-    AssertMsgReturn(pMod->u32Magic == RTDBGMOD_MAGIC, ("%RX32", pMod->u32Magic), false);
-    AssertMsgReturn(VALID_PTR(pMod->pOps), ("%p", pMod->pOps), false);
+KDBG_INLINE(bool) kdbgModIsValid(PKDBGMOD pMod)
+{
+    kDbgAssertPtrReturn(pMod, false);
+    kDbgAssertMsgReturn(pMod->u32Magic == KDBGMOD_MAGIC, ("%#x", pMod->u32Magic), false);
+    kDbgAssertPtrReturn(pMod->pOps, false);
     return true;
 }
@@ -148 +139 @@
  * @param   pMod        The module handle.
  */
-RTDECL(int) RTDbgModuleClose(PRTDBGMOD pMod)
-{
-    if (!rtDbgModIsValid(pMod))
-        return VERR_INVALID_PARAMETER;
+KDBG_DECL(int) kDbgModuleClose(PKDBGMOD pMod)
+{
+    if (!kdbgModIsValid(pMod))
+        return KDBG_ERR_INVALID_PARAMETER;
 
     int rc = pMod->pOps->pfnClose(pMod);
-    if (RT_SUCCESS(rc))
-        RTMemFree(pMod);
+    if (!rc)
+        kDbgHlpFree(pMod);
     return rc;
 }
@@ -173 +164 @@
  * @param   pSym        Where to store the symbol details.
  */
-RTDECL(int) RTDbgModuleQuerySymbol(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PRTDBGSYMBOL pSym)
-{
-    if (!rtDbgModIsValid(pMod))
-        return VERR_INVALID_PARAMETER;
-    AssertMsgReturn(VALID_PTR(pSym), ("%p", pSym), VERR_INVALID_POINTER);
+KDBG_DECL(int) kDbgModuleQuerySymbol(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGSYMBOL pSym)
+{
+    if (!kdbgModIsValid(pMod))
+        return KDBG_ERR_INVALID_PARAMETER;
+    kDbgAssertPtrReturn(pSym, KDBG_ERR_INVALID_POINTER);
 
     return pMod->pOps->pfnQuerySymbol(pMod, iSegment, off, pSym);
@@ -195 +186 @@
  * @param   off         The offset into the segment.
  * @param   ppSym       Where to store the pointer to the symbol info.
- *                      Free the returned symbol using RTDbgSymbolFree().
- */
-RTDECL(int) RTDbgModuleQuerySymbolA(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PPRTDBGSYMBOL ppSym)
-{
-    AssertMsgReturn(VALID_PTR(ppSym), ("%p\n", ppSym), VERR_INVALID_POINTER);
-
-    RTDBGSYMBOL Sym;
-    int rc = RTDbgModuleQuerySymbol(pMod, iSegment, off, &Sym);
-    if (RT_SUCCESS(rc))
-    {
-        *ppSym = RTDbgSymbolDup(&Sym);
+ *                      Free the returned symbol using kDbgSymbolFree().
+ */
+KDBG_DECL(int) kDbgModuleQuerySymbolA(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PPKDBGSYMBOL ppSym)
+{
+    kDbgAssertPtrReturn(ppSym, KDBG_ERR_INVALID_POINTER);
+
+    KDBGSYMBOL Sym;
+    int rc = kDbgModuleQuerySymbol(pMod, iSegment, off, &Sym);
+    if (!rc)
+    {
+        *ppSym = kDbgSymbolDup(&Sym);
         if (!*ppSym)
-            rc = VERR_NO_MEMORY;
+            rc = KDBG_ERR_NO_MEMORY;
     }
     else
@@ -228 +219 @@
  * @param   pLine       Where to store the line number details.
  */
-RTDECL(int) RTDbgModuleQueryLine(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PRTDBGLINE pLine)
-{
-    if (!rtDbgModIsValid(pMod))
-        return VERR_INVALID_PARAMETER;
-    AssertMsgReturn(VALID_PTR(pLine), ("%p", pLine), VERR_INVALID_POINTER);
+KDBG_DECL(int) kDbgModuleQueryLine(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PKDBGLINE pLine)
+{
+    if (!kdbgModIsValid(pMod))
+        return KDBG_ERR_INVALID_PARAMETER;
+    kDbgAssertPtrReturn(pLine, KDBG_ERR_INVALID_POINTER);
 
     return pMod->pOps->pfnQueryLine(pMod, iSegment, off, pLine);
@@ -250 +241 @@
  * @param   off         The offset into the segment.
  * @param   ppLine      Where to store the pointer to the line number info.
- *                      Free the returned line number using RTDbgLineFree().
- */
-RTDECL(int) RTDbgModuleQueryLineA(PRTDBGMOD pMod, int32_t iSegment, RTUINTPTR off, PPRTDBGLINE ppLine)
-{
-    AssertMsgReturn(VALID_PTR(ppLine), ("%p\n", ppLine), VERR_INVALID_POINTER);
-
-    RTDBGLINE Line;
-    int rc = RTDbgModuleQueryLine(pMod, iSegment, off, &Line);
-    if (RT_SUCCESS(rc))
-    {
-        *ppLine = RTDbgLineDup(&Line);
+ *                      Free the returned line number using kDbgLineFree().
+ */
+KDBG_DECL(int) kDbgModuleQueryLineA(PKDBGMOD pMod, int32_t iSegment, KDBGADDR off, PPKDBGLINE ppLine)
+{
+    kDbgAssertPtrReturn(ppLine, KDBG_ERR_INVALID_POINTER);
+
+    KDBGLINE Line;
+    int rc = kDbgModuleQueryLine(pMod, iSegment, off, &Line);
+    if (!rc)
+    {
+        *ppLine = kDbgLineDup(&Line);
         if (!*ppLine)
-            rc = VERR_NO_MEMORY;
+            rc = KDBG_ERR_NO_MEMORY;
     }
     else

trunk/kDbg/kDbgSymbol.cpp

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /** @file
- *
- * kProfile Mark 2 - Debug Info Symbol.
- *
- * Copyright (c) 2006 knut st. osmundsen <bird-src-spam@anduin.net.de>
- *
+ * kDbg - The Debug Info Reader, Symbols.
+ */
+
+/*
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  * This file is part of kLIBC.
@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <iprt/err.h>
-#include <iprt/assert.h>
-#include <iprt/alloc.h>
-
-#include "kDbgBase.h"
-#include "dbg.h"
+#include "kDbg.h"
+#include "kDbgInternal.h"
 
 
@@ -45 +41 @@
  *
  * @returns Pointer to the duplicate.
- *          This must be freed using RTDbgSymbolFree().
+ *          This must be freed using kDbgSymbolFree().
  * @param   pSymbol     The symbol to be duplicated.
  */
-RTDECL(PRTDBGSYMBOL) RTDbgSymbolDup(PCRTDBGSYMBOL pSymbol)
+KDBG_DECL(PKDBGSYMBOL) kDbgSymbolDup(PCKDBGSYMBOL pSymbol)
 {
-    AssertMsgReturn(VALID_PTR(pSymbol), ("%p\n", pSymbol), NULL);
-    size_t cb = KDBG_OFFSETOF(RTDBGSYMBOL, szName[pSymbol->cchName + 1]);
-    return (PRTDBGSYMBOL)RTMemDup(pSymbol, cb);
+    kDbgAssertPtrReturn(pSymbol, NULL);
+    size_t cb = KDBG_OFFSETOF(KDBGSYMBOL, szName[pSymbol->cchName + 1]);
+    return (PKDBGSYMBOL)kDbgHlpAllocDup(pSymbol, cb);
 }
 
@@ -59 +55 @@
  * Frees a symbol obtained from the RTDbg API.
  *
- * @returns VINF_SUCCESS on success.
- * @returns VERR_INVALID_POINTER if a NULL pointer or an !VALID_PTR() is passed in.
+ * @returns 0 on success.
+ * @returns KDBG_ERR_INVALID_POINTER if a NULL pointer or an !KDBG_VALID_PTR() is passed in.
  *
  * @param   pSymbol     The symbol to be freed.
  */
-RTDECL(int) RTDbgSymbolFree(PRTDBGSYMBOL pSymbol)
+KDBG_DECL(int) kDbgSymbolFree(PKDBGSYMBOL pSymbol)
 {
     if (!pSymbol)
-        return VERR_INVALID_POINTER;
-    AssertMsgReturn(VALID_PTR(pSymbol), ("%p\n", pSymbol), VERR_INVALID_POINTER);
+        return KDBG_ERR_INVALID_POINTER;
+    kDbgAssertPtrReturn(pSymbol, KDBG_ERR_INVALID_POINTER);
 
-    RTMemFree(pSymbol);
-    return VINF_SUCCESS;
+    kDbgHlpFree(pSymbol);
+    return 0;
 }