ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libecb/ecb.h
(Generate patch)

Comparing libecb/ecb.h (file contents):
Revision 1.158 by sf-exg, Fri Feb 20 17:23:51 2015 UTC vs.
Revision 1.159 by sf-exg, Sun Feb 22 16:35:20 2015 UTC

… …
74 #else 74 #else
75 #define ECB_PTRSIZE 4 75 #define ECB_PTRSIZE 4
76 #endif 76 #endif
77#endif 77#endif
78 78
79#define ECB_GCC_AMD64 (__amd64 || __amd64__ || __x86_64 || __x86_64__)
80#define ECB_MSVC_AMD64 (_M_AMD64 || _M_X64)
81
79/* work around x32 idiocy by defining proper macros */ 82/* work around x32 idiocy by defining proper macros */
80#if __amd64 || __x86_64 || _M_AMD64 || _M_X64 83#if ECB_GCC_AMD64 || ECB_MSVC_AMD64
81 #if _ILP32 84 #if _ILP32
82 #define ECB_AMD64_X32 1 85 #define ECB_AMD64_X32 1
83 #else 86 #else
84 #define ECB_AMD64 1 87 #define ECB_AMD64 1
85 #endif 88 #endif
… …
153 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110 156 #if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
154 #if __i386 || __i386__ 157 #if __i386 || __i386__
155 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 158 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
156 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") 159 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
157 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 160 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
158 #elif __amd64 || __amd64__ || __x86_64 || __x86_64__ 161 #elif ECB_GCC_AMD64
159 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 162 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
160 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory") 163 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
161 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 164 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
162 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ 165 #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
163 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 166 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory")
… …
591 /* but less than using pointers, and always seems to */ 594 /* but less than using pointers, and always seems to */
592 /* successfully return a constant. */ 595 /* successfully return a constant. */
593 /* the reason why we have this horrible preprocessor mess */ 596 /* the reason why we have this horrible preprocessor mess */
594 /* is to avoid it in all cases, at least on common architectures */ 597 /* is to avoid it in all cases, at least on common architectures */
595 /* or when using a recent enough gcc version (>= 4.6) */ 598 /* or when using a recent enough gcc version (>= 4.6) */
596#if ((__i386 || __i386__) && !__VOS__) || _M_IX86 || __amd64 || __amd64__ || _M_X64 599#if ((__i386 || __i386__) && !__VOS__) || _M_IX86 || ECB_GCC_AMD64 || ECB_MSVC_AMD64
597 return 0x44; 600 return 0x44;
598#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ 601#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
599 return 0x44; 602 return 0x44;
600#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ 603#elif __BYTE_ORDER__ && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
601 return 0x11; 604 return 0x11;
… …
652 655
653/* basically, everything uses "ieee pure-endian" floating point numbers */ 656/* basically, everything uses "ieee pure-endian" floating point numbers */
654/* the only noteworthy exception is ancient armle, which uses order 43218765 */ 657/* the only noteworthy exception is ancient armle, which uses order 43218765 */
655#if 0 \ 658#if 0 \
656 || __i386 || __i386__ \ 659 || __i386 || __i386__ \
657 || __amd64 || __amd64__ || __x86_64 || __x86_64__ \ 660 || ECB_GCC_AMD64 \
658 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \ 661 || __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__ \
659 || defined __s390__ || defined __s390x__ \ 662 || defined __s390__ || defined __s390x__ \
660 || defined __mips__ \ 663 || defined __mips__ \
661 || defined __alpha__ \ 664 || defined __alpha__ \
662 || defined __hppa__ \ 665 || defined __hppa__ \
663 || defined __ia64__ \ 666 || defined __ia64__ \
664 || defined __m68k__ \ 667 || defined __m68k__ \
665 || defined __m88k__ \ 668 || defined __m88k__ \
666 || defined __sh__ \ 669 || defined __sh__ \
667 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 \ 670 || defined _M_IX86 || defined ECB_MSVC_AMD64 || defined _M_IA64 \
668 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \ 671 || (defined __arm__ && (defined __ARM_EABI__ || defined __EABI__ || defined __VFP_FP__ || defined _WIN32_WCE || defined __ANDROID__)) \
669 || defined __aarch64__ 672 || defined __aarch64__
670 #define ECB_STDFP 1 673 #define ECB_STDFP 1
671 #include <string.h> /* for memcpy */ 674 #include <string.h> /* for memcpy */
672#else 675#else

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines