Changeset 6be0cf9 for src/examples/gc_no_raii/src/gcpointers.c

Timestamp:

Jan 19, 2016, 4:07:06 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

08a40fd

Parents:

a2b2761

Message:

gcpointers.c compiles

File:

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

src/examples/gc_no_raii/src/gcpointers.c

@@ -4 +4 @@
 #include "internal/collector.h"
 #include "internal/object_header.h"
-#include "internal/state.h"
+// #include "internal/state.h"
 
 void register_ptr(gcpointer_t* this)
@@ -14 +14 @@
         if(managed)
         {
-                gc_object_header* obj = gc_get_object_for_ref(this);
+                gc_object_header* obj = gc_get_object_for_ref(gc_get_state(), (void*)this);
                 check(obj);
                 check(gc_obj_is_valide(obj));
                 check(gc_is_managed(this) == gc_is_managed(obj->type_chain) || obj->type_chain == NULL);
-                m_next = obj->type_chain;
+                this->next = obj->type_chain;
                 obj->type_chain = this;
                 check(obj->is_valide());
@@ -24 +24 @@
         else
         {
-                gc_object_header* obj = gc_get_object_ptr(this->ptr);
+                gc_object_header* obj = gc_get_object_ptr((void*)this->ptr);
                 check(obj);
                 check(gc_obj_is_valide(obj));
                 check(gc_is_managed(this) == gc_is_managed(obj->root_chain) || obj->root_chain == NULL);
-                m_next = obj->root_chain;
+                this->next = obj->root_chain;
                 obj->root_chain = this;
                 check(gc_obj_is_valide(obj));
@@ -46 +46 @@
 void gcpointer_ctor(gcpointer_t* this)
 {
-        this->ptr = NULL;
+        this->ptr = (intptr_t)NULL;
         this->next = NULL;
 }
@@ -52 +52 @@
 void gcpointer_ctor(gcpointer_t* this, void* address)
 {
-        this->ptr = address;
+        this->ptr = (intptr_t)address;
         this->next = NULL;
 
@@ -73 +73 @@
 gcpointer_t* gcpointer_assign(gcpointer_t* this, gcpointer_t* rhs)
 {
-        if(this != rhs && this->ptr != rhs->ptr)
+        if(this != rhs)
         {
                 unregister_ptr(this);
@@ -98 +98 @@
 int gcpointer_null(gcpointer_t* this)
 {
-        return this->ptr == NULL;
+        return this->ptr == (intptr_t)NULL;
 }