Changeset 2050 in kBuild

Timestamp:

Nov 3, 2008 2:53:07 PM (16 years ago)

Author:

bird

Message:

kmk: converted the inlined alloccache_free() to non-inlined to avoid aliasing problems in read.c with gcc 3.2.3 (rhel3) and 3.4.3 (solaris/x86).

Location:

trunk/src/kmk

Files:

• make.h (modified) (2 diffs)
• misc.c (modified) (1 diff)

trunk/src/kmk/make.h

@@ -574 +574 @@
 void alloccache_print_all (void);
 struct alloccache_free_ent *alloccache_alloc_grow (struct alloccache *cache);
+void alloccache_free (struct alloccache *cache, void *item);
 
 /* Allocate an item. */
@@ -602 +603 @@
 }
 
-/* Free an item. */
-MY_INLINE void
-alloccache_free (struct alloccache *cache, void *item)
-{
-  struct alloccache_free_ent *f = (struct alloccache_free_ent *)item;
-#if 0 /*ndef NDEBUG*/
-  struct alloccache_free_ent *c;
-  unsigned int i = 0;
-  for (c = cache->free_head; c != NULL; c = c->next, i++)
-    MY_ASSERT_MSG (c != f && i < 0x10000000,
-                   ("i=%u total_count=%u\n", i, cache->total_count));
-#endif
-#ifdef __GNUC__ 
-/* GCC 3.2.3 has been observed having aliasing issues, so, setup a 
-   barrier for it here. */
-# if (__GNUC__ == 3 && __GNUC_PATCHLEVEL__ <= 3) || __GNUC__ < 3
-  __asm__ __volatile__ ("" ::: "memory");
-# endif
-#endif
-
-  f->next = cache->free_head;
-  cache->free_head = f;
-  MAKE_STATS(cache->free_count++;);
-}
 
 /* the alloc caches */

trunk/src/kmk/misc.c

@@ -1164 +1164 @@
 #ifdef CONFIG_WITH_ALLOC_CACHES
 
+/* Free am item. 
+   This was not inlined because of aliasing issues arrising with GCC. */
+void
+alloccache_free (struct alloccache *cache, void *item)
+{
+  struct alloccache_free_ent *f = (struct alloccache_free_ent *)item;
+#if 0 /*ndef NDEBUG*/
+  struct alloccache_free_ent *c;
+  unsigned int i = 0;
+  for (c = cache->free_head; c != NULL; c = c->next, i++)
+    MY_ASSERT_MSG (c != f && i < 0x10000000,
+                   ("i=%u total_count=%u\n", i, cache->total_count));
+#endif
+
+  f->next = cache->free_head;
+  cache->free_head = f;
+  MAKE_STATS(cache->free_count++;);
+}
+
 /* Default allocator. */
 static void *