Changes in doc/theses/andrew_beach_MMath/code/resume-empty.cfa [f79ee0d:54651005]

File:

• doc/theses/andrew_beach_MMath/code/resume-empty.cfa (modified) (3 diffs)

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

@@ -3 +3 @@
 #include <exception.hfa>
 #include <fstream.hfa>
-#include <stdlib.hfa>                                                                   // strto
+#include <stdlib.hfa>
 
-exception empty_exception;
-vtable(empty_exception) empty_vt;
+EHM_EXCEPTION(empty_exception)();
 
-void nounwind_empty(unsigned int frames) {
+EHM_VIRTUAL_TABLE(empty_exception, empty_vt);
+
+void unwind_empty(unsigned int frames) {
         if (frames) {
-                nounwind_empty(frames - 1);
+                unwind_empty(frames - 1);
         } else {
                 throwResume (empty_exception){&empty_vt};
@@ -20 +21 @@
         unsigned int total_frames = 1;
         if (1 < argc) {
-                times = strto(argv[1], 0p, 10);
+                times = strtol(argv[1], 0p, 10);
         }
         if (2 < argc) {
-                total_frames = strto(argv[2], 0p, 10);
+                total_frames = strtol(argv[2], 0p, 10);
         }
 
         Time start_time = timeHiRes();
-        for (unsigned int count = 0 ; count < times ; ++count) {
+        for (int count = 0 ; count < times ; ++count) {
                 try {
-                        nounwind_empty(total_frames);
+                        unwind_empty(total_frames);
                 } catchResume (empty_exception *) {
                         asm volatile ("# fixup block");
@@ -35 +36 @@
         }
         Time end_time = timeHiRes();
-        sout | "Run-Time (s): " | wd(0,1, (end_time - start_time)`ns / 1_000_000_000.);
+        sout | "Run-Time (ns): " | (end_time - start_time)`ns;
 }