Changeset 2685 for branches/libc-0.6/src

Timestamp:

Mar 26, 2006, 9:15:33 AM (19 years ago)

Author:

bird

Message:

Inlined _um_find_bucket.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/libc.def (modified) (1 diff)
• src/lib/malloc/imisc.c (modified) (1 diff)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -2 +2 @@
 
 TODO: open replace on RAMFS fails with error 32!
+
+2006-03-26: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - libc:
+        o Inlined _um_find_bucket.
 
 2006-03-17: knut st. osmundsen <bird-gccos2-spam@anduin.net>

branches/libc-0.6/src/emx/src/lib/libc.def

@@ -1123 +1123 @@
     "__um_default_release" @1136
     "__um_default_shrink" @1137
-    "__um_find_bucket" @1138
+    "__um_find_bucket" = "___nullstub_function" @1138
     "__um_free_maybe_lock" @1139
     "__um_init_default_regular_heap" @1140

branches/libc-0.6/src/emx/src/lib/malloc/imisc.c

@@ -9 +9 @@
 #include <sys/fmutex.h>
 #include <emx/umalloc.h>
-
-/* Leave FLS undefined if __fls() is not available.  __fls() is
-   similar to ffs(), but finds the last (most significant) bit. */
-
-#define FLS(x)          __fls(x)
-
-
-int _um_find_bucket (size_t rsize)
-{
-  int bucket;
-
-#ifdef FLS
-  bucket = FLS (rsize) - 1 - _UM_MIN_BUCKET;
-  if (bucket < 0)
-    bucket = 0;
-  else if (bucket >= _UM_BUCKETS)
-    return _UM_BUCKETS - 1;
-  assert (_UM_BUCKET_SIZE (bucket) <= rsize);
-  assert (_UM_BUCKET_SIZE (bucket+1) > rsize);
-  return bucket;
-#else
-  for (bucket = _UM_BUCKETS - 1; bucket >= 0; --bucket)
-    if (_UM_BUCKET_SIZE (bucket) <= rsize)
-      return bucket;
-  _um_abort ("_um_find_bucked: rsize=%x\n", rsize); /* RSIZE is probably not rounded! */
-#endif
-}