Changeset 385c130 for src/examples/gc_no_raii/src/internal/gc_tools.h

Timestamp:

Apr 19, 2016, 1:19:25 PM (8 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:

9026b4b

Parents:

356bb95

Message:

pre merge

File:

• src/examples/gc_no_raii/src/internal/gc_tools.h (modified) (1 diff)

src/examples/gc_no_raii/src/internal/gc_tools.h

@@ -12 +12 @@
 }
 
-// inline void* gc_get_aligned_ptr(void* address)
-// {
-//      return (void*)(((intptr_t)address) & (OBJECT_PTR_MASK));
-// }
-//
-// inline void* gc_write_aligned_ptr(void** reference, void* address)
-// {
-//      size_t ref_last_bits = ((intptr_t)*reference) & (~OBJECT_PTR_MASK);
-//
-//       size_t new_val = ((intptr_t)address) & OBJECT_PTR_MASK;
-//
-//       (*reference) = (void*)(new_val | ref_last_bits);
-//
-//      return *reference;
-// }
-//
-// inline size_t gc_compute_size(size_t size)
-// {
-//      size_t word_size = ((size - 1) / OBJECT_ALLIGNMENT) + 1;
-//      size_t ret = word_size * OBJECT_ALLIGNMENT;
-//
-//      check(ret >= size);
-//      check((ret % OBJECT_ALLIGNMENT) == 0);
-//      check( ((size % OBJECT_ALLIGNMENT) != 0) || (ret == size) );
-//
-//      return ret;
-// }
+inline void* gc_get_aligned_ptr(void* address)
+{
+        return (void*)(((intptr_t)address) & (OBJECT_PTR_MASK));
+}
+
+inline void* gc_write_aligned_ptr(void** reference, void* address)
+{
+        size_t ref_last_bits = ((intptr_t)*reference) & (~OBJECT_PTR_MASK);
+
+      size_t new_val = ((intptr_t)address) & OBJECT_PTR_MASK;
+
+      (*reference) = (void*)(new_val | ref_last_bits);
+
+        return *reference;
+}
+
+inline size_t gc_compute_size(size_t size)
+{
+        size_t word_size = ((size - 1) / OBJECT_ALLIGNMENT) + 1;
+        size_t ret = word_size * OBJECT_ALLIGNMENT;
+
+        check(ret >= size);
+        check((ret % OBJECT_ALLIGNMENT) == 0);
+        check( ((size % OBJECT_ALLIGNMENT) != 0) || (ret == size) );
+
+        return ret;
+}