Refactoring: rename GC_EXPECT to EXPECT in .c files

* fnlz_mlc.c (GC_core_finalized_malloc, GC_finalized_malloc):
Rename GC_EXPECT to EXPECT; replace 0/1 with TRUE/FALSE for the 2nd
argument of EXPECT.
* thread_local_alloc.c (GC_gcj_malloc): Likewise.

diff --git a/fnlz_mlc.c b/fnlz_mlc.c
index a7db976be78185d506c7f56ba509f1075223b3c1..f7fd0db7a2845203ab5b305adff54c82b1d339d8 100644 (file)
--- a/fnlz_mlc.c
+++ b/fnlz_mlc.c
@@ -82,11 +82,11 @@ GC_API void GC_CALL GC_init_finalized_malloc(void)
 
     lb += sizeof(void *);
     GC_ASSERT(done_init);
-    if (EXPECT(SMALL_OBJ(lb), 1)) {
+    if (EXPECT(SMALL_OBJ(lb), TRUE)) {
         lg = GC_size_map[lb];
         opp = &GC_finalized_objfreelist[lg];
         LOCK();
-        if (EXPECT((op = *opp) == 0, 0)) {
+        if (EXPECT((op = *opp) == 0, FALSE)) {
             UNLOCK();
             op = GC_generic_malloc((word)lb, GC_finalized_kind);
         } else {
@@ -113,15 +113,15 @@ GC_API void GC_CALL GC_init_finalized_malloc(void)
     void **tiny_fl, **my_fl, *my_entry;
     void *next;
 
-    if (GC_EXPECT(lg >= GC_TINY_FREELISTS, 0))
+    if (EXPECT(lg >= GC_TINY_FREELISTS, FALSE))
         return GC_core_finalized_malloc(client_lb, fclos);
 
     tsd = GC_getspecific(GC_thread_key);
     tiny_fl = tsd->finalized_freelists;
     my_fl = tiny_fl + lg;
     my_entry = *my_fl;
-    while (GC_EXPECT((word)my_entry
-                     <= DIRECT_GRANULES + GC_TINY_FREELISTS + 1, 0)) {
+    while (EXPECT((word)my_entry
+                  <= DIRECT_GRANULES + GC_TINY_FREELISTS + 1, FALSE)) {
         if ((word)my_entry - 1 < DIRECT_GRANULES) {
             *my_fl = (ptr_t)my_entry + lg + 1;
             return GC_core_finalized_malloc(client_lb, fclos);

diff --git a/thread_local_alloc.c b/thread_local_alloc.c
index e208f8b19d55075712a49709c9f423f44875ae2c..83211675430558ce3e74b09044b4ded902a0396c 100644 (file)
--- a/thread_local_alloc.c
+++ b/thread_local_alloc.c
@@ -242,7 +242,7 @@ GC_API void * GC_CALL GC_malloc_atomic(size_t bytes)
 GC_API void * GC_CALL GC_gcj_malloc(size_t bytes,
                                     void * ptr_to_struct_containing_descr)
 {
-  if (GC_EXPECT(GC_incremental, 0)) {
+  if (EXPECT(GC_incremental, FALSE)) {
     return GC_core_gcj_malloc(bytes, ptr_to_struct_containing_descr);
   } else {
     size_t granules = ROUNDED_UP_GRANULES(bytes);