Changeset 24bc651

Timestamp:

Sep 16, 2016, 11:14:12 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, 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:

bd34fc87

Parents:

fc4a0fa

Message:

now using proper ctor semantics for more objects in gc

Location:

src/examples/gc_no_raii/src/internal

Files:

• card_table.h (modified) (1 diff)
• memory_pool.c (modified) (3 diffs)
• memory_pool.h (modified) (2 diffs)
• state.c (modified) (1 diff)

src/examples/gc_no_raii/src/internal/card_table.h

@@ -18 +18 @@
 };
 
-static inline void ctor_card(card_table_t* const this)
+static inline void ?{}(card_table_t* this)
 {
         this->count = 0;
 }
 
-static inline void dtor_card(card_table_t* const this)
+static inline void ^?{}(card_table_t* this)
 {
 

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

@@ -11 +11 @@
 const size_t gc_pool_header_size = (size_t)(  &(((gc_memory_pool*)NULL)->start_p) );
 
-void ctor(gc_memory_pool *const this, size_t size, gc_memory_pool* next, gc_memory_pool* mirror, uint8_t type)
+void ?{}(gc_memory_pool* this, size_t size, gc_memory_pool* next, gc_memory_pool* mirror, uint8_t type)
 {
         this->mirror = mirror;
@@ -17 +17 @@
         this->type_code = type;
 
-        card_table_t* new = (card_table_t*)malloc(sizeof(card_table_t));
-        this->cards = new;
-        ctor_card(this->cards);
+        this->cards = ( (card_table_t*)malloc(sizeof(card_table_t)) ){};
 
         this->end_p = ((uint8_t*)this) + size;
@@ -29 +27 @@
 }
 
-void dtor(gc_memory_pool *const this)
+void ^?{}(gc_memory_pool* this)
 {
-        dtor_card(this->cards);
+        ^(&this->cards){};
         free(this->cards);
 }

src/examples/gc_no_raii/src/internal/memory_pool.h

@@ -27 +27 @@
 };
 
-void ctor(      gc_memory_pool *const this,
+void ?{}(       gc_memory_pool* this,
                 size_t size,
                 gc_memory_pool* next,
@@ -34 +34 @@
         );
 
-void dtor(gc_memory_pool *const this);
+void ^?{}(gc_memory_pool* this);
 
 struct gc_pool_object_iterator

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

@@ -131 +131 @@
 
       this->from_space = (gc_memory_pool*)(pal_allocPool(POOL_SIZE_BYTES, 1));
-      this->to_space = (gc_memory_pool*)(pal_allocPool(POOL_SIZE_BYTES, 1));
-
-      ctor(this->from_space, POOL_SIZE_BYTES, old_from_space, this->to_space,   this->from_code);
-      ctor(this->to_space,   POOL_SIZE_BYTES, old_to_space,   this->from_space, (~this->from_code) & 0x01);
+      this->to_space   = (gc_memory_pool*)(pal_allocPool(POOL_SIZE_BYTES, 1));
+
+      this->from_space{ POOL_SIZE_BYTES, old_from_space, this->to_space,   this->from_code };
+      this->to_space  { POOL_SIZE_BYTES, old_to_space,   this->from_space, (~this->from_code) & 0x01 };
 
         this->total_space += gc_pool_size_used(this->from_space);