Joined 32 and 64 bit configurations, made platform linking unnecessary.

[pdclib] / platform / example / internals / _PDCLIB_config.h

diff --git a/platform/example/internals/_PDCLIB_config.h b/platform/example/internals/_PDCLIB_config.h
index 843653a7c666374927cf8714c7a020048f3338ea..0717adb30cb28238f170faa26dfc717ade86acd0 100644 (file)
--- a/platform/example/internals/_PDCLIB_config.h
+++ b/platform/example/internals/_PDCLIB_config.h
@@ -53,7 +53,11 @@
 /* compiler manuals.                                                          */
 #define _PDCLIB_SHRT_BYTES  2
 #define _PDCLIB_INT_BYTES   4
+#ifdef __LP64__
+#define _PDCLIB_LONG_BYTES  8
+#else
 #define _PDCLIB_LONG_BYTES  4
+#endif
 #define _PDCLIB_LLONG_BYTES 8
 
 /* <stdlib.h> defines the div() function family that allows taking quotient   */
@@ -112,9 +116,9 @@ struct _PDCLIB_lldiv_t
 #define _PDCLIB_fast32 int
 #define _PDCLIB_FAST32_CONV
 
-#define _PDCLIB_FAST64 LLONG
-#define _PDCLIB_fast64 long long
-#define _PDCLIB_FAST64_CONV ll
+#define _PDCLIB_FAST64 LONG
+#define _PDCLIB_fast64 long
+#define _PDCLIB_FAST64_CONV l
 
 /* -------------------------------------------------------------------------- */
 /* What follows are a couple of "special" typedefs and their limits. Again,   */
@@ -123,9 +127,9 @@ struct _PDCLIB_lldiv_t
 /* -------------------------------------------------------------------------- */
 
 /* The result type of substracting two pointers */
-#define _PDCLIB_ptrdiff int
-#define _PDCLIB_PTRDIFF INT
-#define _PDCLIB_PTR_CONV
+#define _PDCLIB_ptrdiff long
+#define _PDCLIB_PTRDIFF LONG
+#define _PDCLIB_PTR_CONV l
 
 /* An integer type that can be accessed as atomic entity (think asynchronous
    interrupts). The type itself is not defined in a freestanding environment,
@@ -135,8 +139,8 @@ struct _PDCLIB_lldiv_t
 #define _PDCLIB_SIG_ATOMIC INT
 
 /* Result type of the 'sizeof' operator (must be unsigned) */
-#define _PDCLIB_size unsigned int
-#define _PDCLIB_SIZE UINT
+#define _PDCLIB_size unsigned long
+#define _PDCLIB_SIZE ULONG
 
 /* Large enough an integer to hold all character codes of the largest supported
    locale.
@@ -144,8 +148,11 @@ struct _PDCLIB_lldiv_t
 #define _PDCLIB_wchar unsigned short 
 #define _PDCLIB_WCHAR USHRT
 
-#define _PDCLIB_intptr int
-#define _PDCLIB_INTPTR INT
+/* (Signed) integer type capable of taking the (cast) value of a void *, and
+   having the value cast back to void *, comparing equal to the original.
+*/
+#define _PDCLIB_intptr long
+#define _PDCLIB_INTPTR LONG
 
 /* Largest supported integer type. Implementation note: see _PDCLIB_atomax(). */
 #define _PDCLIB_intmax long long int
@@ -209,7 +216,12 @@ struct _PDCLIB_imaxdiv_t
 /* Variable Length Parameter List Handling (<stdarg.h>)
    The macros defined by <stdarg.h> are highly dependent on the calling
    conventions used, and you probably have to replace them with builtins of
-   your compiler. The following generic implementation works only for pure
+   your compiler.
+*/
+
+#ifdef __i386
+
+/* The following generic implementation works only for pure
    stack-based architectures, and only if arguments are aligned to pointer
    type. Credits to Michael Moody, who contributed this to the Public Domain.
 */
@@ -223,6 +235,23 @@ typedef char * _PDCLIB_va_list;
 #define _PDCLIB_va_end( ap ) ( (ap) = (void *)0, (void)0 )
 #define _PDCLIB_va_start( ap, parmN ) ( (ap) = (char *) &parmN + ( _PDCLIB_va_round(parmN) ), (void)0 )
 
+#elif __x86_64
+
+/* No way to cover x86_64 with a generic implementation, as it uses register-
+   based parameter passing. Using the GCC builtins here.
+*/
+typedef __builtin_va_list _PDCLIB_va_list;
+#define _PDCLIB_va_arg( ap, type ) ( __builtin_va_arg( ap, type ) )
+#define _PDCLIB_va_copy( dest, src ) ( __builtin_va_copy( dest, src ) )
+#define _PDCLIB_va_end( ap ) ( __builtin_va_end( ap ) )
+#define _PDCLIB_va_start( ap, parmN ) ( __builtin_va_start( ap, parmN ) )
+
+#else
+
+#error Please create your own _PDCLIB_config.h. Using the existing one as-is will not work.
+
+#endif
+
 /* -------------------------------------------------------------------------- */
 /* OS "glue", part 1                                                          */
 /* These are values and data type definitions that you would have to adapt to */