Changeset 1eba452 for src/examples/gc_no_raii/src/internal/state.c

Timestamp:

Sep 15, 2016, 10:29:43 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

fc4a0fa, fd782b2

Parents:

96a10cd (diff), 50c5cf3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/examples/gc_no_raii/src/internal/state.c (modified) (7 diffs)

src/examples/gc_no_raii/src/internal/state.c

@@ -21 +21 @@
 void gc_state_calc_usage(gc_state *const this);
 
-#if DEBUG
+#ifndef NDEBUG
         bool gc_state_roots_match(gc_state *const this);
         bool gc_state_no_from_space_ref(gc_state *const this);
@@ -76 +76 @@
 gc_object_header* gc_get_object_for_ref(gc_state* state, void* member)
 {
+        volatile int stage = 0;
         intptr_t target = ((intptr_t)member);
         if(!gc_is_in_heap(state, member)) return NULL;
+        stage++;
 
         gc_memory_pool* pool = gc_pool_of(member);
+        stage++;
         gc_pool_object_iterator it = gc_pool_iterator_for(pool, member);
+        stage++;
         gc_pool_object_iterator end = end(pool);
+        stage++;
 
         while(it != end)
         {
                 gc_object_header* object = *it;
+                check(object);
+                check( is_valid(object) );
                 {
                         intptr_t start = ((intptr_t)object);
@@ -94 +101 @@
                         }
                 }
+                stage++;
                 ++it;
         }
 
-        checkf(false, "is_in_heap() and iterator_for() return inconsistent data");
+        checkf( (int) 0, "is_in_heap() and iterator_for() return inconsistent data");
         abort();
         return NULL;
@@ -176 +184 @@
         this->from_code = (~this->from_code) & 0x01;
 
-        #if _DEBUG
+        #ifndef NDEBUG
                 {
                         gc_memory_pool* pool = this->from_space;
@@ -251 +259 @@
 }
 
-#if _DEBUG
+#ifndef NDEBUG
         bool gc_state_roots_match(gc_state* const this)
         {
@@ -265 +273 @@
                                 size += object->size;
 
-                                gcpointer_base* ptr = object->root_chain;
+                                gcpointer_t* ptr = object->root_chain;
                                 while(ptr)
                                 {
-                                        check(get_object_ptr(ptr->m_ptr) == object);
-                                        ptr = ptr->m_next;
+                                        check(gc_get_object_ptr( (void*)ptr->ptr ) == object);
+                                        ptr = ptr->next;
                                 }
                         }
 
-                        check(size + gc_pool_size_used(pool) == gc_pool_size_total(pool));
+                        checkf(size + gc_pool_size_left(pool) == gc_pool_size_total(pool),
+                                (const char*)"expected %lu + %lu == %lu\n",
+                                (size_t)size,
+                                (size_t)gc_pool_size_left(pool),
+                                (size_t)gc_pool_size_total(pool));
 
                         pool = pool->next;
@@ -286 +298 @@
                 while(pool)
                 {
-                        void** potential_ref = (void**)pool->m_start;
-                        while(potential_ref < (void**)pool->m_free)
+                        void** potential_ref = (void**)pool->start_p;
+                        while(potential_ref < (void**)pool->free_p)
                         {
                                 check(!gc_is_in_heap(this, *potential_ref));