Changeset 986dd36 for doc/papers

Timestamp:

Mar 2, 2018, 5:34:51 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

dd05e12

Parents:

244b934

git-author:

Rob Schluntz <rschlunt@…> (03/02/18 09:47:18)

git-committer:

Rob Schluntz <rschlunt@…> (03/02/18 17:34:51)

Message:

Update CFA evaluation code

Location:

doc/papers/general/evaluation

Files:

• cfa-bench.c (modified) (2 diffs)
• cfa-stack.c (modified) (3 diffs)
• cfa-stack.h (modified) (1 diff)

doc/papers/general/evaluation/cfa-bench.c

@@ -10 +10 @@
         stack(int) si, ti;
 
-        REPEAT_TIMED( "push_int", N, push( &si, vali ); )
+        REPEAT_TIMED( "push_int", N, push( si, vali ); )
         TIMED( "copy_int", ti = si; )
-        TIMED( "clear_int", clear( &si ); )
-        REPEAT_TIMED( "pop_int", N, 
-                int xi = pop( &ti ); 
+        TIMED( "clear_int", clear( si ); )
+        REPEAT_TIMED( "pop_int", N,
+                int xi = pop( ti );
                 if ( xi > maxi ) { maxi = xi; } )
         REPEAT_TIMED( "print_int", N/2, print( out, vali, ":", vali, "\n" ); )
@@ -21 +21 @@
         stack(pair(_Bool, char)) sp, tp;
 
-        REPEAT_TIMED( "push_pair", N, push( &sp, valp ); )
+        REPEAT_TIMED( "push_pair", N, push( sp, valp ); )
         TIMED( "copy_pair", tp = sp; )
-        TIMED( "clear_pair", clear( &sp ); )
-        REPEAT_TIMED( "pop_pair", N, 
-                pair(_Bool, char) xp = pop( &tp ); 
+        TIMED( "clear_pair", clear( sp ); )
+        REPEAT_TIMED( "pop_pair", N,
+                pair(_Bool, char) xp = pop( tp );
                 if ( xp > maxp ) { maxp = xp; } )
         REPEAT_TIMED( "print_pair", N/2, print( out, valp, ":", valp, "\n" ); )

doc/papers/general/evaluation/cfa-stack.c

@@ -7 +7 @@
 };
 
-forall(otype T) void ?{}(stack(T)* s) { (&s->head){ 0 }; }
+forall(otype T) void ?{}(stack(T)& s) { (s.head){ 0 }; }
 
-forall(otype T) void ?{}(stack(T)* s, stack(T) t) {
-        stack_node(T)** crnt = &s->head;
+forall(otype T) void ?{}(stack(T)& s, stack(T) t) {
+        stack_node(T)** crnt = &s.head;
         for ( stack_node(T)* next = t.head; next; next = next->next ) {
-                *crnt = ((stack_node(T)*)malloc()){ next->value }; /***/
+                // *crnt = &(*(stack_node(T)*)malloc()){ next->value }; /***/
+                stack_node(T)* new_node = ((stack_node(T)*)malloc());
+                (*new_node){ next->value }; /***/
+                *crnt = new_node;
+
                 stack_node(T)* acrnt = *crnt;
                 crnt = &acrnt->next;
@@ -19 +23 @@
 }
 
-forall(otype T) stack(T) ?=?(stack(T)* s, stack(T) t) {
-        if ( s->head == t.head ) return *s;
+forall(otype T) stack(T) ?=?(stack(T)& s, stack(T) t) {
+        if ( s.head == t.head ) return s;
         clear(s);
         s{ t };
-        return *s;
+        return s;
 }
 
-forall(otype T) void ^?{}(stack(T)* s) { clear(s); }
+forall(otype T) void ^?{}(stack(T)& s) { clear(s); }
 
-forall(otype T) _Bool empty(const stack(T)* s) { return s->head == 0; }
+forall(otype T) _Bool empty(const stack(T)& s) { return s.head == 0; }
 
-forall(otype T) void push(stack(T)* s, T value) {
-        s->head = ((stack_node(T)*)malloc()){ value, s->head }; /***/
+forall(otype T) void push(stack(T)& s, T value) {
+        // s.head = &(*(stack_node(T)*)malloc()){ value, s.head }; /***/
+        stack_node(T)* new_node = ((stack_node(T)*)malloc());
+        (*new_node){ value, s.head }; /***/
+        s.head = new_node;
 }
 
-forall(otype T) T pop(stack(T)* s) {
-        stack_node(T)* n = s->head;
-        s->head = n->next;
+forall(otype T) T pop(stack(T)& s) {
+        stack_node(T)* n = s.head;
+        s.head = n->next;
         T x = n->value;
         ^n{};
@@ -43 +50 @@
 }
 
-forall(otype T) void clear(stack(T)* s) {
-    for ( stack_node(T)* next = s->head; next; ) {
+forall(otype T) void clear(stack(T)& s) {
+    for ( stack_node(T)* next = s.head; next; ) {
                 stack_node(T)* crnt = next;
                 next = crnt->next;
                 delete(crnt);
         }
-        s->head = 0;
+        s.head = 0;
 }

doc/papers/general/evaluation/cfa-stack.h

@@ -6 +6 @@
 };
 
-forall(otype T) void ?{}(stack(T)* s);
-forall(otype T) void ?{}(stack(T)* s, stack(T) t);
-forall(otype T) stack(T) ?=?(stack(T)* s, stack(T) t);
-forall(otype T) void ^?{}(stack(T)* s);
+forall(otype T) void ?{}(stack(T)& s);
+forall(otype T) void ?{}(stack(T)& s, stack(T) t);
+forall(otype T) stack(T) ?=?(stack(T)& s, stack(T) t);
+forall(otype T) void ^?{}(stack(T)& s);
 
-forall(otype T) _Bool empty(const stack(T)* s);
-forall(otype T) void push(stack(T)* s, T value);
-forall(otype T) T pop(stack(T)* s);
-forall(otype T) void clear(stack(T)* s);
+forall(otype T) _Bool empty(const stack(T)& s);
+forall(otype T) void push(stack(T)& s, T value);
+forall(otype T) T pop(stack(T)& s);
+forall(otype T) void clear(stack(T)& s);