Fix gc_backptr.h, gc_mark.h, GC_DS_TAGS names in documentation

(Cherry-pick commit d4eb7ca from 'release-7_6' branch.)

* doc/debugging.html: Rename backptr.h to gc_backptr.h.
* include/gc_mark.h (GC_DS_PER_OBJECT): Rename DS_TAGS to GC_DS_TAGS in
the comment.
* include/private/gc_priv.h (hblkhdr.hb_descr): Rename mark.h to
gc_mark.h in the comment.

diff --git a/doc/debugging.html b/doc/debugging.html
index 01281291f269c643b681846f8e8e84f78d3f0d7e..5c24862b9573c76216eaaf44f173dc3e6135acfd 100644 (file)
--- a/doc/debugging.html
+++ b/doc/debugging.html
@@ -160,7 +160,7 @@ before including <TT>gc.h</tt> and allocating with <TT>GC_MALLOC</tt>),
 so that objects will be identified by their allocation site,
 <LI> Running the application long enough so
 that most of the heap is composed of "leaked" memory, and
-<LI> Then calling <TT>GC_generate_random_backtrace()</tt> from backptr.h
+<LI> Then calling <TT>GC_generate_random_backtrace()</tt> from gc_backptr.h
 a few times to determine why some randomly sampled objects in the heap are
 being retained.
 </ol>

diff --git a/include/gc_mark.h b/include/gc_mark.h
index 2f88f38acac8d17c09d09139e710977e2f40a3c0..6eb5c13632c71fbda10c07a5336347a710075735 100644 (file)
--- a/include/gc_mark.h
+++ b/include/gc_mark.h
@@ -101,10 +101,10 @@ typedef struct GC_ms_entry * (*GC_mark_proc)(GC_word * /* addr */,
                | (proc_index)) << GC_DS_TAG_BITS) | GC_DS_PROC)
 #define GC_DS_PER_OBJECT 3  /* The real descriptor is at the            */
                         /* byte displacement from the beginning of the  */
-                        /* object given by descr & ~DS_TAGS             */
+                        /* object given by descr & ~GC_DS_TAGS.         */
                         /* If the descriptor is negative, the real      */
                         /* descriptor is at (*<object_start>) -         */
-                        /* (descr & ~DS_TAGS) - GC_INDIR_PER_OBJ_BIAS   */
+                        /* (descr&~GC_DS_TAGS) - GC_INDIR_PER_OBJ_BIAS  */
                         /* The latter alternative can be used if each   */
                         /* object contains a type descriptor in the     */
                         /* first word.                                  */

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index 6219c274d36e04651556bf9013d7e352b625e0b7..94bfbef092571a5dc42b9150038a093cdc390a1f 100644 (file)
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -931,7 +931,7 @@ struct hblkhdr {
                    /* without generating a negative result.  We avoid    */
                    /* generating free blocks larger than that.           */
     word hb_descr;              /* object descriptor for marking.  See  */
-                                /* mark.h.                              */
+                                /* gc_mark.h.                           */
 #   ifdef MARK_BIT_PER_OBJ
       unsigned32 hb_inv_sz;     /* A good upper bound for 2**32/hb_sz.  */
                                 /* For large objects, we use            */