Changeset 3550 for trunk/kStuff/include/k

Timestamp:

Aug 26, 2007, 3:13:35 AM (18 years ago)

Author:

bird

Message:

made kDbg compile again (not linking yet though).

Location:

trunk/kStuff/include/k

Files:

• kDbg.h (modified) (7 diffs)
• kDbgAll.h (added)
• kDefs.h (modified) (1 diff)
• kErrors.h (modified) (2 diffs)
• kHlpAlloc.h (modified) (1 diff)
• kHlpAssert.h (modified) (2 diffs)
• kHlpString.h (modified) (2 diffs)
• kMagics.h (modified) (1 diff)
• kRdr.h (modified) (2 diffs)
• kRdrAll.h (modified) (2 diffs)
• kTypes.h (modified) (2 diffs)

trunk/kStuff/include/k/kDbg.h

@@ -23 +23 @@
  */
 
-#ifndef ___kDbg_h___
-#define ___kDbg_h___
-
-#include "kDbgBase.h"
+#ifndef ___k_kDbg_h___
+#define ___k_kDbg_h___
+
+#include <k/kDefs.h>
+#include <k/kTypes.h>
+#include <k/kRdr.h>
 
 #ifdef __cplusplus
@@ -36 +38 @@
  */
 
-/** The max filename path length used by the debug reader. */
-#define KDBG_PATH_MAX       260
-
-/** The max symbol name length used by the debug reader. */
-#define KDBG_SYMBOL_MAX     384
+/** @def KDBG_DECL
+ * Declares a kDbg function according to build context.
+ * @param type          The return type.
+ */
+#if defined(KDBG_BUILDING_DYNAMIC)
+# define KDBG_DECL(type)        K_DECL_EXPORT(type)
+#elif defined(KDBG_BUILT_DYNAMIC)
+# define KDBG_DECL(type)        K_DECL_IMPORT(type)
+#else
+# define KDBG_DECL(type)        type
+#endif
+
+
+/** The kDbg address type. */
+typedef KU64                    KDBGADDR;
+/** Pointer to a kDbg address. */
+typedef KDBGADDR               *PKDBGADDR;
+/** Pointer to a const kDbg address. */
+typedef const KDBGADDR         *PCKDBGADDR;
+/** @def KDBGADDR_PRI
+ * printf format type. */
+#define KDBGADDR_PRI            KX64_PRI
+/** @def KDBGADDR_MAX
+ * Max kDbg address value. */
+#define KDBGADDR_MAX            KU64_C(0xfffffffffffffffe)
+/** @def KDBGADDR_C
+ * kDbg address constant.
+ * @param c         The constant value. */
+#define KDBGADDR_C(c)           KU64_C(c)
+/** NIL address. */
+#define NIL_KDBGADDR            KU64_MAX
+
 
 /** @name   Special Segments
@@ -47 +76 @@
  * 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 KDBGSEG_RVA (-1)
+#define KDBGSEG_RVA             (-1)
 /** Absolute segment. The offset isn't relative to anything. */
-#define KDBGSEG_ABS (-2)
+#define KDBGSEG_ABS             (-2)
 /** @} */
 
+
+/** The max filename path length used by the debug reader. */
+#define KDBG_PATH_MAX           260
 
 /**
@@ -63 +95 @@
     KDBGADDR    offSegment;
     /** The segment number. */
-    int32_t     iSegment;
+    KI32        iSegment;
     /** The Line number. */
-    uint32_t    iLine;
+    KU32        iLine;
+    /** The actual size of this structure. */
+    KU16        cbSelf;
     /** The length of the filename. */
-    uint16_t    cchFile;
+    KU16        cchFile;
     /** The name of the file this line number relates to. */
     char        szFile[KDBG_PATH_MAX];
@@ -105 +139 @@
  * @{ */
 /** The symbol is weak. */
-#define KDBGSYM_FLAGS_WEAK      UINT32_C(0x00000000)
+#define KDBGSYM_FLAGS_WEAK      KU32_C(0x00000000)
 /** The symbol is absolute.
  * (This also indicated by the segment number.) */
-#define KDBGSYM_FLAGS_ABS       UINT32_C(0x00000001)
+#define KDBGSYM_FLAGS_ABS       KU32_C(0x00000001)
 /** The symbol is exported. */
-#define KDBGSYM_FLAGS_EXPORTED  UINT32_C(0x00000002)
+#define KDBGSYM_FLAGS_EXPORTED  KU32_C(0x00000002)
 /** The symbol is a function/method/procedure/whatever-executable-code. */
-#define KDBGSYM_FLAGS_CODE      UINT32_C(0x00000004)
+#define KDBGSYM_FLAGS_CODE      KU32_C(0x00000004)
 /** The symbol is some kind of data. */
-#define KDBGSYM_FLAGS_DATA      UINT32_C(0x00000008)
+#define KDBGSYM_FLAGS_DATA      KU32_C(0x00000008)
 /** @} */
+
+/** The max symbol name length used by the debug reader. */
+#define KDBG_SYMBOL_MAX         384
 
 /**
@@ -130 +167 @@
     KDBGADDR    offSegment;
     /** The segment number. */
-    int32_t     iSegment;
+    KI32        iSegment;
     /** The symbol flags. */
-    uint32_t    fFlags;
+    KU32        fFlags;
 /** @todo type info? */
+    /** The actual size of this structure. */
+    KU16        cbSelf;
     /** The length of the symbol name. */
-    uint16_t    cchName;
+    KU16        cchName;
     /** The symbol name. */
     char        szName[KDBG_SYMBOL_MAX];
@@ -170 +209 @@
 
 
-/** Pointer to a kDbgHlp file structure (abstract). */
-typedef struct KDBGHLPFILE *PKDBGHLPFILE;
-
-/** A debug module handle. */
+/** Pointer to a debug module. */
 typedef struct KDBGMOD *PKDBGMOD;
-
-/**
- * The debug module method table.
- */
-typedef struct KDBGMODOPS
-{
-    /** The name of the reader. */
-    const char *pszName;
-
-    /** Pointer to the next debug module readers.
-     * This is only used for dynamically registered readers. */
-    struct KDBGMODOPS  *pNext;
-
-    /**
-     * Tries to open the module.
-     *
-     * @returns 0 on success, KDBG_ERR on failure.
-     * @param   pFile           The file
-     * @param   ppMod           Where to store the module that's been opened.
-     * @param   off             The file offset of the debug info. This is 0 if there isn't
-     *                          any specfic debug info section and the reader should start
-     *                          looking for debug info at the start of the file.
-     * @param   cb              The size of the debug info in the file. INT64_MAX if we don't
-     *                          know or there isn't any particular debug info section in the file.
-     * @param   pLdrMod         The associated loader module. This can be NULL.
-     *
-     * @remark  This is NULL for the builtin readers.
-     */
-    int (*pfnOpen)(PKDBGMOD *ppMod, PKDBGHLPFILE pFile, KFOFF off, KFOFF cb, struct KLDRMOD *pLdrMod);
-
-    /**
-     * Closes the module.
-     *
-     * This should free all resources associated with the module
-     * except the pMod which is freed by the caller.
-     *
-     * @returns IPRT status code.
-     * @param   pMod        The module.
-     */
-    int (*pfnClose)(PKDBGMOD pMod);
-
-    /**
-     * Gets a symbol by segment:offset.
-     * This will be approximated to the nearest symbol if there is no exact match.
-     *
-     * @returns 0 on success. KLDR_ERR_* on failure.
-     * @param   pMod        The module.
-     * @param   iSegment    The segment this offset is relative to.
-     *                      The -1 segment is special, it means that the addres is relative to
-     *                      the image base. The image base is where the first bit of the image
-     *                      is mapped during load.
-     * @param   off         The offset into the segment.
-     * @param   pSym        Where to store the symbol details.
-     */
-    int (*pfnQuerySymbol)(PKDBGMOD pMod, KI32 iSegment, KDBGADDR off, PKDBGSYMBOL pSym);
-
-    /**
-     * Gets a line number entry by segment:offset.
-     * This will be approximated to the nearest line number there is no exact match.
-     *
-     * @returns 0 on success. KLDR_ERR_* on failure.
-     * @param   pMod        The module.
-     * @param   iSegment    The segment this offset is relative to.
-     *                      The -1 segment is special, it means that the addres is relative to
-     *                      the image base. The image base is where the first bit of the image
-     *                      is mapped during load.
-     * @param   off         The offset into the segment.
-     * @param   pLine       Where to store the line number details.
-     */
-    int (*pfnQueryLine)(PKDBGMOD pMod, KI32 iSegment, KDBGADDR uOffset, PKDBGLINE pLine);
-
-    /** This is just to make sure you've initialized all the fields.
-     * Must be identical to pszName. */
-    const char *pszName2;
-} KDBGMODOPS;
-/** Pointer to a module method table. */
-typedef KDBGMODOPS *PKDBGMODOPS;
-/** Pointer to a const module method table. */
-typedef const KDBGMODOPS *PCKDBGMODOPS;
-
-/**
- * Register a debug module reader with the kDbgModule component.
- *
- * Dynamically registered readers are kept in FIFO order, and external
- * readers will be tried after the builtin ones.
- *
- * @returns 0 on success.
- * @returns KERR_INVALID_POINTER if pOps is missing bits.
- * @returns KERR_INVALID_PARAMETER if pOps is already in the list.
- * @param   pOps        The reader method table, kDbg takes owner ship of
- *                      this. This must be writeable as the pNext pointer
- *                      will be update. It must also stick around for as
- *                      long as kDbg is in use.
- */
-KDBG_DECL(int) kDbgModuleRegisterReader(PKDBGMODOPS pOps)
-;
-
-
-
-/**
- * Internal representation of a debug module.
- */
-typedef struct KDBGMOD
-{
-    /** Magic value (KDBGMOD_MAGIC). */
-    KI32            u32Magic;
-    /** The handle to the module. (If closed, this is NIL_RTFILE.) */
-    PKDBGHLPFILE    pFile;
-    /** Pointer to the method table. */
-    PCKDBGMODOPS    pOps;
-} KDBGMOD;
-
-
-/** The magic value for the debug module structure. (Some dead english writer) */
-#define KDBGMOD_MAGIC      0x19200501
-/** The magic value of a dead module structure. */
-#define KDBGMOD_MAGIC_DEAD 0x19991231
-
-
-/**
- * Opens the debug info for a specified executable module.
- *
- * @returns IPRT status code.
- * @param   pszModulePath       The path to the executable module.
- * @param   ppDbgMod            Where to store the debug module handle.
- */
-KDBG_DECL(int) kDbgModuleOpen(const char *pszModulePath, PKDBGMOD *ppDbgMod);
-
-/**
- * Closes the module.
- *
- * @returns IPRT status code.
- * @param   pMod        The module handle.
- */
+/** Pointer to a debug module pointer. */
+typedef PKDBGMOD *PPKDBGMOD;
+
+
+KDBG_DECL(int) kDbgModuleOpen(PPKDBGMOD ppDbgMod, const char *pszFilename, struct KLDRMOD *pLdrMod);
+KDBG_DECL(int) kDbgModuleOpenFile(PPKDBGMOD ppDbgMod, PKRDR pRdr, struct KLDRMOD *pLdrMod);
+KDBG_DECL(int) kDbgModuleOpenFilePart(PPKDBGMOD ppDbgMod, PKRDR pRdr, KFOFF off, KFOFF cb, struct KLDRMOD *pLdrMod);
 KDBG_DECL(int) kDbgModuleClose(PKDBGMOD pMod);
-
-/**
- * Gets a symbol by segment:offset.
- * This will be approximated to the nearest symbol if there is no exact match.
- *
- * @returns IPRT status code.
- * @param   pMod        The module.
- * @param   iSegment    The segment this offset is relative to.
- *                      The -1 segment is special, it means that the addres is relative to
- *                      the image base. The image base is where the first bit of the image
- *                      is mapped during load.
- * @param   off         The offset into the segment.
- * @param   pSym        Where to store the symbol details.
- */
 KDBG_DECL(int) kDbgModuleQuerySymbol(PKDBGMOD pMod, KI32 iSegment, KDBGADDR off, PKDBGSYMBOL pSym);
-
-/**
- * Gets & allocates a symbol by segment:offset.
- * This will be approximated to the nearest symbol if there is no exact match.
- *
- * @returns IPRT status code.
- * @param   pMod        The module.
- * @param   iSegment    The segment this offset is relative to.
- *                      The -1 segment is special, it means that the addres is relative to
- *                      the image base. The image base is where the first bit of the image
- *                      is mapped during load.
- * @param   off         The offset into the segment.
- * @param   ppSym       Where to store the pointer to the symbol info.
- *                      Free the returned symbol using kDbgSymbolFree().
- */
 KDBG_DECL(int) kDbgModuleQuerySymbolA(PKDBGMOD pMod, KI32 iSegment, KDBGADDR off, PPKDBGSYMBOL ppSym);
-
-/**
- * Gets a line number entry by segment:offset.
- * This will be approximated to the nearest line number there is no exact match.
- *
- * @returns IPRT status code.
- * @param   pMod        The module.
- * @param   iSegment    The segment this offset is relative to.
- *                      The -1 segment is special, it means that the addres is relative to
- *                      the image base. The image base is where the first bit of the image
- *                      is mapped during load.
- * @param   off         The offset into the segment.
- * @param   pLine       Where to store the line number details.
- */
 KDBG_DECL(int) kDbgModuleQueryLine(PKDBGMOD pMod, KI32 iSegment, KDBGADDR off, PKDBGLINE pLine);
-
-/**
- * Gets & allocates a line number entry by segment:offset.
- * This will be approximated to the nearest line number there is no exact match.
- *
- * @returns IPRT status code.
- * @param   pMod        The module.
- * @param   iSegment    The segment this offset is relative to.
- *                      The -1 segment is special, it means that the addres is relative to
- *                      the image base. The image base is where the first bit of the image
- *                      is mapped during load.
- * @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 kDbgLineFree().
- */
 KDBG_DECL(int) kDbgModuleQueryLineA(PKDBGMOD pMod, KI32 iSegment, KDBGADDR off, PPKDBGLINE ppLine);
 

trunk/kStuff/include/k/kDefs.h

@@ -450 +450 @@
 /** @} */
 
-/** @} */
-
-#endif
-
+/** @def NULL
+ * The nil pointer value. */
+#ifndef NULL
+# ifdef __cplusplus
+#  define NULL          0
+# else
+#  define NULL          ((void *)0)
+# endif
+#endif
+
+/** @} */
+
+#endif
+

trunk/kStuff/include/k/kErrors.h

@@ -87 +87 @@
 /** The (module) format isn't supported by this kDbg build. */
 #define KDBG_ERR_FORMAT_NOT_SUPPORTED                   (KDBG_ERR_BASE + 1)
+/** The (module) format isn't supported by this kDbg build. */
+#define KDBG_ERR_BAD_EXE_FORMAT                         (KDBG_ERR_BASE + 2)
 /** A specified address or an address found in the debug info is invalid. */
-#define KDBG_ERR_INVALID_ADDRESS                        (KDBG_ERR_BASE + 2)
+#define KDBG_ERR_INVALID_ADDRESS                        (KDBG_ERR_BASE + 3)
 /** The dbghelp.dll is too old or something like that. */
-#define KDBG_ERR_DBGHLP_VERSION_MISMATCH                (KDBG_ERR_BASE + 3)
+#define KDBG_ERR_DBGHLP_VERSION_MISMATCH                (KDBG_ERR_BASE + 4)
 /** @} */
 
@@ -96 +98 @@
  * @{ */
 /** the base of the kRdr specific status codes. */
-#define KRDR_ERR_BASE                                   (KDBG_ERR_BASE + 4)
+#define KRDR_ERR_BASE                                   (KDBG_ERR_BASE + 5)
 /** The file reader can't take more concurrent mappings. */
 #define KRDR_ERR_TOO_MANY_MAPPINGS                      (KRDR_ERR_BASE + 0)

trunk/kStuff/include/k/kHlpAlloc.h

@@ -52 +52 @@
 void *  kHlpAlloc(KSIZE cb);
 void *  kHlpAllocZ(KSIZE cb);
-void *  kHlpDup(void *pv, KSIZE cb);
-void *  kHlpStrDup(const char *psz);
+void *  kHlpDup(const void *pv, KSIZE cb);
+const char *kHlpStrDup(const char *psz);
 void *  kHlpRealloc(void *pv, KSIZE cb);
 void    kHlpFree(void *pv);

trunk/kStuff/include/k/kHlpAssert.h

@@ -73 +73 @@
     } while (0)
 
+# define kHlpAssertReturnVoid(expr) \
+    do { \
+        if (!(expr)) \
+        { \
+            kHlpAssertMsg1(#expr, __FILE__, __LINE__, __FUNCTION__); \
+            kHlpAssertBreakpoint(); \
+            return; \
+        }
+    } while (0)
+
 # define kHlpAssertMsg(expr, msg) \
     do { \
@@ -94 +104 @@
     } while (0)
 
+# define kHlpAssertMsgReturnVoid(expr, msg) \
+    do { \
+        if (!(expr)) \
+        { \
+            kHlpAssertMsg1(#expr, __FILE__, __LINE__, __FUNCTION__); \
+            kHlpAssertMsg2 msg; \
+            kHlpAssertBreakpoint(); \
+            return; \
+        }
+    } while (0)
+
 #else   /* !K_STRICT */
 # define kHlpAssert(expr)                       do { } while (0)
 # define kHlpAssertReturn(expr, rcRet)          do { if (!(expr)) return (rcRet); } while (0)
+# define kHlpAssertReturnVoid(expr)             do { if (!(expr)) return; } while (0)
 # define kHlpAssertMsg(expr, msg)               do { } while (0)
 # define kHlpAssertMsgReturn(expr, msg, rcRet)  do { if (!(expr)) return (rcRet); } while (0)
+# define kHlpAssertMsgReturnVoid(expr, msg)     do { if (!(expr)) return; } while (0)
 #endif  /* !K_STRICT */
 
 #define kHlpAssertPtr(ptr)                      kHlpAssertMsg(K_VALID_PTR(ptr), ("%s = %p\n", #ptr, (ptr)))
 #define kHlpAssertPtrReturn(ptr, rcRet)         kHlpAssertMsgReturn(K_VALID_PTR(ptr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)), (rcRet))
+#define kHlpAssertPtrReturnVoid(ptr)            kHlpAssertMsgReturnVoid(K_VALID_PTR(ptr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)))
 #define kHlpAssertPtrNull(ptr)                  kHlpAssertMsg(!(ptr) || K_VALID_PTR(ptr), ("%s = %p\n", #ptr, (ptr)))
 #define kHlpAssertPtrNullReturn(ptr, rcRet)     kHlpAssertMsgReturn(!(ptr) || K_VALID_PTR(ptr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)), (rcRet))
+#define kHlpAssertPtrNullReturnVoid(ptr)        kHlpAssertMsgReturnVoid(!(ptr) || K_VALID_PTR(ptr), ("%s = %p -> %d\n", #ptr, (ptr), (rcRet)))
 #define kHlpAssertRC(rc)                        kHlpAssertMsg((rc) == 0, ("%s = %d\n", #rc, (rc)))
 #define kHlpAssertRCReturn(rc, rcRet)           kHlpAssertMsgReturn((rc) == 0, ("%s = %d -> %d\n", #rc, (rc), (rcRet)), (rcRet))
+#define kHlpAssertRCReturnVoid(rc)              kHlpAssertMsgReturnVoid((rc) == 0, ("%s = %d -> %d\n", #rc, (rc), (rcRet)))
 #define kHlpAssertFailed()                      kHlpAssert(0)
 #define kHlpAssertFailedReturn(rcRet)           kHlpAssertReturn(0, (rcRet))
+#define kHlpAssertFailedReturnVoid()            kHlpAssertReturnVoid(0)
 #define kHlpAssertMsgFailed(msg)                kHlpAssertMsg(0, msg)
 #define kHlpAssertMsgFailedReturn(msg, rcRet)   kHlpAssertMsgReturn(0, msg, (rcRet))
+#define kHlpAssertMsgFailedReturnVoid(msg)      kHlpAssertMsgReturnVoid(0, msg))
 
 /**

trunk/kStuff/include/k/kHlpString.h

@@ -85 +85 @@
 int     kHlpMemIComp(const void *pv1, const void *pv2, KSIZE cb);
 
+#ifndef kHlpStrCat
+char   *kHlpStrCat(char *psz1, const char *psz2);
+#endif
+#ifndef kHlpStrNCat
+char   *kHlpStrNCat(char *psz1, const char *psz2, KSIZE cb);
+#endif
 #ifndef kHlpStrChr
 char   *kHlpStrChr(const char *psz, int ch);
+#endif
+#ifndef kHlpStrRChr
+char   *kHlpStrRChr(const char *psz, int ch);
 #endif
 #ifndef kHlpStrComp
@@ -93 +102 @@
 #ifndef kHlpStrNComp
 int     kHlpStrNComp(const char *psz1, const char *psz2, KSIZE cch);
+#endif
+#ifndef kHlpStrCopy
+char   *kHlpStrCopy(char *psz1, const char *psz2);
+#endif
+#ifndef kHlpStrNCopy
+char   *kHlpStrNCopy(char *psz1, const char *psz2, KSIZE cb);
 #endif
 #ifndef kHlpStrLen

trunk/kStuff/include/k/kMagics.h

@@ -30 +30 @@
 
 /** The magic for KRDR::u32Magic. (Katsu Aki (Katsuaki Nakamura))
+ * @ingroup grp_kRdrAll */
+#define KRDR_MAGIC          0x19610919
+/** The magic value for the debug module structure. (Some manga artist)
  * @ingroup grp_kDbgAll */
-#define KRDR_MAGIC   0x19610919
-
+#define KDBGMOD_MAGIC       0x19200501
 
 #endif

trunk/kStuff/include/k/kRdr.h

@@ -65 +65 @@
 KRDR_DECL(KIPTR)    kRdrNativeFH( PKRDR pRdr);
 KRDR_DECL(KSIZE)    kRdrPageSize( PKRDR pRdr);
-#ifndef ___k_kLdr___
+#ifdef ___k_kLdr___
 KRDR_DECL(int)      kRdrMap(      PKRDR pRdr, void **ppvBase, KU32 cSegments, PCKLDRSEG paSegments, KBOOL fFixed);
 KRDR_DECL(int)      kRdrRefresh(  PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
@@ -71 +71 @@
 KRDR_DECL(int)      kRdrUnmap(    PKRDR pRdr, void *pvBase, KU32 cSegments, PCKLDRSEG paSegments);
 #endif /* !___k_kLdr___ */
-KRDR_DECL(void)     kRdrDone(PKRDR pRdr);
+KRDR_DECL(void)     kRdrDone(     PKRDR pRdr);
 
 KRDR_DECL(int)      kRdrBufOpen(PPKRDR ppRdr, const char *pszFilename);
-KRDR_DECL(int)      kRdrBufWrap(PPKRDR ppRdr, PKRDR pRdr);
-KRDR_DECL(int)      kRdrBufLine(  PKRDR pRdr, char *pszLine, KSIZE cbLine);
+KRDR_DECL(int)      kRdrBufWrap(PPKRDR ppRdr, PKRDR pRdr, KBOOL fCloseIt);
+KRDR_DECL(KBOOL)    kRdrBufIsBuffered(PKRDR pRdr);
+KRDR_DECL(int)      kRdrBufLine(PKRDR pRdr, char *pszLine, KSIZE cbLine);
 KRDR_DECL(int)      kRdrBufLineEx(PKRDR pRdr, char *pszLine, KSIZE *pcbLine);
 KRDR_DECL(const char *) kRdrBufLineQ(PKRDR pRdr);

trunk/kStuff/include/k/kRdrAll.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * kRdr - The File Provider, All Dependencies Included.
+ * kRdr - The File Provider, All Details and Dependencies Included.
  */
 
@@ -25 +25 @@
  */
 
-#ifndef ___kRdrAll_h___
-#define ___kRdrAll_h___
+#ifndef ___k_kRdrAll_h___
+#define ___k_kRdrAll_h___
 
 #include <k/kDefs.h>

trunk/kStuff/include/k/kTypes.h

@@ -166 +166 @@
 typedef signed char             KI8;
 typedef unsigned char           KU8;
-#define KI64_C(c)               (c ## ULL)
-#define KU64_C(c)               (c ## LL)
+#define KI64_C(c)               (c ## LL)
+#define KU64_C(c)               (c ## ULL)
 #define KI32_C(c)               (c)
 #define KU32_C(c)               (c)
@@ -224 +224 @@
 #   define KX64_PRI              "llx"
 #  endif
-#  define KI64_C(c)             (c ## ULL)
-#  define KU64_C(c)             (c ## LL)
+#  define KI64_C(c)             (c ## LL)
+#  define KU64_C(c)             (c ## ULL)
 # else
 typedef signed long int         KI64;
 typedef unsigned long int       KU64;
-#  define KI64_C(c)             (c ## UL)
-#  define KU64_C(c)             (c ## L)
+#  define KI64_C(c)             (c ## L)
+#  define KU64_C(c)             (c ## UL)
 #  define KI64_PRI              "ld"
 #  define KU64_PRI              "lu"