Merge pull request #409 from Alkarex/patch-1

[mono.git] / mono / metadata / sgen-major-scan-object.h

diff --git a/mono/metadata/sgen-major-scan-object.h b/mono/metadata/sgen-major-scan-object.h
index d254915064c22cc9daa4d9cc242589778ea094ce..6cb60cb881bbe2fd7fb3f74c3b35c37da67478fd 100644 (file)
--- a/mono/metadata/sgen-major-scan-object.h
+++ b/mono/metadata/sgen-major-scan-object.h
@@ -21,83 +21,8 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-extern long long stat_scan_object_called_nursery;
 extern long long stat_scan_object_called_major;
 
-#undef HANDLE_PTR
-#define HANDLE_PTR(ptr,obj)    do {    \
-               void *__old = *(ptr);   \
-               void *__copy;           \
-               if (__old) {    \
-                       copy_object ((ptr), queue);     \
-                       __copy = *(ptr);        \
-                       DEBUG (9, if (__old != __copy) fprintf (gc_debug_file, "Overwrote field at %p with %p (was: %p)\n", (ptr), *(ptr), __old));     \
-                       if (G_UNLIKELY (mono_sgen_ptr_in_nursery (__copy) && !mono_sgen_ptr_in_nursery ((ptr)))) \
-                               mono_sgen_add_to_global_remset ((ptr)); \
-               }       \
-       } while (0)
-
-/*
- * Scan the object pointed to by @start for references to
- * other objects between @from_start and @from_end and copy
- * them to the gray_objects area.
- */
-static void
-minor_scan_object (char *start, SgenGrayQueue *queue)
-{
-#include "sgen-scan-object.h"
-
-       HEAVY_STAT (++stat_scan_object_called_nursery);
-}
-
-/*
- * scan_vtype:
- *
- * Scan the valuetype pointed to by START, described by DESC for references to
- * other objects between @from_start and @from_end and copy them to the gray_objects area.
- * Returns a pointer to the end of the object.
- */
-static void
-minor_scan_vtype (char *start, mword desc, SgenGrayQueue *queue)
-{
-       /* The descriptors include info about the MonoObject header as well */
-       start -= sizeof (MonoObject);
-
-#define SCAN_OBJECT_NOVTABLE
-#include "sgen-scan-object.h"
-}
-
-#undef HANDLE_PTR
-#define HANDLE_PTR(ptr,obj)    do {    \
-               void *__old = *(ptr);   \
-               void *__copy;           \
-               if (__old) {    \
-                       nopar_copy_object ((ptr), queue);       \
-                       __copy = *(ptr);        \
-                       DEBUG (9, if (__old != __copy) fprintf (gc_debug_file, "Overwrote field at %p with %p (was: %p)\n", (ptr), *(ptr), __old));     \
-                       if (G_UNLIKELY (mono_sgen_ptr_in_nursery (__copy) && !mono_sgen_ptr_in_nursery ((ptr)))) \
-                               mono_sgen_add_to_global_remset ((ptr)); \
-               }       \
-       } while (0)
-
-static void
-nopar_minor_scan_object (char *start, SgenGrayQueue *queue)
-{
-#include "sgen-scan-object.h"
-
-       HEAVY_STAT (++stat_scan_object_called_nursery);
-}
-
-static void
-nopar_minor_scan_vtype (char *start, mword desc, SgenGrayQueue *queue)
-{
-       /* The descriptors include info about the MonoObject header as well */
-       start -= sizeof (MonoObject);
-
-#define SCAN_OBJECT_NOVTABLE
-#include "sgen-scan-object.h"
-}
-
 #ifdef FIXED_HEAP
 #define PREFETCH_DYNAMIC_HEAP(addr)
 #else
@@ -112,9 +37,9 @@ nopar_minor_scan_vtype (char *start, mword desc, SgenGrayQueue *queue)
                        PREFETCH_DYNAMIC_HEAP (__old);                  \
                        major_copy_or_mark_object ((ptr), queue);       \
                        __copy = *(ptr);                                \
-                       DEBUG (9, if (__old != __copy) mono_sgen_debug_printf (9, "Overwrote field at %p with %p (was: %p)\n", (ptr), *(ptr), __old)); \
-                       if (G_UNLIKELY (mono_sgen_ptr_in_nursery (__copy) && !mono_sgen_ptr_in_nursery ((ptr)))) \
-                               mono_sgen_add_to_global_remset ((ptr)); \
+                       SGEN_COND_LOG (9, __old != __copy, "Overwrote field at %p with %p (was: %p)", (ptr), *(ptr), __old); \
+                       if (G_UNLIKELY (sgen_ptr_in_nursery (__copy) && !sgen_ptr_in_nursery ((ptr)))) \
+                               sgen_add_to_global_remset ((ptr));      \
                }                                                       \
        } while (0)
 
@@ -125,11 +50,3 @@ major_scan_object (char *start, SgenGrayQueue *queue)
 
        HEAVY_STAT (++stat_scan_object_called_major);
 }
-
-#define FILL_COLLECTOR_SCAN_OBJECT(collector)  do {                    \
-               (collector)->major_scan_object = major_scan_object;     \
-               (collector)->minor_scan_object = minor_scan_object;     \
-               (collector)->nopar_minor_scan_object = nopar_minor_scan_object; \
-               (collector)->minor_scan_vtype = minor_scan_vtype;       \
-               (collector)->nopar_minor_scan_vtype = nopar_minor_scan_vtype; \
-       } while (0)