Changeset 8e4aa05 for libcfa/src/memory.cfa

Timestamp:

Mar 4, 2021, 7:40:25 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

77d601f

Parents:

342af53 (diff), a5040fe (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:software/cfa/cfa-cc

File:

• libcfa/src/memory.cfa (modified) (11 diffs)

libcfa/src/memory.cfa

@@ -10 +10 @@
 // Created On       : Tue Jun  2 16:48:00 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jun  3 12:30:00 2020
-// Update Count     : 0
+// Last Modified On : Mon Feb  1 16:10:00 2021
+// Update Count     : 1
 //
 
@@ -18 +18 @@
 
 // Internal data object.
-forall(dtype T | sized(T), ttype Args | { void ?{}(T &, Args); })
+forall(T & | sized(T), Args... | { void ?{}(T &, Args); })
 void ?{}(counter_data(T) & this, Args args) {
         (this.counter){1};
@@ -24 +24 @@
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ^?{}(counter_data(T) & this) {
         assert(0 == this.counter);
@@ -31 +31 @@
 
 // This is one of many pointers keeping this alive.
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 void ?{}(counter_ptr(T) & this) {
         this.data = 0p;
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 void ?{}(counter_ptr(T) & this, zero_t) {
         this.data = 0p;
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 static void internal_decrement(counter_ptr(T) & this) {
         if (this.data && 0 == --this.data->counter) {
@@ -48 +48 @@
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 static void internal_copy(counter_ptr(T) & this, counter_ptr(T) & that) {
         this.data = that.data;
@@ -56 +56 @@
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T))
 void ?{}(counter_ptr(T) & this, counter_ptr(T) that) {
         // `that` is a copy but it should have neither a constructor
         // nor destructor run on it so it shouldn't need adjustment.
-        internal_decrement(this);
         internal_copy(this, that);
 }
 
-forall(dtype T | sized(T), ttype Args | { void ?{}(T&, Args); })
+forall(T & | sized(T), Args... | { void ?{}(T&, Args); })
 void ?{}(counter_ptr(T) & this, Args args) {
-        this.data = (counter_data(T)*)new(args);
+        this.data = malloc();
+        this.data->counter = 1;
+        (this.data->object){args};
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ^?{}(counter_ptr(T) & this) {
         internal_decrement(this);
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 T & *?(counter_ptr(T) & this) {
         return *((this.data) ? &this.data->object : 0p);
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ?=?(counter_ptr(T) & this, counter_ptr(T) that) {
         if (this.data != that.data) {
@@ -87 +88 @@
 }
 
-forall(dtype T | sized(T) | { void ^?{}(T &); })
+forall(T & | sized(T) | { void ^?{}(T &); })
 void ?=?(counter_ptr(T) & this, zero_t) {
         internal_decrement(this);
@@ -93 +94 @@
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 int ?==?(counter_ptr(T) const & this, counter_ptr(T) const & that) {
         return this.data == that.data;
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 int ?!=?(counter_ptr(T) const & this, counter_ptr(T) const & that) {
         return !?==?(this, that);
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 int ?==?(counter_ptr(T) const & this, zero_t) {
         return this.data == 0;
 }
 
-forall(dtype T | sized(T))
+forall(T & | sized(T))
 int ?!=?(counter_ptr(T) const & this, zero_t) {
         return !?==?(this, (zero_t)0);
@@ -114 +115 @@
 
 // This is the only pointer that keeps this alive.
-forall(dtype T)
+forall(T &)
 void ?{}(unique_ptr(T) & this) {
         this.data = 0p;
 }
 
-forall(dtype T)
+forall(T &)
 void ?{}(unique_ptr(T) & this, zero_t) {
         this.data = 0p;
 }
 
-forall(dtype T | sized(T), ttype Args | { void ?{}(T &, Args); })
+forall(T & | sized(T), Args... | { void ?{}(T &, Args); })
 void ?{}(unique_ptr(T) & this, Args args) {
-        this.data = (T *)new(args);
+        this.data = malloc();
+        (*this.data){args};
 }
 
-forall(dtype T | { void ^?{}(T &); })
+forall(T & | { void ^?{}(T &); })
 void ^?{}(unique_ptr(T) & this) {
         delete(this.data);
 }
 
-forall(dtype T)
+forall(T &)
 T & *?(unique_ptr(T) & this) {
         return *this.data;
 }
 
-forall(dtype T | { void ^?{}(T &); })
+forall(T & | { void ^?{}(T &); })
 void ?=?(unique_ptr(T) & this, zero_t) {
         delete(this.data);
@@ -145 +147 @@
 }
 
-forall(dtype T | { void ^?{}(T &); })
+forall(T & | { void ^?{}(T &); })
 void move(unique_ptr(T) & this, unique_ptr(T) & that) {
         delete(this.data);
@@ -152 +154 @@
 }
 
-forall(dtype T)
+forall(T &)
 int ?==?(unique_ptr(T) const & this, unique_ptr(T) const & that) {
         return this.data == that.data;
 }
 
-forall(dtype T)
+forall(T &)
 int ?!=?(unique_ptr(T) const & this, unique_ptr(T) const & that) {
         return !?==?(this, that);
 }
 
-forall(dtype T)
+forall(T &)
 int ?==?(unique_ptr(T) const & this, zero_t) {
         return this.data == 0;
 }
 
-forall(dtype T)
+forall(T &)
 int ?!=?(unique_ptr(T) const & this, zero_t) {
         return !?==?(this, (zero_t)0);