Changeset 29276 in vbox

Timestamp:

May 9, 2010 11:24:53 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

61360

Message:

iprt/asm.h: cleaned up the hardcoded page size mess so we can deal with sparc64.

File:

• trunk/include/iprt/asm.h (modified) (8 diffs)

trunk/include/iprt/asm.h

@@ -30 +30 @@
 #include <iprt/types.h>
 #include <iprt/assert.h>
-/** @todo @code #include <iprt/param.h> @endcode for PAGE_SIZE. */
 /** @def RT_INLINE_ASM_USES_INTRIN
  * Defined as 1 if we're using a _MSC_VER 1400.
@@ -2409 +2408 @@
 
 
-#if defined(PAGE_SIZE) && !defined(NT_INCLUDED)
-# if PAGE_SIZE != 0x1000
-#  error "PAGE_SIZE is not 0x1000!"
+/** @def RT_ASM_PAGE_SIZE
+ * We try avoid dragging in iprt/param.h here.
+ * @internal
+ */
+#if defined(RT_ARCH_SPARC64)
+# define RT_ASM_PAGE_SIZE   0x2000
+# if defined(PAGE_SIZE) && !defined(NT_INCLUDED)
+#  if PAGE_SIZE != 0x2000
+#   error "PAGE_SIZE is not 0x2000!"
+#  endif
+# endif
+#else
+# define RT_ASM_PAGE_SIZE   0x1000
+# if defined(PAGE_SIZE) && !defined(NT_INCLUDED)
+#  if PAGE_SIZE != 0x1000
+#   error "PAGE_SIZE is not 0x1000!"
+#  endif
 # endif
 #endif
@@ -2427 +2440 @@
 #  if RT_INLINE_ASM_USES_INTRIN
 #   ifdef RT_ARCH_AMD64
-    __stosq((unsigned __int64 *)pv, 0, /*PAGE_SIZE*/0x1000 / 8);
+    __stosq((unsigned __int64 *)pv, 0, RT_ASM_PAGE_SIZE / 8);
 #   else
-    __stosd((unsigned long *)pv, 0, /*PAGE_SIZE*/0x1000 / 4);
+    __stosd((unsigned long *)pv, 0, RT_ASM_PAGE_SIZE / 4);
 #   endif
 
@@ -2439 +2452 @@
                            "=c" (uDummy)
                          : "0" (pv),
-                           "c" (0x1000 >> 3),
+                           "c" (RT_ASM_PAGE_SIZE >> 3),
                            "a" (0)
                          : "memory");
@@ -2447 +2460 @@
                            "=c" (uDummy)
                          : "0" (pv),
-                           "c" (0x1000 >> 2),
+                           "c" (RT_ASM_PAGE_SIZE >> 2),
                            "a" (0)
                          : "memory");
@@ -2592 +2605 @@
                          : "mr" (pvPage),
 #  ifdef RT_ARCH_AMD64
-                         "0" (0x1000/8),
-#  else
-                         "0" (0x1000/4),
+                         "0" (RT_ASM_PAGE_SIZE/8),
+#  else
+                         "0" (RT_ASM_PAGE_SIZE/4),
 #  endif
                          "1" (pvPage),
@@ -2601 +2614 @@
 # else
    uintptr_t const *puPtr = (uintptr_t const *)pvPage;
-   int              cLeft = 0x1000 / sizeof(uintptr_t) / 8;
+   int              cLeft = RT_ASM_PAGE_SIZE / sizeof(uintptr_t) / 8;
    Assert(!((uintptr_t)pvPage & 15));
    for (;;)
@@ -2737 +2750 @@
 
     /* the pages in between pages. */
-    while (cbBuf > /*PAGE_SIZE*/0x1000)
+    while (cbBuf > RT_ASM_PAGE_SIZE)
     {
         ASMProbeReadByte(pu8);
-        cbBuf -= /*PAGE_SIZE*/0x1000;
-        pu8   += /*PAGE_SIZE*/0x1000;
+        cbBuf -= RT_ASM_PAGE_SIZE;
+        pu8   += RT_ASM_PAGE_SIZE;
     }