m-labs · Oct 14, 2014 · Oct 15, 2014 · Oct 15, 2014
Showing with 39 additions and 3 deletions.

+7 −1 artiq/devices/runtime.py

+28 −0 frontend/runelf

+4 −2 soc/runtime/exceptions.c
diff --git a/artiq/devices/runtime.py b/artiq/devices/runtime.py
@@ -5,6 +5,7 @@
 from llvm import target as lt
 
 from artiq.py2llvm import base_types
+from artiq.language import units
 
 
 lt.initialize_all()
@@ -138,12 +139,17 @@ def _debug_dump_obj(obj):
 
 class Environment(LinkInterface):
     def __init__(self, ref_period):
+        self.cpu_type = "or1k"
         self.ref_period = ref_period
         # allow 1ms for all initial DDS programming
         self.initial_time = int(Fraction(1, 1000)/self.ref_period)
 
     def emit_object(self):
-        tm = lt.TargetMachine.new(triple="or1k", cpu="generic")
+        tm = lt.TargetMachine.new(triple=self.cpu_type, cpu="generic")
         obj = tm.emit_object(self.llvm_module)
         _debug_dump_obj(obj)
         return obj
+
+    def __repr__(self):
+        return "<Environment {} {}>".format(self.cpu_type,
+                                            str(units.Hz/self.ref_period))
diff --git a/frontend/runelf b/frontend/runelf
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+import argparse
+from artiq.devices import corecom_serial
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Core device ELF loading tool")
+    parser.add_argument("-e", default=False, action="store_true",
+                        help="show environment")
+    parser.add_argument("-f", default="run",
+                        help="function to run")
+    parser.add_argument("file",
+                        help="ELF binary to load")
+    args = parser.parse_args()
+
+    with open(args.file, "rb") as f:
+        binary = f.read()
+    with corecom_serial.CoreCom() as com:
+        runtime_env = com.get_runtime_env()
+        if args.e:
+            print(runtime_env)
+        com.load(binary)
+        com.run(args.f)
+        com.serve(dict(), dict())
+
+if __name__ == "__main__":
+    main()
diff --git a/soc/runtime/exceptions.c b/soc/runtime/exceptions.c
@@ -33,6 +33,8 @@ void exception_raise(int id)
     if(ec_top > 0) {
         stored_id = id;
         exception_longjmp(exception_contexts[--ec_top].jb);
-    } else
-        corecom_log("WARNING: uncaught exception, ID=%d\n", id);
+    } else {
+        corecom_log("ERROR: uncaught exception, ID=%d\n", id);
+        while(1);
+    }
 }