Replace some FIXME items with TODO ones

(code refactoring)

* alloc.c (GC_maybe_gc, GC_collect_a_little_inner,
GC_finish_collection): Replace FIXME item with TODO one.
* gcj_mlc.c (maybe_finalize): Likewise.
* include/gc.h [!GC_DEBUG || !__GNUC__] (GC_PTR_ADD): Likewise.
* include/private/gcconfig.h [X86_64 && LINUX && __GLIBC__
&& !__UCLIBC__] (GETCONTEXT_FPU_EXCMASK_BUG): Likewise.
* mach_dep.c (GC_with_callee_saves_pushed): Likewise.
* mark_rts.c (GC_push_current_stack): Likewise.
* misc.c [MSWIN32 || MSWINCE] (WRITE): Likewise.
* os_dep.c [ECOS] (ecos_gc_memory): Likewise.
* os_dep.c (GC_get_stack_base, GC_page_was_ever_dirty): Likewise.
* reclaim.c (GC_reclaim_clear): Likewise.
* include/private/gcconfig.h [OPENBSD && m68k]: Remove FIXME item.

diff --git a/alloc.c b/alloc.c
index 2a53dfb38261aef72b8636b7827c53cc1194d998..06213ce8614ed73c673ff96db50addb090a9878f 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -412,7 +412,7 @@ STATIC void GC_maybe_gc(void)
         static int n_partial_gcs = 0;
 
         if (!GC_incremental) {
-            /* FIXME: If possible, GC_default_stop_func should be used here */
+            /* TODO: If possible, GC_default_stop_func should be used here */
             GC_try_to_collect_inner(GC_never_stop_func);
             n_partial_gcs = 0;
             return;
@@ -441,7 +441,7 @@ STATIC void GC_maybe_gc(void)
 #       ifndef NO_CLOCK
           if (GC_time_limit != GC_TIME_UNLIMITED) { GET_TIME(GC_start_time); }
 #       endif
-        /* FIXME: If possible, GC_default_stop_func should be   */
+        /* TODO: If possible, GC_default_stop_func should be    */
         /* used instead of GC_never_stop_func here.             */
         if (GC_stopped_mark(GC_time_limit == GC_TIME_UNLIMITED?
                             GC_never_stop_func : GC_timeout_stop_func)) {
@@ -649,7 +649,7 @@ GC_INNER void GC_collect_a_little_inner(int n)
                     break;
                   }
                 } else {
-                  /* FIXME: If possible, GC_default_stop_func should be */
+                  /* TODO: If possible, GC_default_stop_func should be  */
                   /* used here.                                         */
                   (void)GC_stopped_mark(GC_never_stop_func);
                 }
@@ -1001,7 +1001,7 @@ STATIC void GC_finish_collection(void)
 #   if defined(GC_ASSERTIONS) \
        && defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
         /* Check that we marked some of our own data.           */
-        /* FIXME: Add more checks.                              */
+        /* TODO: Add more checks. */
         GC_check_tls();
 #   endif
 

diff --git a/gcj_mlc.c b/gcj_mlc.c
index 4f7355cfbabc9dda03c89e6e8c10f7528ba72cb0..6829abdf48c6269ca1781267841f07b9597f0d9b 100644 (file)
--- a/gcj_mlc.c
+++ b/gcj_mlc.c
@@ -136,7 +136,7 @@ GC_API void GC_CALL GC_init_gcj_malloc(int mp_index,
 /* rarely executed point at which it is safe to release the lock.       */
 /* We do this even where we could just call GC_INVOKE_FINALIZERS,       */
 /* since it's probably cheaper and certainly more uniform.              */
-/* FIXME - Consider doing the same elsewhere?                           */
+/* TODO: Consider doing the same elsewhere? */
 static void maybe_finalize(void)
 {
    static word last_finalized_no = 0;

diff --git a/include/gc.h b/include/gc.h
index 56f3eb7066e1a966324571e36766775956927cd5..b952285bfc35ee1f04f0d235f06e211a7d73bf42 100644 (file)
--- a/include/gc.h
+++ b/include/gc.h
@@ -1638,7 +1638,7 @@ GC_API void GC_CALL GC_dump_finalization(void);
 #else /* !GC_DEBUG || !__GNUC__ */
   /* We can't do this right without typeof, which ANSI decided was not    */
   /* sufficiently useful.  Without it we resort to the non-debug version. */
-  /* FIXME: This should eventually support C++0x decltype.                */
+  /* TODO: This should eventually support C++0x decltype. */
 # define GC_PTR_ADD(x, n) ((x)+(n))
 # define GC_PRE_INCR(x, n) ((x) += (n))
 # define GC_POST_INCR(x) ((x)++)

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 40d2ff5be98c40edfa18803f22ed3b266fb02432..ba32d35584d0c1d78ddbc09ae003991be72c539c 100644 (file)
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -174,7 +174,6 @@ EXTERN_C_BEGIN
 #    error M68K based HP machines no longer supported.
 # endif
 # if defined(OPENBSD) && defined(m68k)
-     /* FIXME: Should we remove this case? */
 #    define M68K
 #    define mach_type_known
 # endif
@@ -904,7 +903,6 @@ EXTERN_C_BEGIN
 #   define MACH_TYPE "M68K"
 #   define ALIGNMENT 2
 #   ifdef OPENBSD
-        /* FIXME: Should we remove this case? */
 #       define OS_TYPE "OPENBSD"
 #       define HEURISTIC2
 #       ifdef __ELF__
@@ -2634,7 +2632,7 @@ EXTERN_C_BEGIN
           /* At present, there's a bug in GLibc getcontext() on         */
           /* Linux/x64 (it clears FPU exception mask).  We define this  */
           /* macro to workaround it.                                    */
-          /* FIXME: This seems to be fixed in GLibc v2.14.              */
+          /* TODO: This seems to be fixed in GLibc v2.14.               */
 #         define GETCONTEXT_FPU_EXCMASK_BUG
 #       endif
 #       if defined(__GLIBC__) && !defined(__UCLIBC__)

diff --git a/mach_dep.c b/mach_dep.c
index 07e633fdbb37c689ab999374e3e9e8de0b1293eb..60b73b228953ef90c1c1fd97da724ffb9775f68e 100644 (file)
--- a/mach_dep.c
+++ b/mach_dep.c
@@ -325,7 +325,7 @@ GC_INNER void GC_with_callee_saves_pushed(void (*fn)(ptr_t, void *),
 #     endif /* !HAVE_BUILTIN_UNWIND_INIT */
     }
 # endif /* !HAVE_PUSH_REGS */
-  /* FIXME: context here is sometimes just zero.  At the moment the     */
+  /* TODO: context here is sometimes just zero.  At the moment, the     */
   /* callees don't really need it.                                      */
   fn(arg, context);
   /* Strongly discourage the compiler from treating the above   */

diff --git a/mark_rts.c b/mark_rts.c
index 03b287f53ee138af2034cdbc9909fac8b6403e6c..7d166eda5d0fd31ad8f3036f473658d0169fe0fd 100644 (file)
--- a/mark_rts.c
+++ b/mark_rts.c
@@ -787,7 +787,7 @@ STATIC void GC_push_all_stack_part_eager_sections(ptr_t lo, ptr_t hi,
  * In the presence of threads, push enough of the current stack
  * to ensure that callee-save registers saved in collector frames have been
  * seen.
- * FIXME: Merge with per-thread stuff.
+ * TODO: Merge it with per-thread stuff.
  */
 STATIC void GC_push_current_stack(ptr_t cold_gc_frame,
                                   void * context GC_ATTR_UNUSED)

diff --git a/misc.c b/misc.c
index 7f1fbd1c52f0980bd789c90139c86eed54aee518..fe4605be641d471dabe4318f44c73f8b4a800b93 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1678,7 +1678,7 @@ GC_API void GC_CALL GC_enable_incremental(void)
       return res ? (int)written : -1;
   }
 
-  /* FIXME: This is pretty ugly ... */
+  /* TODO: This is pretty ugly ... */
 # define WRITE(f, buf, len) GC_write(buf, len)
 
 #elif defined(OS2) || defined(MACOS)

diff --git a/os_dep.c b/os_dep.c
index bf089e864755e83c184b3b29e94b0aa65db69dde..03cd7ecbd1e2f0b253ee3d6f8f58ae14b83b47b6 100644 (file)
--- a/os_dep.c
+++ b/os_dep.c
@@ -480,7 +480,7 @@ GC_INNER char * GC_get_maps(void)
 #   define ECOS_GC_MEMORY_SIZE (448 * 1024)
 # endif /* ECOS_GC_MEMORY_SIZE */
 
-  /* FIXME: This is a simple way of allocating memory which is          */
+  /* TODO: This is a simple way of allocating memory which is           */
   /* compatible with ECOS early releases.  Later releases use a more    */
   /* sophisticated means of allocating memory than this simple static   */
   /* allocator, but this method is at least bound to work.              */
@@ -1478,7 +1478,7 @@ GC_INNER size_t GC_page_size = 0;
     /* stack of one thread and the register backing store of the        */
     /* next.  Thus this is likely to identify way too large a           */
     /* "stack" and thus at least result in disastrous performance.      */
-    /* FIXME - Implement better strategies here.                        */
+    /* TODO: Implement better strategies here. */
     GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *b)
     {
       IF_CANCEL(int cancel_state;)
@@ -3802,7 +3802,7 @@ GC_INNER GC_bool GC_dirty_init(void)
         return NULL == HDR(h)
                || get_pht_entry_from_index(GC_written_pages, PHT_HASH(h));
 #     else
-        /* FIXME - implement me for MANUAL_VDB. */
+        /* TODO: implement me for MANUAL_VDB. */
         (void)h;
         return TRUE;
 #     endif

diff --git a/reclaim.c b/reclaim.c
index d17881a2db2c1464b5c628e02daf6aa6c7019fb7..f729f5d571603a62e6e245ec9deafa6f53c20271 100644 (file)
--- a/reclaim.c
+++ b/reclaim.c
@@ -138,7 +138,7 @@ STATIC GC_bool GC_block_nearly_full(hdr *hhdr)
     return (hhdr -> hb_n_marks > 7 * HBLK_OBJS(hhdr -> hb_sz)/8);
 }
 
-/* FIXME: This should perhaps again be specialized for USE_MARK_BYTES   */
+/* TODO: This should perhaps again be specialized for USE_MARK_BYTES    */
 /* and USE_MARK_BITS cases.                                             */
 
 /*