m-labs · Aug 28, 2015 · Aug 28, 2015 · Aug 28, 2015
Showing with 12 additions and 8 deletions.

+7 −4 artiq/compiler/transforms/llvm_ir_generator.py

+1 −1 artiq/frontend/artiq_coretool.py

+3 −2 soc/runtime/log.c

+1 −1 soc/runtime/log.h
diff --git a/artiq/compiler/transforms/llvm_ir_generator.py b/artiq/compiler/transforms/llvm_ir_generator.py
@@ -793,10 +793,13 @@ def _prepare_closure_call(self, insn):
 
     def _prepare_ffi_call(self, insn):
         llargs    = [self.map(arg) for arg in insn.arguments()]
-        llfunty   = ll.FunctionType(self.llty_of_type(insn.type, for_return=True),
-                                    [llarg.type for llarg in llargs])
-        llfun     = ll.Function(self.llmodule, llfunty,
-                                insn.target_function().type.name)
+        llfunname = insn.target_function().type.name
+        llfun     = self.llmodule.get_global(llfunname)
+        if llfun is None:
+            llfunty = ll.FunctionType(self.llty_of_type(insn.type, for_return=True),
+                                      [llarg.type for llarg in llargs])
+            llfun   = ll.Function(self.llmodule, llfunty,
+                                  insn.target_function().type.name)
         return llfun, list(llargs)
 
     # See session.c:{send,receive}_rpc_value and comm_generic.py:_{send,receive}_rpc_value.

diff --git a/artiq/frontend/artiq_coretool.py b/artiq/frontend/artiq_coretool.py
@@ -64,7 +64,7 @@ def main():
         comm.check_ident()
 
         if args.action == "log":
-          print(comm.get_log())
+          print(comm.get_log(), end='')
         elif args.action == "cfg-read":
             value = comm.flash_storage_read(args.key)
             if not value:

diff --git a/soc/runtime/log.c b/soc/runtime/log.c
@@ -1,5 +1,6 @@
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 #include <console.h>
 
 #include <generated/csr.h>
@@ -55,8 +56,8 @@ void log_get(char *outbuf)
 {
     int i, j;
 
-    j = buffer_index + 1;
-    for(i=0;i<LOG_BUFFER_SIZE;i++) {
+    j = buffer_index;
+    for(i = 0; i < LOG_BUFFER_SIZE; i++) {
         outbuf[i] = buffer[j];
         j = (j + 1) % LOG_BUFFER_SIZE;
     }

diff --git a/soc/runtime/log.h b/soc/runtime/log.h
@@ -12,6 +12,6 @@ void log_va(const char *fmt, va_list args);
 void log(const char *fmt, ...);
 
 void log_get(char *outbuf);
-void log_clear();
+void log_clear(void);
 
 #endif /* __LOG_H */