Changeset 101e0bd for src/examples/gc_no_raii/src/internal/memory_pool.c

Timestamp:

Sep 15, 2016, 2:57:03 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

ba7aa2d, fc4a0fa

Parents:

5b639ee (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:

more refactoring of parser code

File:

• src/examples/gc_no_raii/src/internal/memory_pool.c (modified) (10 diffs)

src/examples/gc_no_raii/src/internal/memory_pool.c

@@ -1 +1 @@
 #include "memory_pool.h"
 
-#include <stdlib>
+extern "C" {
+        #include <stdlib.h>
+        #include <string.h>
+}
 
+#include "collector.h"
 #include "object_header.h"
 
@@ -15 +19 @@
         card_table_t* new = (card_table_t*)malloc(sizeof(card_table_t));
         this->cards = new;
-        ctor(this->cards);
+        ctor_card(this->cards);
 
         this->end_p = ((uint8_t*)this) + size;
         this->free_p = this->start_p;
 
-        check(gc_pool_of(this) == this);
+        check( gc_pool_of( (void*)this ) == this);
         check(this->cards);
         gc_reset_pool(this);
@@ -27 +31 @@
 void dtor(gc_memory_pool *const this)
 {
-        dtor(this->cards);
+        dtor_card(this->cards);
         free(this->cards);
 }
@@ -34 +38 @@
 {
         this->free_p = this->start_p;
-        #if _DEBUG
-                memset(this->start_p, 0xCD, gc_pool_total_size(this));
+        #ifndef NDEBUG
+                memset(this->start_p, 0xCD, gc_pool_size_total(this));
         #endif
 
@@ -41 +45 @@
         reset(this->cards);
 
-        check(gc_pool_size_left(this) == gc_pool_total_size(this));
+        check(gc_pool_size_left(this) == gc_pool_size_total(this));
 }
 
@@ -58 +62 @@
 }
 
-void ctor(
-                gc_pool_object_iterator* const this,
+void ?{}(       gc_pool_object_iterator* this,
                 struct gc_object_header* start_object
-                #if _DEBUG
+                #ifndef NDEBUG
                         , intptr_t pool_start
                         , intptr_t pool_end
@@ -68 +71 @@
 {
         this->object = start_object;
-        #if _DEBUG
+        #ifndef NDEBUG
                 this->lower_limit = pool_start;
                 this->upper_limit = pool_end;
         #endif
 
-        check( ((intptr_t)start_object) >= lower_limit );
-        check( ((intptr_t)start_object) <= upper_limit );
+        check( ((intptr_t)start_object) >= this->lower_limit );
+        check( ((intptr_t)start_object) <= this->upper_limit );
 }
+
+void ^?{}( gc_pool_object_iterator* this ) {}
 
 gc_pool_object_iterator gc_pool_iterator_for(gc_memory_pool* const this, void* member)
@@ -81 +86 @@
         size_t card = card_of(member);
         intptr_t member_add = (intptr_t)member;
-        void* start_obj;
-        intptr_t start_obj_add;
+        intptr_t start_obj;
 
         do
         {
                 check(card < CARDS_COUNT);
-                start_obj = object_at(this->cards, card);
+                start_obj = (intptr_t)object_at(this->cards, card);
                 check(card != 0 || start_obj);
                 card--;
-                start_obj_add = (intptr_t)start_obj;
         }
-        while(start_obj_add > member_add || start_obj_add != 0);
+        while(start_obj > member_add || !(start_obj));
 
-        check(start_obj);
-        
+        check( start_obj );
+
         struct gc_object_header* start_obj_typed = (struct gc_object_header*)start_obj;
 
-        gc_pool_object_iterator it;
-        ctor( &it,
-                start_obj_typed,
-                #if _DEBUG
+        return (gc_pool_object_iterator) {
+                start_obj_typed
+                #ifndef NDEBUG
                         , (intptr_t)this->start_p
                         , (intptr_t)this->free_p
                 #endif
-        );
-        return it;
+        };
 }
 
@@ -117 +118 @@
 {
         struct gc_object_header* start_obj = (struct gc_object_header*)this->start_p;
-        gc_pool_object_iterator it;
-        ctor( &it,
-                start_obj,
-                #if _DEBUG
+        return (gc_pool_object_iterator) {
+                start_obj
+                #ifndef NDEBUG
                         , (intptr_t)this->start_p
                         , (intptr_t)this->free_p
                 #endif
-        );
-        return it;
+        };
 }
 
 gc_pool_object_iterator end(gc_memory_pool* const this)
 {
-        gc_pool_object_iterator it;
-        ctor( &it,
-                (struct gc_object_header*)this->free_p,
-                #if _DEBUG
+        return (gc_pool_object_iterator) {
+                (struct gc_object_header*)this->free_p
+                #ifndef NDEBUG
                         , (intptr_t)this->start_p
                         , (intptr_t)this->free_p
                 #endif
-        );
-        return it;
+        };
 }
 
@@ -145 +142 @@
         struct gc_object_header* object = it->object;
         intptr_t next_ptr = ((intptr_t)object) + object->size;
-        check(next_ptr > lower_limit);
-        check(next_ptr <= upper_limit);
+        check(next_ptr > it->lower_limit);
+        check(next_ptr <= it->upper_limit);
 
         struct gc_object_header* next_obj = ((struct gc_object_header*)next_ptr);
-        check(next_ptr == upper_limit || is_valide(next_obj));
+        check(next_ptr == it->upper_limit || is_valid(next_obj));
 
         it->object = next_obj;