Changeset 3636

Timestamp:

07/16/07 15:00:42 (1 year ago)

Author:

vboxsync

Message:

AMD64 -> RT_ARCH_AMD64; X86 -> RT_ARCH_X86; [OS] (except LINUX) -> RT_OS_[OS].

Files:

• trunk/include/iprt/asm.h (modified) (101 diffs)
• trunk/include/iprt/asmdefs.mac (modified) (2 diffs)
• trunk/include/iprt/cdefs.h (modified) (11 diffs)
• trunk/include/iprt/err.h (modified) (2 diffs)
• trunk/include/iprt/file.h (modified) (1 diff)
• trunk/include/iprt/log.h (modified) (2 diffs)
• trunk/include/iprt/mem.h (modified) (1 diff)
• trunk/include/iprt/nocrt/fenv.h (modified) (1 diff)
• trunk/include/iprt/nocrt/limits.h (modified) (1 diff)
• trunk/include/iprt/nocrt/math.h (modified) (1 diff)
• trunk/include/iprt/nocrt/setjmp.h (modified) (1 diff)
• trunk/include/iprt/nocrt/stddef.h (modified) (1 diff)
• trunk/include/iprt/path.h (modified) (4 diffs)
• trunk/include/iprt/spinlock.h (modified) (2 diffs)
• trunk/include/iprt/string.h (modified) (2 diffs)
• trunk/include/iprt/types.h (modified) (3 diffs)

trunk/include/iprt/asm.h

@@ -76 +76 @@
-#  pragma intrinsic(_InterlockedCompareExchange)
-#  pragma intrinsic(_InterlockedCompareExchange64)
-__AMD64__
+RT_ARCH_AMD64
-#   pragma intrinsic(__stosq)
-#   pragma intrinsic(__readcr8)
@@ -103 +103 @@
- *          inline assmebly in their AMD64 compiler.
- */
-__AMD64__
+RT_ARCH_AMD64
-# define RT_INLINE_ASM_EXTERNAL 1
-#else
@@ -174 +174 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pIdtr]
-        sidt    [rax]
@@ -201 +201 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pIdtr]
-        lidt    [rax]
@@ -228 +228 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pGdtr]
-        sgdt    [rax]
@@ -419 +419 @@
-    RTCCUINTREG uFlags;
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ __volatile__("pushfq\n\t"
-                         "popq  %0\n\t"
@@ -431 +431 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        pushfq
-        pop  [uFlags]
@@ -455 +455 @@
-{
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ __volatile__("pushq %0\n\t"
-                         "popfq\n\t"
@@ -467 +467 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        push    [uFlags]
-        popfq
@@ -526 +526 @@
-{
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    RTCCUINTREG uRAX, uRBX, uRCX, uRDX;
-    __asm__ ("cpuid\n\t"
@@ -614 +614 @@
-    RTCCUINTREG xDX;
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    RTCCUINTREG uSpill;
-    __asm__ ("cpuid"
@@ -621 +621 @@
-             : "0" (uOperator)
-             : "rbx", "rcx");
-__DARWIN__
+RT_OS_DARWIN
-    __asm__ ("push  %%ebx\n\t"
-             "cpuid\n\t"
@@ -670 +670 @@
-    RTCCUINTREG xCX;
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    RTCCUINTREG uSpill;
-    __asm__ ("cpuid"
@@ -677 +677 @@
-             : "0" (uOperator)
-             : "rbx", "rdx");
-__DARWIN__
+RT_OS_DARWIN
-    __asm__ ("push  %%ebx\n\t"
-             "cpuid\n\t"
@@ -721 +721 @@
-DECLINLINE(bool) ASMHasCpuId(void)
-{
-__AMD64__
+RT_ARCH_AMD64
-    return true; /* ASSUME that all amd64 compatible CPUs have cpuid. */
-__AMD64__
+RT_ARCH_AMD64
-    bool        fRet = false;
-# if RT_INLINE_ASM_GNU_STYLE
@@ -759 +759 @@
-# endif
-    return fRet;
-__AMD64__
+RT_ARCH_AMD64
-}
-
@@ -775 +775 @@
-    RTCCUINTREG xBX;
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    RTCCUINTREG uSpill;
-    __asm__ ("cpuid"
@@ -782 +782 @@
-             : "0" (1)
-             : "rcx", "rdx");
-__DARWIN__
+RT_OS_DARWIN
-    RTCCUINTREG uSpill;
-    __asm__ ("mov   %%ebx,%1\n\t"
@@ -833 +833 @@
-
-# elif RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ ("movq  %%cr0, %0\t\n" : "=r" (uCR0));
-#  else
@@ -841 +841 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, cr0
-        mov     [uCR0], rax
@@ -868 +868 @@
-
-# elif RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ __volatile__("movq %0, %%cr0\n\t" :: "r" (uCR0));
-#  else
@@ -876 +876 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [uCR0]
-        mov     cr0, rax
@@ -903 +903 @@
-
-# elif RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ ("movq  %%cr2, %0\t\n" : "=r" (uCR2));
-#  else
@@ -911 +911 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, cr2
-        mov     [uCR2], rax
@@ -935 +935 @@
-{
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ __volatile__("movq %0, %%cr2\n\t" :: "r" (uCR2));
-#  else
@@ -943 +943 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [uCR2]
-        mov     cr2, rax
@@ -970 +970 @@
-
-# elif RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ ("movq  %%cr3, %0\t\n" : "=r" (uCR3));
-#  else
@@ -978 +978 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, cr3
-        mov     [uCR3], rax
@@ -1006 +1006 @@
-
-# elif RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ __volatile__ ("movq %0, %%cr3\n\t" : : "r" (uCR3));
-#  else
@@ -1014 +1014 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [uCR3]
-        mov     cr3, rax
@@ -1040 +1040 @@
-# elif RT_INLINE_ASM_GNU_STYLE
-    RTCCUINTREG u;
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ __volatile__ ("movq %%cr3, %0\n\t"
-                          "movq %0, %%cr3\n\t"
@@ -1052 +1052 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, cr3
-        mov     cr3, rax
@@ -1079 +1079 @@
-
-# elif RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ ("movq  %%cr4, %0\t\n" : "=r" (uCR4));
-#  else
@@ -1087 +1087 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, cr4
-        mov     [uCR4], rax
@@ -1120 +1120 @@
-
-# elif RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ __volatile__ ("movq %0, %%cr4\n\t" : : "r" (uCR4));
-#  else
@@ -1128 +1128 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [uCR4]
-        mov     cr4, rax
@@ -1153 +1153 @@
-DECLINLINE(RTCCUINTREG) ASMGetCR8(void)
-{
-__AMD64__
+RT_ARCH_AMD64
-    RTCCUINTREG uCR8;
-#  if RT_INLINE_ASM_USES_INTRIN
@@ -1168 +1168 @@
-#  endif
-    return uCR8;
-__AMD64__
+RT_ARCH_AMD64
-    return 0;
-__AMD64__
+RT_ARCH_AMD64
-}
-#endif
@@ -1223 +1223 @@
-    RTCCUINTREG xFlags;
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ __volatile__("pushfq\n\t"
-                         "cli\n\t"
@@ -1234 +1234 @@
-                         : "=m" (xFlags));
-#  endif
-__X86__
+RT_ARCH_X86
-    xFlags = ASMGetFlags();
-    _disable();
@@ -1404 +1404 @@
-    RTCCUINTREG uDR7;
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ ("movq   %%dr7, %0\n\t" : "=r" (uDR7));
-#  else
@@ -1412 +1412 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, dr7
-        mov     [uDR7], rax
@@ -1438 +1438 @@
-    RTCCUINTREG uDR6;
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ ("movq   %%dr6, %0\n\t" : "=r" (uDR6));
-#  else
@@ -1446 +1446 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, dr6
-        mov     [uDR6], rax
@@ -1473 +1473 @@
-# if RT_INLINE_ASM_GNU_STYLE
-    RTCCUINTREG uNewValue =  0xffff0ff0;  /* 31-16 and 4-11 are 1's, 12 and 63-31 are zero. */
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ ("movq   %%dr6, %0\n\t"
-             "movq   %1, %%dr6\n\t"
@@ -1487 +1487 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, dr6
-        mov     [uDR6], rax
@@ -1742 +1742 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rdx, [pu8]
-        mov     al, [u8]
@@ -1810 +1810 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rdx, [pu16]
-        mov     ax, [u16]
@@ -1865 +1865 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rdx, [pu32]
-        mov     eax, u32
@@ -1908 +1908 @@
-DECLINLINE(uint64_t) ASMAtomicXchgU64(volatile uint64_t *pu64, uint64_t u64)
-{
-__AMD64__
+RT_ARCH_AMD64
-#  if RT_INLINE_ASM_USES_INTRIN
-   u64 = _InterlockedExchange64((__int64 *)pu64, u64);
@@ -1926 +1926 @@
-    }
-#  endif
-__AMD64__
+RT_ARCH_AMD64
-#  if RT_INLINE_ASM_GNU_STYLE
-__DARWIN__
+RT_OS_DARWIN
-    uint32_t u32 = (uint32_t)u64;
-    __asm__ __volatile__(/*"xchgl %%esi, %5\n\t"*/
@@ -1968 +1968 @@
-    }
-#  endif
-__AMD64__
+RT_ARCH_AMD64
-    return u64;
-}
@@ -1987 +1987 @@
-
-
-__AMD64__
+RT_ARCH_AMD64
-/**
- * Atomically Exchange an unsigned 128-bit value.
@@ -2045 +2045 @@
-}
-# endif
-__AMD64__
+RT_ARCH_AMD64
-
-
@@ -2062 +2062 @@
-{
-    uint64_t u64;
-__AMD64__
+RT_ARCH_AMD64
-#  if RT_INLINE_ASM_GNU_STYLE
-    __asm__ __volatile__("movq %1, %0\n\t"
@@ -2075 +2075 @@
-    }
-#  endif
-__AMD64__
+RT_ARCH_AMD64
-#  if RT_INLINE_ASM_GNU_STYLE
-__DARWIN__
+RT_OS_DARWIN
-    uint32_t u32EBX = 0;
-    __asm__ __volatile__("xchgl %%ebx, %3\n\t"
@@ -2109 +2109 @@
-    }
-#  endif
-__AMD64__
+RT_ARCH_AMD64
-    return u64;
-}
@@ -2200 +2200 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rdx, [pu32]
-#  else
@@ -2207 +2207 @@
-        mov     eax, [u32Old]
-        mov     ecx, [u32New]
-__AMD64__
+RT_ARCH_AMD64
-        lock cmpxchg [rdx], ecx
-#  else
@@ -2256 +2256 @@
-   return _InterlockedCompareExchange64((__int64 *)pu64, u64New, u64Old) == u64Old;
-
-__AMD64__
+RT_ARCH_AMD64
-#  if RT_INLINE_ASM_GNU_STYLE
-    uint64_t u64Ret;
@@ -2280 +2280 @@
-    return fRet;
-#  endif
-__AMD64__
+RT_ARCH_AMD64
-    uint32_t u32Ret;
-#  if RT_INLINE_ASM_GNU_STYLE
-__DARWIN__
+RT_OS_DARWIN
-    uint32_t u32 = (uint32_t)u64New;
-    uint32_t u32Spill;
@@ -2326 +2326 @@
-    return !!u32Ret;
-#  endif
-__AMD64__
+RT_ARCH_AMD64
-}
-#endif
@@ -2419 +2419 @@
-    {
-        mov     eax, 1
-__AMD64__
+RT_ARCH_AMD64
-        mov     rdx, [pu32]
-        lock xadd [rdx], eax
@@ -2473 +2473 @@
-    {
-        mov     eax, -1
-__AMD64__
+RT_ARCH_AMD64
-        mov     rdx, [pu32]
-        lock xadd [rdx], eax
@@ -2523 +2523 @@
-    {
-        mov     eax, [u32]
-__AMD64__
+RT_ARCH_AMD64
-        mov     rdx, [pu32]
-        lock    or [rdx], eax
@@ -2570 +2570 @@
-    {
-        mov     eax, [u32]
-__AMD64__
+RT_ARCH_AMD64
-        mov     rdx, [pu32]
-        lock and [rdx], eax
@@ -2614 +2614 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pv]
-        invlpg  [rax]
@@ -2644 +2644 @@
-{
-#  if RT_INLINE_ASM_USES_INTRIN
-__AMD64__
+RT_ARCH_AMD64
-    __stosq((unsigned __int64 *)pv, 0, /*PAGE_SIZE*/0x1000 / 8);
-#   else
@@ -2652 +2652 @@
-#  elif RT_INLINE_ASM_GNU_STYLE
-    RTUINTREG uDummy;
-__AMD64__
+RT_ARCH_AMD64
-    __asm__ __volatile__ ("rep stosq"
-                          : "=D" (pv),
@@ -2672 +2672 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        xor     rax, rax
-        mov     ecx, 0200h
@@ -2715 +2715 @@
-    {
-        xor     eax, eax
-__AMD64__
+RT_ARCH_AMD64
-        mov     rcx, [cb]
-        shr     rcx, 2
@@ -2757 +2757 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rcx, [cb]
-        shr     rcx, 2
@@ -2780 +2780 @@
- * @returns u32F1 * u32F2.
- */
-__AMD64__
+RT_ARCH_AMD64
-DECLASM(uint64_t) ASMMult2xU32RetU64(uint32_t u32F1, uint32_t u32F2);
-#else
-DECLINLINE(uint64_t) ASMMult2xU32RetU64(uint32_t u32F1, uint32_t u32F2)
-{
-__AMD64__
+RT_ARCH_AMD64
-    return (uint64_t)u32F1 * u32F2;
-__AMD64__
+RT_ARCH_AMD64
-    uint64_t u64;
-#  if RT_INLINE_ASM_GNU_STYLE
@@ -2804 +2804 @@
-#  endif
-    return u64;
-__AMD64__
+RT_ARCH_AMD64
-}
-#endif
@@ -2814 +2814 @@
- * @returns u32F1 * u32F2.
- */
-__AMD64__
+RT_ARCH_AMD64
-DECLASM(int64_t) ASMMult2xS32RetS64(int32_t i32F1, int32_t i32F2);
-#else
-DECLINLINE(int64_t) ASMMult2xS32RetS64(int32_t i32F1, int32_t i32F2)
-{
-__AMD64__
+RT_ARCH_AMD64
-    return (int64_t)i32F1 * i32F2;
-__AMD64__
+RT_ARCH_AMD64
-    int64_t i64;
-#  if RT_INLINE_ASM_GNU_STYLE
@@ -2838 +2838 @@
-#  endif
-    return i64;
-__AMD64__
+RT_ARCH_AMD64
-}
-#endif
@@ -2848 +2848 @@
- * @returns u64 / u32.
- */
-__AMD64__
+RT_ARCH_AMD64
-DECLASM(uint32_t) ASMDivU64ByU32RetU32(uint64_t u64, uint32_t u32);
-#else
-DECLINLINE(uint32_t) ASMDivU64ByU32RetU32(uint64_t u64, uint32_t u32)
-{
-__AMD64__
+RT_ARCH_AMD64
-    return (uint32_t)(u64 / u32);
-__AMD64__
+RT_ARCH_AMD64
-#  if RT_INLINE_ASM_GNU_STYLE
-    RTUINTREG uDummy;
@@ -2872 +2872 @@
-#  endif
-    return u32;
-__AMD64__
+RT_ARCH_AMD64
-}
-#endif
@@ -2882 +2882 @@
- * @returns u64 / u32.
- */
-__AMD64__
+RT_ARCH_AMD64
-DECLASM(int32_t) ASMDivS64ByS32RetS32(int64_t i64, int32_t i32);
-#else
-DECLINLINE(int32_t) ASMDivS64ByS32RetS32(int64_t i64, int32_t i32)
-{
-__AMD64__
+RT_ARCH_AMD64
-    return (int32_t)(i64 / i32);
-__AMD64__
+RT_ARCH_AMD64
-#  if RT_INLINE_ASM_GNU_STYLE
-    RTUINTREG iDummy;
@@ -2906 +2906 @@
-#  endif
-    return i32;
-__AMD64__
+RT_ARCH_AMD64
-}
-#endif
@@ -2928 +2928 @@
-{
-# if RT_INLINE_ASM_GNU_STYLE
-__AMD64__
+RT_ARCH_AMD64
-    uint64_t u64Result, u64Spill;
-    __asm__ __volatile__("mulq %2\n\t"
@@ -3007 +3007 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvByte]
-        mov     al, [rax]
@@ -3100 +3100 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        mov     edx, [iBit]
@@ -3136 +3136 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        mov     edx, [iBit]
@@ -3173 +3173 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        mov     edx, [iBit]
@@ -3208 +3208 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        mov     edx, [iBit]
@@ -3244 +3244 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        mov     edx, [iBit]
@@ -3278 +3278 @@
-    __asm
-    {
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        mov     edx, [iBit]
@@ -3322 +3322 @@
-    {
-        mov     edx, [iBit]
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        bts     [rax], edx
@@ -3367 +3367 @@
-    {
-        mov     edx, [iBit]
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        lock bts [rax], edx
@@ -3413 +3413 @@
-    {
-        mov     edx, [iBit]
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        btr     [rax], edx
@@ -3460 +3460 @@
-    {
-        mov     edx, [iBit]
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        lock btr [rax], edx
@@ -3506 +3506 @@
-    {
-        mov   edx, [iBit]
-__AMD64__
+RT_ARCH_AMD64
-        mov   rax, [pvBitmap]
-        btc   [rax], edx
@@ -3549 +3549 @@
-    {
-        mov     edx, [iBit]
-__AMD64__
+RT_ARCH_AMD64
-        mov     rax, [pvBitmap]
-        lock btc [rax], edx
@@ -3595 +3595 @@
-    {
-        mov   edx, [iBit]
-__AMD64__
+RT_ARCH_AMD64
-        mov   rax, [pvBitmap]
-        bt    [rax], edx
@@ -3674 +3674 @@
-        __asm__ __volatile__("repe; scasl\n\t"
-                             "je    1f\n\t"
-__AMD64__
+RT_ARCH_AMD64
-                             "lea   -4(%%rdi), %%rdi\n\t"
-                             "xorl  (%%rdi), %%eax\n\t"
@@ -3700 +3700 @@
-        __asm
-        {
-__AMD64__
+RT_ARCH_AMD64
-            mov     rdi, [pvBitmap]
-            mov     rbx, rdi
@@ -3714 +3714 @@
-            je      done
-
-__AMD64__
+RT_ARCH_AMD64
-            lea     rdi, [rdi - 4]
-            xor     eax, [rdi]
@@ -3827 +3827 @@
-        __asm__ __volatile__("repe; scasl\n\t"
-                             "je    1f\n\t"
-__AMD64__
+RT_ARCH_AMD64
-                             "lea   -4(%%rdi), %%rdi\n\t"
-                             "movl  (%%rdi), %%eax\n\t"
@@ -3853 +3853 @@
-        __asm
-        {
-__AMD64__
+RT_ARCH_AMD64
-            mov     rdi, [pvBitmap]
-            mov     rbx, rdi
@@ -3866 +3866 @@
-            repe    scasd
-            je      done
-__AMD64__
+RT_ARCH_AMD64
-            lea     rdi, [rdi - 4]
-            mov     eax, [rdi]

trunk/include/iprt/asmdefs.mac

@@ -49 +49 @@
-; C/C++ world.
-%ifdef __X86__
-__DARWIN__
+RT_OS_DARWIN
-  %define NAME(name)    _ %+ NAME_OVERLOAD(name)
- %endif
-__OS2__
+RT_OS_OS2
-  %define NAME(name)    _ %+ NAME_OVERLOAD(name)
- %endif
-__WIN__
+RT_OS_WINDOWS
-  %define NAME(name)    _ %+ NAME_OVERLOAD(name)
- %endif
@@ -492 +492 @@
-; @todo figure out what 64-bit Windows does (I don't recall right now).
-%ifdef __X86__
-__DARWIN__
+RT_OS_DARWIN
-  %define RTLRD_CB          16
- %else

trunk/include/iprt/cdefs.h

@@ -64 +64 @@
-#define __AMD64__
-#define __X86__
+#define RT_ARCH_AMD64
+#define RT_ARCH_X86
-#define IN_RING0
-#define IN_RING3
@@ -80 +82 @@
-#endif /* __DOXYGEN__ */
-
+/** @def RT_ARCH_X86
+ * Indicates that we're compiling for the X86 architecture.
+ */
+
+/** @def RT_ARCH_AMD64
+ * Indicates that we're compiling for the AMD64 architecture.
+ */
+#if !defined(RT_ARCH_X86) && !defined(RT_ARCH_AMD64)
+# if defined(__amd64__) || defined(__x86_64__) || defined(_M_X64) || defined(__AMD64__)
+#  define RT_ARCH_AMD64
+# elif defined(__i386__) || defined(_M_IX86) || defined(__X86__)
+#  define RT_ARCH_X86
+# else /* PORTME: append test for new archs. */
+#  error "Check what predefined stuff your compiler uses to indicate architecture."
+# endif
+#elif defined(RT_ARCH_X86) && defined(RT_ARCH_AMD64) /* PORTME: append new archs. */
+# error "Both RT_ARCH_X86 and RT_ARCH_AMD64 cannot be defined at the same time!"
+#endif
+
+
-/** @def __X86__
- * Indicates that we're compiling for the X86 architecture.
+ * @deprecated
- */
-
-/** @def __AMD64__
- * Indicates that we're compiling for the AMD64 architecture.
+ * @deprecated
- */
-#if !defined(__X86__) && !defined(__AMD64__)
-__amd64__) || defined(__x86_64__) || defined(_M_X
+RT_ARCH_AMD
-#  define __AMD64__
-__i386__) || defined(_M_I
+RT_ARCH_
-#  define __X86__
-# else
@@ -97 +121 @@
-#elif defined(__X86__) && defined(__AMD64__)
-# error "Both __X86__ and __AMD64__ cannot be defined at the same time!"
+#elif defined(__X86__) && !defined(RT_ARCH_X86)
+# error "Both __X86__ without RT_ARCH_X86!"
+#elif defined(__AMD64__) && !defined(RT_ARCH_AMD64)
+# error "Both __AMD64__ without RT_ARCH_AMD64!"
-#endif
-
@@ -127 +155 @@
- */
-#ifndef ARCH_BITS
-__AMD64__
+RT_ARCH_AMD64
-#  define ARCH_BITS 64
-# else
@@ -388 +416 @@
-#ifdef _MSC_VER
-# define RTCALL     __cdecl
-__OS2__) || defined(__AMD64__
+RT_OS_OS2) || defined(RT_ARCH_AMD64
-# define RTCALL     __attribute__((cdecl,regparm(0)))
-#else
@@ -398 +426 @@
- * @param   type    The return type of the function declaration.
- */
-__OS2__
+RT_OS_OS2
-# define DECLEXPORT(type)       __declspec(dllexport) type
-#else
@@ -412 +440 @@
- * @param   type    The return type of the function declaration.
- */
-__OS2__
+RT_OS_OS2
-# define DECLIMPORT(type)       __declspec(dllimport) type
-#else
@@ -800 +828 @@
-#define RT_ELEMENTS(aArray)         ( sizeof(aArray) / sizeof((aArray)[0]) )
-
-__OS2__
+RT_OS_OS2
-/* Undefine RT_MAX since there is an unfortunate clash with the max 
-   resource type define in os2.h. */
@@ -1005 +1033 @@
- * compiling kernel code.
- */
-__DARWIN__
+RT_OS_DARWIN
-  && !defined(KERNEL) \
-  && !defined(RT_NO_BSD_PARAM_H_UNDEFING) \
@@ -1129 +1157 @@
- * @param   ptr
- */
-__AMD64__
+RT_ARCH_AMD64
-# ifdef IN_RING3
-__DARWIN__
+RT_OS_DARWIN
-#   define VALID_PTR(ptr)   (   (uintptr_t)(ptr) >= _4G \
-                             && !((uintptr_t)(ptr) & 0xffff800000000000ULL) )
@@ -1143 +1171 @@
-                                 || ((uintptr_t)(ptr) & 0xffff800000000000ULL) == 0) )
-# endif /* !IN_RING3 */
-__X86__
+RT_ARCH_X86
-# define VALID_PTR(ptr)     ( (uintptr_t)(ptr) + 0x1000U >= 0x2000U )
-#else

trunk/include/iprt/err.h

@@ -206 +206 @@
-#define RTErrGetFull(rc)        (RTErrGet(rc)->pszMsgFull)
-
-__WIN__
+RT_OS_WINDOWS
-/**
- * Windows error code message.
@@ -231 +231 @@
- */
-RTDECL(PCRTWINERRMSG) RTErrWinGet(long rc);
-__WIN__
+RT_OS_WINDOWS
-
-#endif /* IN_RING3 */

trunk/include/iprt/file.h

@@ -39 +39 @@
-/** Platform specific text line break.
- * @deprecated Use text I/O streams and '\\n'. See iprt/stream.h. */
-__OS2__) || defined(__WIN__
+RT_OS_OS2) || defined(RT_OS_WINDOWS
-# define RTFILE_LINEFEED    "\r\n"
-#else

trunk/include/iprt/log.h

@@ -398 +398 @@
- */
-#ifdef LOG_ENABLED
-__AMD64__
+RT_ARCH_AMD64
-#  define _LogRemoveParentheseis(...)               __VA_ARGS__
-#  define _LogIt(pvInst, fFlags, iGroup, ...)       RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, iGroup, __VA_ARGS__)
@@ -680 +680 @@
- * Write to specific logger if group enabled.
- */
-__AMD64__
+RT_ARCH_AMD64
-# define _LogRelRemoveParentheseis(...)                __VA_ARGS__
-#  define _LogRelIt(pvInst, fFlags, iGroup, ...)       RTLogLoggerEx((PRTLOGGER)pvInst, fFlags, iGroup, __VA_ARGS__)

trunk/include/iprt/mem.h

@@ -154 +154 @@
-RTDECL(void)      RTMemExecFree(void *pv);
-
-__AMD64__
+RT_ARCH_AMD64
-/**
- * Donate read+write+execute memory to the exec heap.

trunk/include/iprt/nocrt/fenv.h

@@ -23 +23 @@
-
-#include <iprt/cdefs.h>
-__AMD64__
+RT_ARCH_AMD64
-# include <iprt/nocrt/amd64/fenv.h>
-__X86__
+RT_ARCH_X86
-# include <iprt/nocrt/x86/fenv.h>
-#else

trunk/include/iprt/nocrt/limits.h

@@ -46 +46 @@
-#define INT_MIN         (-0x7fffffff - 1)
-