Changeset 2944 for trunk/kLdr/kLdrHlp.h

Timestamp:

Jan 13, 2007, 4:55:40 PM (19 years ago)

Author:

bird

Message:

split up kLdrHlp.c and kLdr.c to make it more flexible (like using the module interpreters without the dynamic loader bit and similar).

File:

• trunk/kLdr/kLdrHlp.h (modified) (3 diffs)

trunk/kLdr/kLdrHlp.h

@@ -63 +63 @@
 
 /*
- * Compiler specific helpers.
+ * Compiler specific helpers / CRT.
  * (I.e. operations that tend to have compiler intrinsic implementations).
  */
-#ifdef __GNUC__
+#ifndef KLDR_USE_CRT
+
+# ifdef __GNUC__
 /** memchr */
-# define kLdrHlpMemChr(a,b,c)  __builtin_memchr(a,b,c)
+#  define kLdrHlpMemChr(a,b,c)  __builtin_memchr(a,b,c)
 /** memcmp */
-# define kLdrHlpMemComp(a,b,c) __builtin_memcmp(a,b,c)
+#  define kLdrHlpMemComp(a,b,c) __builtin_memcmp(a,b,c)
 /** memcpy */
-# define kLdrHlpMemCopy(a,b,c) __builtin_memcpy(a,b,c)
+#  define kLdrHlpMemCopy(a,b,c) __builtin_memcpy(a,b,c)
 /** memmove */
 /*# define kLdrHlpMemMove(a,b,c) __builtin_memmove(a,b,c)*/
-# define kLdrHlpMemMove_needed
+#  define kLdrHlpMemMove_needed
 /** memset */
-# define kLdrHlpMemSet(a,b,c)  __builtin_memset(a,b,c)
+#  define kLdrHlpMemSet(a,b,c)  __builtin_memset(a,b,c)
 /** strchr */
-# define kLdrHlpStrChr(a, b)   __builtin_strchr(a, b)
+#  define kLdrHlpStrChr(a, b)   __builtin_strchr(a, b)
 /** strcmp */
-# define kLdrHlpStrComp(a, b)  __builtin_strcmp(a, b)
+#  define kLdrHlpStrComp(a, b)  __builtin_strcmp(a, b)
 /** strncmp */
-# define kLdrHlpStrNComp(a,b,c) __builtin_strncmp(a, b, c)
+#  define kLdrHlpStrNComp(a,b,c) __builtin_strncmp(a, b, c)
 /** strlen */
-# define kLdrHlpStrLen(a)      __builtin_strlen(a)
+#  define kLdrHlpStrLen(a)      __builtin_strlen(a)
 /** alloca */
-# define kLdrHlpAllocA(a)      __builtin_alloca(a)
+#  define kLdrHlpAllocA(a)      __builtin_alloca(a)
 /** int3 */
-# define kldrHlpBreakpoint() do { __asm__ __volatile__ ("int3\n\tnop"); } while (0)
+#  define kldrHlpBreakpoint() do { __asm__ __volatile__ ("int3\n\tnop"); } while (0)
 /** NULL */
-# ifndef NULL
-#  define NULL 0
-# endif
-#endif
-
-#ifdef _MSC_VER
-# include <string.h>
-# include <malloc.h>
-# pragma intrinsic(memcmp, memcpy, memset, strcmp, strlen, __debugbreak)
+#  ifndef NULL
+#   define NULL 0
+#  endif
+# endif
+
+# ifdef _MSC_VER
+#  include <string.h>
+#  include <malloc.h>
+#  pragma intrinsic(memcmp, memcpy, memset, strcmp, strlen, __debugbreak)
 /** memchr */
-# define kLdrHlpMemChr_needed
+#  define kLdrHlpMemChr_needed
 /** memcmp */
-# define kLdrHlpMemComp(a,b,c) memcmp(a,b,c)
+#  define kLdrHlpMemComp(a,b,c) memcmp(a,b,c)
 /** memcpy */
-# define kLdrHlpMemCopy(a,b,c) memcpy(a,b,c)
+#  define kLdrHlpMemCopy(a,b,c) memcpy(a,b,c)
 /** memmove */
-# define kLdrHlpMemMove_needed
+#  define kLdrHlpMemMove_needed
 /** memset */
-# define kLdrHlpMemSet(a,b,c)  memset(a,b,c)
+#  define kLdrHlpMemSet(a,b,c)  memset(a,b,c)
 /** strcmp */
-# define kLdrHlpStrComp(a, b)  strcmp(a, b)
+#  define kLdrHlpStrComp(a, b)  strcmp(a, b)
 /** strncmp */
-# define kLdrHlpStrNComp_needed
+#  define kLdrHlpStrNComp_needed
 /** strlen */
-# define kLdrHlpStrLen(a)      strlen(a)
+#  define kLdrHlpStrLen(a)      strlen(a)
 /** strchr */
-# define kLdrHlpStrChr_needed
+#  define kLdrHlpStrChr_needed
 /** alloca */
-# define kLdrHlpAllocA(a)      alloca(a)
+#  define kLdrHlpAllocA(a)      alloca(a)
 /** int3 */
-# define kldrHlpBreakpoint() __debugbreak()
+#  define kldrHlpBreakpoint() __debugbreak()
 /** NULL */
-# ifndef NULL
-#  define NULL 0
-# endif
-#endif
-
-#ifdef kLdrHlpStrChr_needed
+#  ifndef NULL
+#   define NULL 0
+#  endif
+# endif
+
+# ifdef kLdrHlpStrChr_needed
 char   *kLdrHlpStrChr(const char *psz, int ch);
-#endif
-#ifdef kLdrHlpStrChr_needed
+# endif
+# ifdef kLdrHlpStrChr_needed
 int     kLdrHlpStrNComp(const char *psz1, const char *psz2, size_t cch);
-#endif
-#ifdef kLdrHlpMemChr_needed
+# endif
+# ifdef kLdrHlpMemChr_needed
 void   *kLdrHlpMemChr(const void *pv, int ch, size_t cb);
-#endif
-#ifdef kLdrHlpMemMove_needed
+# endif
+# ifdef kLdrHlpMemMove_needed
 void   *kLdrHlpMemMove(void *pv1, const void *pv2, size_t cb);
-#endif
-int     kLdrHlpMemIComp(const void *pv1, const void *pv2, size_t cb);
-int     kLdrHlpStrIComp(const char *pv1, const char *pv2);
-
+# endif
+
+
+#else /* KLDR_USE_CRT */
+
+#  include <string.h>
+#  include <stdlib.h>
+#  ifdef _MSC_VER
+#   include <malloc.h>
+#  endif
+
+#  define kLdrHlpMemChr(a,b,c)  memchr(a,b,c)
+/** memcmp */
+#  define kLdrHlpMemComp(a,b,c) memcmp(a,b,c)
+/** memcpy */
+#  define kLdrHlpMemCopy(a,b,c) memcpy(a,b,c)
+/** memmove */
+#  define kLdrHlpMemMove(a,b,c) memmove(a,b,c)
+/** memset */
+#  define kLdrHlpMemSet(a,b,c)  memset(a,b,c)
+/** strchr */
+#  define kLdrHlpStrChr(a, b)   strchr(a, b)
+/** strcmp */
+#  define kLdrHlpStrComp(a, b)  strcmp(a, b)
+/** strncmp */
+#  define kLdrHlpStrNComp(a,b,c) strncmp(a, b, c)
+/** strlen */
+#  define kLdrHlpStrLen(a)      strlen(a)
+/** alloca */
+#  define kLdrHlpAllocA(a)      alloca(a)
+/** int3 */
+#  ifdef __GNUC__
+#   define kldrHlpBreakpoint() do { __asm__ __volatile__ ("int3\n\tnop"); } while (0)
+#  endif 
+#  ifdef _MSC_VER
+#   define kldrHlpBreakpoint() __debugbreak()
+#  endif 
+
+#endif 
 
 #if (!defined(kLdrHlpMemChr) && !defined(kLdrHlpStrChr_needed))\
@@ -157 +194 @@
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
+int     kLdrHlpMemIComp(const void *pv1, const void *pv2, size_t cb);
+int     kLdrHlpStrIComp(const char *pv1, const char *pv2);
+
 int     kldrHlpSemInit(void);
 void    kldrHlpSemTerm(void);
@@ -183 +227 @@
 char   *kldrHlpInt2Ascii(char *psz, size_t cch, long lVal, unsigned iBase);
 void    kldrHlpAssertMsg(const char *pszExpr, const char *pszFile, unsigned iLine, const char *pszFunction);
+
+#ifdef __cplusplus
+}
+#endif 
+
 
 /** Assertion macro.