Changeset 9986 for trunk/src/NTDLL/rtlbitmap.c

Timestamp:

Apr 7, 2003, 8:40:53 PM (22 years ago)

Author:

sandervl

Message:

PF: NTDLL update for GCC 3.2.1 + resync with Wine

File:

• trunk/src/NTDLL/rtlbitmap.c (modified) (7 diffs)

trunk/src/NTDLL/rtlbitmap.c

@@ -28 +28 @@
  *  Note that to avoid unexpected behaviour, the size of a bitmap should be set
  *  to a multiple of 32.
-
- */
-#include <winbase.h>
+ */
+#include <stdlib.h>
+#include <string.h>
+#include "windef.h"
 #include "winternl.h"
 #include "wine/debug.h"
@@ -50 +51 @@
 
 /* Last set bit in a nibble; used for determining most significant bit */
-static const BYTE NTDLL_mostSignificant[16] = {
-  0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3
+static const signed char NTDLL_mostSignificant[16] = {
+  -1, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3
 };
 
@@ -568 +569 @@
  * Find the most significant bit in a 64 bit integer.
  *
- * PARAMS
- *  lpBits  [I] Bitmap pointer
- *  ulStart [I] First bit to search from
- *
  * RETURNS
  *  The position of the most significant bit.
@@ -577 +574 @@
 CCHAR WINAPI RtlFindMostSignificantBit(ULONGLONG ulLong)
 {
-  LONG lCount = 64;
-  LPBYTE lpOut = (LPBYTE)&ulLong + 7;
-
-  TRACE("(%lld)\n", ulLong);
-
-  if (!(ulLong & 0xffffffff00000000ul))
-  {
-    lpOut -= 4;
-    lCount -= 32;
-  }
-
-  for (; lCount > 0; lCount -= 8)
-  {
-    if (*lpOut)
-    {
-      if (*lpOut & 0x0f)
-        return lCount - 8 + NTDLL_mostSignificant[*lpOut & 0x0f];
-      return lCount - 4 + NTDLL_mostSignificant[*lpOut >> 4];
-    }
-    lpOut--;
-  }
-  return -1;
+    signed char ret = 32;
+    DWORD dw;
+
+    if (!(dw = (ulLong >> 32)))
+    {
+        ret = 0;
+        dw = (DWORD)ulLong;
+    }
+    if (dw & 0xffff0000)
+    {
+        dw >>= 16;
+        ret += 16;
+    }
+    if (dw & 0xff00)
+    {
+        dw >>= 8;
+        ret += 8;
+    }
+    if (dw & 0xf0)
+    {
+        dw >>= 4;
+        ret += 4;
+    }
+    return ret + NTDLL_mostSignificant[dw];
 }
 
@@ -606 +605 @@
  * Find the least significant bit in a 64 bit integer.
  *
- * PARAMS
- *  lpBits  [I] Bitmap pointer
- *  ulStart [I] First bit to search from
- *
  * RETURNS
  *  The position of the least significant bit.
@@ -615 +610 @@
 CCHAR WINAPI RtlFindLeastSignificantBit(ULONGLONG ulLong)
 {
-  ULONG ulCount = 0;
-  LPBYTE lpOut = (LPBYTE)&ulLong;
-
-  TRACE("(%lld)\n", ulLong);
-
-  if (!(ulLong & 0xffffffff))
-  {
-    lpOut += 4;
-    ulCount = 32;
-  }
-
-  for (; ulCount < 64; ulCount += 8)
-  {
-    if (*lpOut)
-    {
-      if (*lpOut & 0x0f)
-        return ulCount + NTDLL_leastSignificant[*lpOut & 0x0f];
-      return ulCount + 4 + NTDLL_leastSignificant[*lpOut >> 4];
-    }
-    lpOut++;
-  }
-  return -1;
+    signed char ret = 0;
+    DWORD dw;
+
+    if (!(dw = (DWORD)ulLong))
+    {
+        ret = 32;
+        if (!(dw = ulLong >> 32)) return -1;
+    }
+    if (!(dw & 0xffff))
+    {
+        dw >>= 16;
+        ret += 16;
+    }
+    if (!(dw & 0xff))
+    {
+        dw >>= 8;
+        ret += 8;
+    }
+    if (!(dw & 0x0f))
+    {
+        dw >>= 4;
+        ret += 4;
+    }
+    return ret + NTDLL_leastSignificant[dw & 0x0f];
 }
 
@@ -642 +639 @@
  * NTDLL_RunSortFn
  *
- * Internal helper: qsort comparason function for RTL_BITMAP_RUN arrays
+ * Internal helper: qsort comparison function for RTL_BITMAP_RUN arrays
  */
 static int NTDLL_RunSortFn(const void *lhs, const void *rhs)