Changes in doc/theses/andrew_beach_MMath/code/cond-catch.cfa [f79ee0d:54651005]

File:

• doc/theses/andrew_beach_MMath/code/cond-catch.cfa (modified) (3 diffs)

doc/theses/andrew_beach_MMath/code/cond-catch.cfa

@@ -3 +3 @@
 #include <exception.hfa>
 #include <fstream.hfa>
-#include <stdlib.hfa>                                                                   // strto
+#include <stdlib.h>
 
-exception empty_exception;
-vtable(empty_exception) empty_vt;
+EHM_EXCEPTION(empty_exception)();
+
+EHM_VIRTUAL_TABLE(empty_exception, empty_vt);
 
 bool should_catch = false;
+
+void throw_exception() {
+        throw (empty_exception){&empty_vt};
+}
+
+void cond_catch() {
+        try {
+                throw_exception();
+        } catch (empty_exception * exc ; should_catch) {
+                asm volatile ("# catch block (conditional)");
+        }
+}
 
 int main(int argc, char * argv[]) {
         unsigned int times = 1;
         if (1 < argc) {
-                times = strto(argv[1], 0p, 10);
+                times = strtol(argv[1], 0p, 10);
         }
         if (2 < argc) {
-                should_catch = (unsigned int)strto(argv[2], 0p, 2);
+                should_catch = strtol(argv[2], 0p, 10);
         }
 
@@ -22 +35 @@
         for (unsigned int count = 0 ; count < times ; ++count) {
                 try {
-                        throw (empty_exception){&empty_vt};
-                } catch (empty_exception * exc ; should_catch) {
-                        asm volatile ("# catch block (conditional)");
+                        cond_catch();
                 } catch (empty_exception * exc) {
                         asm volatile ("# catch block (unconditional)");
@@ -30 +41 @@
         }
         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;
 }