diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2000-01-11 15:19:35 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2000-01-11 15:19:35 +0000 |
| commit | ecc3a9c70d263ec386376e7c39c20e2bf883fe7c (patch) | |
| tree | 2e46ccdaef4024d486a83dec4f16d34219930172 | |
| parent | 117525ed94a7cb45fbf464284eb133655be0e0a3 (diff) | |
suppression de Push_roots et Pop_roots
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2752 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | byterun/Makefile.Mac.depend | 84 | ||||
| -rw-r--r-- | byterun/memory.h | 29 |
2 files changed, 60 insertions, 53 deletions
diff --git a/byterun/Makefile.Mac.depend b/byterun/Makefile.Mac.depend index 60524d918..5f6094d1e 100644 --- a/byterun/Makefile.Mac.depend +++ b/byterun/Makefile.Mac.depend @@ -45,15 +45,16 @@ "compact.c.x" Ä compact.c ¶ config.h ¶ ::config:sm-Mac.h ¶ - freelist.h ¶ + finalise.h ¶ + roots.h ¶ misc.h ¶ - mlvalues.h ¶ + memory.h ¶ gc.h ¶ - gc_ctrl.h ¶ + mlvalues.h ¶ major_gc.h ¶ - memory.h ¶ + freelist.h ¶ minor_gc.h ¶ - roots.h ¶ + gc_ctrl.h ¶ weak.h "compare.c.x" Ä compare.c ¶ @@ -120,6 +121,21 @@ signals.h ¶ stacks.h +"finalise.c.x" Ä finalise.c ¶ + callback.h ¶ + mlvalues.h ¶ + config.h ¶ + ::config:sm-Mac.h ¶ + misc.h ¶ + fail.h ¶ + roots.h ¶ + memory.h ¶ + gc.h ¶ + major_gc.h ¶ + freelist.h ¶ + minor_gc.h ¶ + signals.h + "fix_code.c.x" Ä fix_code.c ¶ config.h ¶ ::config:sm-Mac.h ¶ @@ -300,13 +316,14 @@ misc.h ¶ fail.h ¶ mlvalues.h ¶ - freelist.h ¶ - gc.h ¶ - gc_ctrl.h ¶ - major_gc.h ¶ + finalise.h ¶ roots.h ¶ memory.h ¶ + gc.h ¶ + major_gc.h ¶ + freelist.h ¶ minor_gc.h ¶ + gc_ctrl.h ¶ weak.h "md5.c.x" Ä md5.c ¶ @@ -357,13 +374,14 @@ fail.h ¶ misc.h ¶ mlvalues.h ¶ + finalise.h ¶ + roots.h ¶ + memory.h ¶ gc.h ¶ - gc_ctrl.h ¶ major_gc.h ¶ freelist.h ¶ - memory.h ¶ minor_gc.h ¶ - roots.h ¶ + gc_ctrl.h ¶ signals.h "misc.c.x" Ä misc.c ¶ @@ -583,15 +601,16 @@ "compact.c.o" Ä compact.c ¶ config.h ¶ ::config:sm-Mac.h ¶ - freelist.h ¶ + finalise.h ¶ + roots.h ¶ misc.h ¶ - mlvalues.h ¶ + memory.h ¶ gc.h ¶ - gc_ctrl.h ¶ + mlvalues.h ¶ major_gc.h ¶ - memory.h ¶ + freelist.h ¶ minor_gc.h ¶ - roots.h ¶ + gc_ctrl.h ¶ weak.h "compare.c.o" Ä compare.c ¶ @@ -658,6 +677,21 @@ signals.h ¶ stacks.h +"finalise.c.o" Ä finalise.c ¶ + callback.h ¶ + mlvalues.h ¶ + config.h ¶ + ::config:sm-Mac.h ¶ + misc.h ¶ + fail.h ¶ + roots.h ¶ + memory.h ¶ + gc.h ¶ + major_gc.h ¶ + freelist.h ¶ + minor_gc.h ¶ + signals.h + "fix_code.c.o" Ä fix_code.c ¶ config.h ¶ ::config:sm-Mac.h ¶ @@ -838,13 +872,14 @@ misc.h ¶ fail.h ¶ mlvalues.h ¶ - freelist.h ¶ - gc.h ¶ - gc_ctrl.h ¶ - major_gc.h ¶ + finalise.h ¶ roots.h ¶ memory.h ¶ + gc.h ¶ + major_gc.h ¶ + freelist.h ¶ minor_gc.h ¶ + gc_ctrl.h ¶ weak.h "md5.c.o" Ä md5.c ¶ @@ -895,13 +930,14 @@ fail.h ¶ misc.h ¶ mlvalues.h ¶ + finalise.h ¶ + roots.h ¶ + memory.h ¶ gc.h ¶ - gc_ctrl.h ¶ major_gc.h ¶ freelist.h ¶ - memory.h ¶ minor_gc.h ¶ - roots.h ¶ + gc_ctrl.h ¶ signals.h "misc.c.o" Ä misc.c ¶ diff --git a/byterun/memory.h b/byterun/memory.h index dd7d24680..2ded6bfbf 100644 --- a/byterun/memory.h +++ b/byterun/memory.h @@ -336,35 +336,6 @@ extern struct caml__roots_block *local_roots; /* defined in roots.c */ #define End_roots() local_roots = caml__roots_block.next; } -/* - [Push_roots] and [Pop_roots] are obsolete. - Use [CAMLparam], [CAMLxparam], [CAMLlocal], [CAMLreturn] instead. -*/ - -/* [Push_roots] and [Pop_roots] are used for C variables that are GC roots. - * It must contain all values in C local variables at the time the minor GC is - * called. - * Usage: - * At the end of the declarations of your C local variables, add - * [ Push_roots (variable_name, size); ] - * The size is the number of declared roots. They are accessed as - * [ variable_name [0] ... variable_name [size - 1] ]. - * The [variable_name] and the [size] must not be [ _ ]. - * Just before the function return, add a call to [Pop_roots]. - */ - -#define Push_roots(name, size) \ - value name [(size)]; \ - struct caml__roots_block caml__roots_block; \ - { long _; for (_ = 0; _ < (size); name [_++] = Val_unit); } \ - caml__roots_block.next = local_roots; \ - local_roots = &caml__roots_block; \ - caml__roots_block.nitems = (size); \ - caml__roots_block.ntables = 1; \ - caml__roots_block.tables[0] = name; - -#define Pop_roots() local_roots = caml__roots_block.next; - /* [register_global_root] registers a global C variable as a memory root for the duration of the program, or until [remove_global_root] is called. */ |