Changeset 9581 in vbox

Timestamp:

Jun 10, 2008 8:41:24 PM (17 years ago)

Author:

vboxsync

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

31880

Message:

const + small optimization

File:

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

trunk/include/iprt/asm.h

@@ -2155 +2155 @@
 #  if RT_INLINE_ASM_GNU_STYLE
 #   if defined(PIC) || defined(RT_OS_DARWIN) /* darwin: 4.0.1 compiler option / bug? */
-    uint32_t u32 = (uint32_t)u64;
+    uint32_t u32EBX = (uint32_t)u64;
     __asm__ __volatile__(/*"xchgl %%esi, %5\n\t"*/
                          "xchgl %%ebx, %3\n\t"
@@ -2161 +2161 @@
                          "lock; cmpxchg8b (%5)\n\t"
                          "jnz 1b\n\t"
-                         "xchgl %%ebx, %3\n\t"
+                         "movl %3, %%ebx\n\t"
                          /*"xchgl %%esi, %5\n\t"*/
                          : "=A" (u64),
                            "=m" (*pu64)
                          : "0" (*pu64),
-                           "m" ( u32 ),
+                           "m" ( u32EBX ),
                            "c" ( (uint32_t)(u64 >> 32) ),
                            "S" (pu64) );
@@ -2429 +2429 @@
 #  if RT_INLINE_ASM_GNU_STYLE
 #   if defined(PIC) || defined(RT_OS_DARWIN) /* darwin: 4.0.1 compiler option / bug? */
-    uint32_t u32 = (uint32_t)u64New;
+    uint32_t u32EBX = (uint32_t)u64New;
     uint32_t u32Spill;
     __asm__ __volatile__("xchgl %%ebx, %4\n\t"
                          "lock; cmpxchg8b (%6)\n\t"
                          "setz  %%al\n\t"
-                         "xchgl %%ebx, %4\n\t"
+                         "movl  %4, %%ebx\n\t"
                          "movzbl %%al, %%eax\n\t"
                          : "=a" (u32Ret),
@@ -2440 +2440 @@
                            "=m" (*pu64)
                          : "A" (u64Old),
-                           "m" ( u32 ),
+                           "m" ( u32EBX ),
                            "c" ( (uint32_t)(u64New >> 32) ),
                            "S" (pu64) );
@@ -3265 +3265 @@
     __asm__ __volatile__("xchgl %%ebx, %3\n\t"
                          "lock; cmpxchg8b (%5)\n\t"
-                         "xchgl %%ebx, %3\n\t"
+                         "movl %3, %%ebx\n\t"
                          : "=A" (u64),
                            "=m" (*pu64)
@@ -3335 +3335 @@
     __asm__ __volatile__("xchgl %%ebx, %3\n\t"
                          "lock; cmpxchg8b (%5)\n\t"
-                         "xchgl %%ebx, %3\n\t"
+                         "movl %3, %%ebx\n\t"
                          : "=A" (u64),
                            "=m" (*pu64)
@@ -4847 +4847 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-DECLASM(bool) ASMBitTest(volatile void *pvBitmap, int32_t iBit);
-#else
-DECLINLINE(bool) ASMBitTest(volatile void *pvBitmap, int32_t iBit)
+DECLASM(bool) ASMBitTest(const volatile void *pvBitmap, int32_t iBit);
+#else
+DECLINLINE(bool) ASMBitTest(const volatile void *pvBitmap, int32_t iBit)
 {
     union { bool f; uint32_t u32; uint8_t u8; } rc;
@@ -4859 +4859 @@
                           "setc %b0\n\t"
                           "andl $1, %0\n\t"
-                          : "=q" (rc.u32),
-                            "=m" (*(volatile long *)pvBitmap)
-                          : "Ir" (iBit)
+                          : "=q" (rc.u32)
+                          : "m" (*(const volatile long *)pvBitmap),
+                            "Ir" (iBit)
                           : "memory");
 # else
@@ -4975 +4975 @@
  */
 #if RT_INLINE_ASM_EXTERNAL
-DECLASM(int) ASMBitFirstClear(volatile void *pvBitmap, uint32_t cBits);
-#else
-DECLINLINE(int) ASMBitFirstClear(volatile void *pvBitmap, uint32_t cBits)
+DECLASM(int) ASMBitFirstClear(const volatile void *pvBitmap, uint32_t cBits);
+#else
+DECLINLINE(int) ASMBitFirstClear(const volatile void *pvBitmap, uint32_t cBits)
 {
     if (cBits)
@@ -5061 +5061 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-DECLASM(int) ASMBitNextClear(volatile void *pvBitmap, uint32_t cBits, uint32_t iBitPrev);
-#else
-DECLINLINE(int) ASMBitNextClear(volatile void *pvBitmap, uint32_t cBits, uint32_t iBitPrev)
+DECLASM(int) ASMBitNextClear(const volatile void *pvBitmap, uint32_t cBits, uint32_t iBitPrev);
+#else
+DECLINLINE(int) ASMBitNextClear(const volatile void *pvBitmap, uint32_t cBits, uint32_t iBitPrev)
 {
     int iBit = ++iBitPrev & 31;
-    pvBitmap = (volatile char *)pvBitmap + ((iBitPrev >> 5) << 2);
+    pvBitmap = (const volatile char *)pvBitmap + ((iBitPrev >> 5) << 2);
     cBits   -= iBitPrev & ~31;
     if (iBit)
     {
         /* inspect the first dword. */
-        uint32_t u32 = (~*(volatile uint32_t *)pvBitmap) >> iBit;
+        uint32_t u32 = (~*(const volatile uint32_t *)pvBitmap) >> iBit;
 # if RT_INLINE_ASM_USES_INTRIN
         unsigned long ulBit = 0;
@@ -5102 +5102 @@
         if (cBits > 32)
         {
-            iBit = ASMBitFirstClear((volatile char *)pvBitmap + sizeof(uint32_t), cBits - 32);
+            iBit = ASMBitFirstClear((const volatile char *)pvBitmap + sizeof(uint32_t), cBits - 32);
             if (iBit >= 0)
                 return iBit + (iBitPrev & ~31) + 32;
@@ -5128 +5128 @@
  */
 #if RT_INLINE_ASM_EXTERNAL
-DECLASM(int) ASMBitFirstSet(volatile void *pvBitmap, uint32_t cBits);
-#else
-DECLINLINE(int) ASMBitFirstSet(volatile void *pvBitmap, uint32_t cBits)
+DECLASM(int) ASMBitFirstSet(const volatile void *pvBitmap, uint32_t cBits);
+#else
+DECLINLINE(int) ASMBitFirstSet(const volatile void *pvBitmap, uint32_t cBits)
 {
     if (cBits)
@@ -5213 +5213 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-DECLASM(int) ASMBitNextSet(volatile void *pvBitmap, uint32_t cBits, uint32_t iBitPrev);
-#else
-DECLINLINE(int) ASMBitNextSet(volatile void *pvBitmap, uint32_t cBits, uint32_t iBitPrev)
+DECLASM(int) ASMBitNextSet(const volatile void *pvBitmap, uint32_t cBits, uint32_t iBitPrev);
+#else
+DECLINLINE(int) ASMBitNextSet(const volatile void *pvBitmap, uint32_t cBits, uint32_t iBitPrev)
 {
     int iBit = ++iBitPrev & 31;
-    pvBitmap = (volatile char *)pvBitmap + ((iBitPrev >> 5) << 2);
+    pvBitmap = (const volatile char *)pvBitmap + ((iBitPrev >> 5) << 2);
     cBits   -= iBitPrev & ~31;
     if (iBit)
     {
         /* inspect the first dword. */
-        uint32_t u32 = *(volatile uint32_t *)pvBitmap >> iBit;
+        uint32_t u32 = *(const volatile uint32_t *)pvBitmap >> iBit;
 # if RT_INLINE_ASM_USES_INTRIN
         unsigned long ulBit = 0;
@@ -5254 +5254 @@
         if (cBits > 32)
         {
-            iBit = ASMBitFirstSet((volatile char *)pvBitmap + sizeof(uint32_t), cBits - 32);
+            iBit = ASMBitFirstSet((const volatile char *)pvBitmap + sizeof(uint32_t), cBits - 32);
             if (iBit >= 0)
                 return iBit + (iBitPrev & ~31) + 32;