[svn:parrot] r36260 - in trunk: include/parrot src/gc

[whiteknight at svn.parrot.org]

Author: whiteknight
Date: Sun Feb  1 21:36:47 2009
New Revision: 36260
URL: https://trac.parrot.org/parrot/changeset/36260

Log:
[GC] create a gc_private.h file to hold definitions that are only for the GC system

Added:
   trunk/src/gc/gc_private.h
Modified:
   trunk/include/parrot/gc_api.h
   trunk/include/parrot/settings.h
   trunk/src/gc/api.c
   trunk/src/gc/mark_sweep.c
   trunk/src/gc/system.c

Modified: trunk/include/parrot/gc_api.h
==============================================================================
--- trunk/include/parrot/gc_api.h	Sun Feb  1 20:58:23 2009	(r36259)
+++ trunk/include/parrot/gc_api.h	Sun Feb  1 21:36:47 2009	(r36260)
@@ -172,25 +172,6 @@
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: src/gc/api.c */
 
-
-/* HEADERIZER BEGIN: src/cpu_dep.c */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
-
-void trace_system_areas(PARROT_INTERP)
-        __attribute__nonnull__(1);
-
-#define ASSERT_ARGS_trace_system_areas __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp)
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
-/* HEADERIZER END: src/cpu_dep.c */
-
-
-#if ! DISABLE_GC_DEBUG
-/* Set when walking the system stack */
-extern int CONSERVATIVE_POINTER_CHASING;
-#endif
-
-
 /* GC subsystem init functions */
 /* HEADERIZER BEGIN: src/gc/generational_ms.c */
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */

Modified: trunk/include/parrot/settings.h
==============================================================================
--- trunk/include/parrot/settings.h	Sun Feb  1 20:58:23 2009	(r36259)
+++ trunk/include/parrot/settings.h	Sun Feb  1 21:36:47 2009	(r36260)
@@ -40,7 +40,7 @@
  * 1 ... IMS incremental mark & sweep
  * 2 ... GMS generational mark & sweep
  *
- * Please note that only '0' is tested.
+ * Please note that only 0 currently works.
  */
 
 #define PARROT_GC_SUBSYSTEM 0
@@ -61,11 +61,6 @@
 #  define PARROT_GC_GMS     1
 #endif
 
-
-/*
- * misc settings
- */
-
 /*
  * JIT/i386 can use the CGP run core for external functions instead
  * of calling the function version of the opcode

Modified: trunk/src/gc/api.c
==============================================================================
--- trunk/src/gc/api.c	Sun Feb  1 20:58:23 2009	(r36259)
+++ trunk/src/gc/api.c	Sun Feb  1 21:36:47 2009	(r36260)
@@ -26,6 +26,7 @@
 #define DOD_C_SOURCE
 #include "parrot/parrot.h"
 #include "parrot/gc_api.h"
+#include "gc_private.h"
 
 /* HEADERIZER HFILE: include/parrot/gc_api.h */
 

Added: trunk/src/gc/gc_private.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/src/gc/gc_private.h	Sun Feb  1 21:36:47 2009	(r36260)
@@ -0,0 +1,40 @@
+/*
+Copyright (C) 2001-2009, The Perl Foundation.
+$Id: api.c 36259 2009-02-01 20:58:23Z whiteknight $
+
+=head1 NAME
+
+src/gc/gc_private.h - private header file for the GC subsystem
+
+=head1 DESCRIPTION
+
+This is a private header file for the GC subsystem. It contains definitions
+that are only for use in the GC and don't need to be included in the rest of
+Parrot.
+*/
+
+#include "parrot/settings.h"
+
+#if ! DISABLE_GC_DEBUG
+/* Set when walking the system stack. Defined in src/gc/system.c */
+extern int CONSERVATIVE_POINTER_CHASING;
+#endif
+
+#ifdef __ia64__
+
+#  include <ucontext.h>
+extern void *flush_reg_store(void);
+#  define BACKING_STORE_BASE 0x80000fff80000000
+
+#endif
+
+/* HEADERIZER BEGIN: src/gc/system.c*/
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
+
+void trace_system_areas(PARROT_INTERP)
+        __attribute__nonnull__(1);
+
+#define ASSERT_ARGS_trace_system_areas __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(interp)
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
+/* HEADERIZER END: src/gc/system.c */

Modified: trunk/src/gc/mark_sweep.c
==============================================================================
--- trunk/src/gc/mark_sweep.c	Sun Feb  1 20:58:23 2009	(r36259)
+++ trunk/src/gc/mark_sweep.c	Sun Feb  1 21:36:47 2009	(r36260)
@@ -21,6 +21,7 @@
 
 #include "parrot/parrot.h"
 #include "parrot/gc_mark_sweep.h"
+#include "gc_private.h"
 
 /* HEADERIZER HFILE: include/parrot/gc_mark_sweep.h */
 

Modified: trunk/src/gc/system.c
==============================================================================
--- trunk/src/gc/system.c	Sun Feb  1 20:58:23 2009	(r36259)
+++ trunk/src/gc/system.c	Sun Feb  1 21:36:47 2009	(r36260)
@@ -25,8 +25,9 @@
 */
 
 #include "parrot/parrot.h"
+#include "gc_private.h"
 
-/* HEADERIZER HFILE: include/parrot/gc_api.h */
+/* HEADERIZER HFILE: src/gc/gc_private.h */
 
 /* HEADERIZER BEGIN: static */
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
@@ -41,14 +42,6 @@
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: static */
 
-#ifdef __ia64__
-
-#  include <ucontext.h>
-extern void *flush_reg_store(void);
-#  define BACKING_STORE_BASE 0x80000fff80000000
-
-#endif
-
 /*
 
 =item C<void trace_system_areas>
@@ -279,7 +272,6 @@
 }
 #endif
 
-
 /*
 
 =back