Changeset 1bc9dcb for doc/working

Timestamp:

Jun 16, 2017, 3:34:55 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

9d85038

Parents:

a724ac1 (diff), d33bc7c (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/working/exception

Files:

• impl/except.c (deleted)
• impl/except.h (deleted)
• impl/exception.c (added)
• impl/exception.h (added)
• impl/main.c (deleted)
• impl/resume-main.c (deleted)
• impl/test-main.c (added)
• translate.c (modified) (3 diffs)

doc/working/exception/translate.c

@@ -2 +2 @@
  *
  * Note that these are not final. Names, syntax and the exact translation
- * will be updated. The first section is the shared definitions we will have
- * to have access to where the translations are preformed.
+ * will be updated. The first section is the shared definitions, not generated
+ * by the local translations but used by the translated code.
+ *
+ * Most of these exist only after translation (in C code). The first (the
+ * exception type) has to exist in Cforall code so that it can be used
+ * directly in Cforall. The two __throw_* functions might have wrappers in
+ * Cforall, but the underlying functions should probably be C. struct
+ * stack_exception_data has to exist inside of the coroutine data structures
+ * and so should be compiled as they are.
  */
 
-// Currently it is a typedef for int, but later it will be the root of the
-// hierarchy and so have to be public.
+// Currently it is a typedef for int, but later it will be a new type.
 typedef int exception;
 
-// These might be given simpler names and made public.
 void __throw_terminate(exception except) __attribute__((noreturn));
 void __throw_resume(exception except);
@@ -49 +54 @@
 
 __throw_resume(exception_instance);
+
+
+
+// Rethrows (inside matching handlers):
+"Cforall"
+
+throw;
+
+resume;
+
+"C"
+
+__rethrow_terminate();
+
+return false;
 
 
@@ -232 +252 @@
                 }
                 void finally1() {
-                        // (Finally, because of timing, also work for resume.)
+                        // Finally, because of timing, also works for resume.
+                        // However this might not actually be better in any way.
                         __try_resume_cleanup();