diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2004-01-01 16:42:43 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2004-01-01 16:42:43 +0000 |
| commit | 5a678d29f58926a5cd7db0c9121c69cb603a77f9 (patch) | |
| tree | c8157238e17990d5d90f9eeb1c08506e253593bb /byterun/compact.c | |
| parent | 331b2d89c3dc4fb7e1b51276a5a9e37a6c8c8b3a (diff) | |
| download | ocaml-5a678d29f58926a5cd7db0c9121c69cb603a77f9.tar.gz | |
depollution suite (PR#1914 et PR#1956)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6045 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/compact.c')
| -rw-r--r-- | byterun/compact.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/byterun/compact.c b/byterun/compact.c index 8a9da2121b..a72db880d4 100644 --- a/byterun/compact.c +++ b/byterun/compact.c @@ -42,7 +42,7 @@ extern void caml_shrink_heap (char *); /* memory.c */ XXX Should be fixed: XXX The above assumes that all roots are aligned on a 4-byte boundary, XXX which is not always guaranteed by C. - XXX (see [register_global_roots] and [init_exceptions]) + XXX (see [register_global_roots] and [caml_init_exceptions]) XXX Should be able to fix it to only assume 2-byte alignment. */ #define Make_ehd(s,t,c) (((s) << 10) | (t) << 2 | (c)) @@ -186,7 +186,7 @@ void caml_compact_heap (void) /* Invert roots first because the threads library needs some heap data structures to find its roots. Fortunately, it doesn't need the headers (see above). */ - do_roots (invert_root); + caml_do_roots (invert_root); final_do_weak_roots (invert_root); ch = caml_heap_start; @@ -222,7 +222,7 @@ void caml_compact_heap (void) } /* Invert weak pointers. */ { - value *pp = &weak_list_head; + value *pp = &caml_weak_list_head; value p; word q; size_t sz, i; @@ -234,7 +234,7 @@ void caml_compact_heap (void) while (Ecolor (q) == 0) q = * (word *) q; sz = Wosize_ehd (q); for (i = 1; i < sz; i++){ - if (Field (p,i) != weak_none){ + if (Field (p,i) != caml_weak_none){ invert_pointer_at ((word *) &(Field (p,i))); } } |