]> granicus.if.org Git - gc/commitdiff
Remove barrett_diagram file duplicated by tree.html
authorIvan Maidanski <ivmai@mail.ru>
Mon, 9 Dec 2013 04:08:05 +0000 (08:08 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Mon, 9 Dec 2013 04:08:05 +0000 (08:08 +0400)
* Makefile.direct (DOC_FILES): Remove doc/barrett_diagram entry.
* Makefile.dj (OTHER_FILES): Likewise.
* doc/doc.am (dist_pkgdata_DATA): Likewise.
* doc/barrett_diagram: Remove file (as the content is duplicated in
doc/tree.html).

Makefile.direct
Makefile.dj
doc/barrett_diagram [deleted file]
doc/doc.am

index b5c1a6426f3179d62bf1e7cfdc7f2b4d93989886..b5bcc73cfd1e6fa975508d4df839f8b7ff729f16 100644 (file)
@@ -115,8 +115,7 @@ DOC_FILES= README.QUICK TODO doc/README.Mac doc/README.OS2 \
   doc/finalization.html doc/porting.html doc/overview.html \
   doc/README.dj doc/README.hp doc/README.linux doc/README.rs6000 \
   doc/README.sgi doc/README.solaris2 doc/README.uts \
-  doc/README.symbian doc/README.win32 doc/barrett_diagram \
-  README.md AUTHORS doc/gc.man \
+  doc/README.symbian doc/README.win32 README.md AUTHORS doc/gc.man \
   doc/README.environment doc/tree.html doc/gcdescr.html \
   doc/README.autoconf doc/README.macros doc/README.ews4800 \
   doc/README.DGUX386 doc/README.arm.cross doc/leak.html \
index aea59bfefd47dc6ac9469936c5e2d2235dfb09a6..c69474b61663812564b915a4e166f0e9b4162fd9 100644 (file)
@@ -65,7 +65,7 @@ OTHER_FILES= PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
            README.md tests/test.c test_cpp.cc tools/setjmp_t.c SMakefile.amiga \
            doc/README.amiga doc/README.win32 doc/README.cords \
            doc/README.rs6000 README.QUICK TODO tools/callprocs.sh \
-           pc_excludes barrett_diagram doc/README.OS2 doc/README.Mac \
+           pc_excludes doc/README.OS2 doc/README.Mac \
            extra/MacOS.c EMX_MAKEFILE doc/debugging.html \
            extra/Mac_files/datastart.c extra/Mac_files/dataend.c \
            extra/Mac_files/MacOS_config.h \
diff --git a/doc/barrett_diagram b/doc/barrett_diagram
deleted file mode 100644 (file)
index 6f7d2fe..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-This is an ASCII diagram of the data structure used to check pointer
-validity.  It was provided by Dave Barrett,
-and should be of use to others attempting to understand the code.
-The data structure in GC4.X is essentially the same.   -HB
-
-
-
-
-                Data Structure used by GC_base in gc3.7:
-                              21-Apr-94
-
-
-
-
-    63                  LOG_TOP_SZ[11]  LOG_BOTTOM_SZ[10]   LOG_HBLKSIZE[13]
-   +------------------+----------------+------------------+------------------+
- p:|                  |   TL_HASH(hi)  |                  |   HBLKDISPL(p)   |
-   +------------------+----------------+------------------+------------------+
-    \-----------------------HBLKPTR(p)-------------------/
-    \------------hi-------------------/
-                      \______ ________/ \________ _______/ \________ _______/
-                             V                   V                  V
-                             |                   |                  |
-           GC_top_index[]    |                   |                  |
- ---      +--------------+   |                   |                  |
-  ^       |              |   |                   |                  |
-  |       |              |   |                   |                  |
- TOP      +--------------+<--+                   |                  |
- _SZ   +-<|      []      | *                     |                  |
-(items)|  +--------------+  if 0 < bi< HBLKSIZE  |                  |
-  |    |  |              | then large object     |                  |
-  |    |  |              | starts at the bi'th   |                  |
-  v    |  |              | HBLK before p.        |             i    |
- ---   |  +--------------+                       |          (word-  |
-       v                                         |         aligned) |
-   bi= |GET_BI(p){->hash_link}->key==hi          |                  |
-       v                                         |                  |
-       |   (bottom_index)  \ scratch_alloc'd     |                  |
-       |   ( struct  bi )  / by get_index()      |                  |
- ---   +->+--------------+                       |                  |
-  ^       |              |                       |                  |
-  ^       |              |                       |                  |
- BOTTOM   |              |   ha=GET_HDR_ADDR(p)  |                  |
-_SZ(items)+--------------+<----------------------+          +-------+
-  |   +--<|   index[]    |                                  |
-  |   |   +--------------+                      GC_obj_map: v
-  |   |   |              |              from      / +-+-+-----+-+-+-+-+  ---
-  v   |   |              |              GC_add   < 0| | |     | | | | |   ^
- ---  |   +--------------+             _map_entry \ +-+-+-----+-+-+-+-+   |
-      |   |   asc_link   |                          +-+-+-----+-+-+-+-+ MAXOBJSZ
-      |   +--------------+                      +-->| | |  j  | | | | |  +1
-      |   |     key      |                      |   +-+-+-----+-+-+-+-+   |
-      |   +--------------+                      |   +-+-+-----+-+-+-+-+   |
-      |   |  hash_link   |                      |   | | |     | | | | |   v
-      |   +--------------+                      |   +-+-+-----+-+-+-+-+  ---
-      |                                         |   |<--MAX_OFFSET--->|
-      |                                         |         (bytes)
-HDR(p)| GC_find_header(p)                       |   |<--MAP_ENTRIES-->|
-      |                           \ from        |    =HBLKSIZE/WORDSZ
-      |    (hdr) (struct hblkhdr) / alloc_hdr() |    (1024 on Alpha)
-      +-->+----------------------+              |    (8/16 bits each)
-GET_HDR(p)| word   hb_sz (words) |              |
-          +----------------------+              |
-          | struct hblk *hb_next |              |
-          +----------------------+              |
-          |mark_proc hb_mark_proc|              |
-          +----------------------+              |
-          | char * hb_map        |>-------------+
-          +----------------------+
-          | ushort hb_obj_kind   |
-          +----------------------+
-          |   hb_last_reclaimed  |
- ---      +----------------------+
-  ^       |                      |
- MARK_BITS|       hb_marks[]     | *if hdr is free, hb_sz + DISCARD_WORDS
-_SZ(words)|                      |  is the size of a heap chunk (struct hblk)
-  v       |                      |  of at least MININCR*HBLKSIZE bytes (below),
- ---      +----------------------+  otherwise, size of each object in chunk.
-
-Dynamic data structures above are interleaved throughout the heap in blocks of
-size MININCR * HBLKSIZE bytes as done by gc_scratch_alloc which cannot be
-freed; free lists are used (e.g. alloc_hdr).  HBLKs's below are collected.
-
-              (struct hblk)
- ---      +----------------------+ < HBLKSIZE ---         ---          DISCARD_
-  ^       |garbage[DISCARD_WORDS]|   aligned   ^           ^ HDR_BYTES WORDS
-  |       |                      |             |           v (bytes)   (words)
-  |       +-----hb_body----------+ < WORDSZ    |          ---   ---
-  |       |                      |   aligned   |           ^     ^
-  |       |      Object 0        |             |           hb_sz |
-  |       |                      |           i |(word-    (words)|
-  |       |                      |      (bytes)|aligned)   v     |
-  |       + - - - - - - - - - - -+ ---         |          ---    |
-  |       |                      |  ^          |           ^     |
-  n *     |                      |  j (words)  |          hb_sz BODY_SZ
- HBLKSIZE |      Object 1        |  v          v           |   (words)
- (bytes)  |                      |---------------          v   MAX_OFFSET
-  |       + - - - - - - - - - - -+                        ---  (bytes)
-  |       |                      | !All_INTERIOR_PTRS      ^     |
-  |       |                      | sets j only for       hb_sz   |
-  |       |      Object N        | valid object offsets.   |     |
-  v       |                      | All objects WORDSZ      v     v
- ---      +----------------------+ aligned.               ---   ---
-
-DISCARD_WORDS is normally zero.  Indeed the collector has not been tested
-with another value in ages.
index dcae4d73ce9c8a2c0b51daa68028c005c0348199..ef541505e8ce8b3bd9ce7cb6895903ab314da49e 100644 (file)
@@ -37,7 +37,6 @@ dist_pkgdata_DATA = \
         doc/README.uts \
         doc/README.win32 \
         doc/README.win64 \
-        doc/barrett_diagram \
         doc/debugging.html \
         doc/finalization.html \
         doc/gc.man \