Changeset 5a40e4e for doc/theses/andrew_beach_MMath/code/resume-other.cfa

Timestamp:

Sep 9, 2021, 3:56:32 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d0b9247

Parents:

dd1cc02 (diff), d8d512e (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:

• doc/theses/andrew_beach_MMath/code/resume-other.cfa (modified) (4 diffs)

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

@@ -3 +3 @@
 #include <exception.hfa>
 #include <fstream.hfa>
-#include <stdlib.hfa>
+#include <stdlib.hfa>                                                                   // strto
 
-EHM_EXCEPTION(empty_exception)();
+exception empty_exception;
+vtable(empty_exception) empty_vt;
+exception not_raised_exception;
 
-EHM_VIRTUAL_TABLE(empty_exception, empty_vt);
-
-EHM_EXCEPTION(not_raised_exception)();
-
-void unwind_other(unsigned int frames) {
+void nounwind_other(unsigned int frames) {
         if (frames) {
                 try {
-                        unwind_other(frames - 1);
+                        nounwind_other(frames - 1);
                 } catchResume (not_raised_exception *) {
                         asm volatile ("# fixup block (stack)");
@@ -27 +25 @@
         unsigned int total_frames = 1;
         if (1 < argc) {
-                times = strtol(argv[1], 0p, 10);
+                times = strto(argv[1], 0p, 10);
         }
         if (2 < argc) {
-                total_frames = strtol(argv[2], 0p, 10);
+                total_frames = strto(argv[2], 0p, 10);
         }
 
@@ -36 +34 @@
         for (int count = 0 ; count < times ; ++count) {
                 try {
-                        unwind_other(total_frames);
+                        nounwind_other(total_frames);
                 } catchResume (empty_exception *) {
                         asm volatile ("# fixup block (base)");
@@ -42 +40 @@
         }
         Time end_time = timeHiRes();
-        sout | "Run-Time (ns): " | (end_time - start_time)`ns;
+        sout | "Run-Time (s): " | wd(0,1, (end_time - start_time)`ns / 1_000_000_000.);
 }