Changeset 2bfee8e for doc/theses

Timestamp:

Sep 7, 2021, 12:26:06 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

031453c

Parents:

1341ce1 (diff), 812ba3d (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

Location:

doc/theses/andrew_beach_MMath/code

Files:

• fixup-empty-f.cfa (modified) (2 diffs)
• fixup-empty-r.cfa (modified) (2 diffs)
• fixup-other-f.cfa (modified) (3 diffs)
• fixup-other-r.cfa (modified) (3 diffs)
• resume-empty.cfa (modified) (1 diff)
• test.sh (modified) (1 diff)
• throw-empty.cpp (modified) (2 diffs)

doc/theses/andrew_beach_MMath/code/fixup-empty-f.cfa

@@ -2 +2 @@
 #include <clock.hfa>
 #include <fstream.hfa>
-#include <stdlib.hfa>                                                                   // strto
+#include <stdlib.hfa>
 
-int nounwind_fixup(unsigned int frames, void (*raised_rtn)(int &)) {
+void nounwind_fixup(unsigned int frames, void (*raised_rtn)(int &)) {
         if (frames) {
-                int rtn = nounwind_fixup(frames - 1, raised_rtn);
-                if ( rtn == 42 ) printf( "42" );                                // make non-tail recursive
-                return rtn;
-
+                nounwind_fixup(frames - 1, raised_rtn);
+                // "Always" false, but prevents recursion elimination.
+                if (-1 == frames) printf("~");
         } else {
                 int fixup = 17;
                 raised_rtn(fixup);
-                return fixup;
         }
 }
@@ -27 +25 @@
         }
 
+        // Closures at the top level are allowed to be true closures.
         void raised(int & fixup) {
-                fixup = total_frames + 42;                                              // use local scope => lexical link
-                if ( total_frames == 42 ) printf( "42" );
+                fixup = total_frames + 42;
+                if (total_frames == 42) printf("42");
         }
 

doc/theses/andrew_beach_MMath/code/fixup-empty-r.cfa

@@ -3 +3 @@
 #include <exception.hfa>
 #include <fstream.hfa>
-#include <stdlib.hfa>                                                                   // strto
+#include <stdlib.hfa>
 
 exception fixup_exception {
@@ -10 +10 @@
 vtable(fixup_exception) fixup_vt;
 
-int nounwind_empty(unsigned int frames) {
+void nounwind_empty(unsigned int frames) {
         if (frames) {
-                int rtn = nounwind_empty(frames - 1);
-                if ( rtn == 42 ) printf( "42" );                                // make non-tail recursive
-                return rtn;
+                nounwind_empty(frames - 1);
+                // "Always" false, but prevents recursion elimination.
+                if (-1 == frames) printf("~");
         } else {
                 int fixup = 17;
-                throwResume (fixup_exception){&fixup_vt, fixup}; // change bad fixup
-                return fixup;
+                throwResume (fixup_exception){&fixup_vt, fixup};
         }
 }

doc/theses/andrew_beach_MMath/code/fixup-other-f.cfa

@@ -2 +2 @@
 #include <clock.hfa>
 #include <fstream.hfa>
-#include <stdlib.hfa>                                                                   // strto
+#include <stdlib.hfa>
 
-unsigned int frames;                                                                    // use global because of gcc thunk problem
+// Using a global value to allow hoisting (and avoid thunks).
+unsigned int frames;
 
 void nounwind_fixup(unsigned int dummy, void (*raised_rtn)(int &), void (*not_raised_rtn)(int &)) {
         void not_raised(int & fixup) {
-                fixup = frames + 42;                                                    // use local scope => lexical link
+                fixup = frames + 42;
         }
 
@@ -14 +15 @@
                 frames -= 1;
                 nounwind_fixup(42, raised_rtn, not_raised);
+                // Always false, but prevents recursion elimination.
+                if (-1 == frames) printf("~");
         } else {
                 int fixup = dummy;
@@ -31 +34 @@
         frames = total_frames;
 
+        // Closures at the top level are allowed to be true closures.
         void raised(int & fixup) {
-                fixup = total_frames + 42;                                              // use local scope => lexical link
+                fixup = total_frames + 42;
         }
         void not_raised(int & fixup) {
-                fixup = total_frames + 42;                                              // use local scope => lexical link
+                fixup = total_frames + 42;
         }
 

doc/theses/andrew_beach_MMath/code/fixup-other-r.cfa

@@ -3 +3 @@
 #include <exception.hfa>
 #include <fstream.hfa>
-#include <stdlib.hfa>                                                                   // strto
+#include <stdlib.hfa>
 
 exception fixup_exception {
@@ -13 +13 @@
 };
 
-unsigned int frames;                                                                    // use global because of gcc thunk problem
+// Using a global value to allow hoisting (and avoid thunks).
+unsigned int frames;
 
 void nounwind_other(unsigned int dummy) {
@@ -20 +21 @@
                 try {
                         nounwind_other(42);
+                        // Always false, but prevents recursion elimination.
+                        if (-1 == frames) printf("~");
                 } catchResume (not_raised_exception * ex) {
-                        ex->fixup = frames + 42;                                        // use local scope => lexical link
+                        ex->fixup = frames + 42;
                 }
         } else {
                 int fixup = dummy;
-                throwResume (fixup_exception){&fixup_vt, fixup}; // change bad fixup
+                throwResume (fixup_exception){&fixup_vt, fixup};
         }
 }

doc/theses/andrew_beach_MMath/code/resume-empty.cfa

@@ -11 +11 @@
         if (frames) {
                 nounwind_empty(frames - 1);
+                if ( frames == -1 ) printf( "42" );                             // prevent recursion optimizations
         } else {
                 throwResume (empty_exception){&empty_vt};

doc/theses/andrew_beach_MMath/code/test.sh

@@ -12 +12 @@
 # test.sh -v LANGUAGE TEST FILE
 #   View the result from TEST in LANGUAGE stored in FILE.
+
+readonly DIR=$(dirname "$(readlink -f "$0")")
+cd $DIR
 
 readonly MIL=000000

doc/theses/andrew_beach_MMath/code/throw-empty.cpp

@@ -1 +1 @@
 // Throw Across Empty Function
 #include <chrono>
+#include <cstdio>
 #include <cstdlib>
 #include <exception>
@@ -14 +15 @@
         if (frames) {
                 unwind_empty(frames - 1);
+                if (-1 == frames) printf("~");
         } else {
                 throw (EmptyException){};