runtime: add lognonl{,_va} functions.

The kernels have print(), which prints aggregates (such as arrays) piece-by-piece, and newlines would interfere.
m-labs · Aug 2, 2015 · aae2923 · aae2923
1 parent cd294e2
commit aae2923
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 6 deletions.
diff --git a/artiq/compiler/targets.py b/artiq/compiler/targets.py
@@ -83,4 +83,4 @@ def __init__(self):
 class OR1KTarget(Target):
     triple = "or1k-linux"
     attributes = ["mul", "div", "ffl1", "cmov", "addc"]
-    print_function = "log"
+    print_function = "lognonl"
diff --git a/soc/runtime/kloader.c b/soc/runtime/kloader.c
@@ -175,7 +175,11 @@ void kloader_service_essential_kmsg(void)
             case MESSAGE_TYPE_LOG: {
                 struct msg_log *msg = (struct msg_log *)umsg;
 
-                log_va(msg->fmt, msg->args);
+                if(msg->no_newline) {
+                    lognonl_va(msg->fmt, msg->args);
+                } else {
+                    log_va(msg->fmt, msg->args);
+                }
                 mailbox_acknowledge();
                 break;
             }

diff --git a/soc/runtime/ksupport.c b/soc/runtime/ksupport.c
@@ -147,12 +147,25 @@ int rpc(int rpc_num, ...)
     return retval;
 }
 
+void lognonl(const char *fmt, ...)
+{
+    struct msg_log request;
+
+    request.type = MESSAGE_TYPE_LOG;
+    request.fmt = fmt;
+    request.no_newline = 1;
+    va_start(request.args, fmt);
+    mailbox_send_and_wait(&request);
+    va_end(request.args);
+}
+
 void log(const char *fmt, ...)
 {
     struct msg_log request;
 
     request.type = MESSAGE_TYPE_LOG;
     request.fmt = fmt;
+    request.no_newline = 0;
     va_start(request.args, fmt);
     mailbox_send_and_wait(&request);
     va_end(request.args);

diff --git a/soc/runtime/log.c b/soc/runtime/log.c
@@ -1,5 +1,6 @@
 #include <stdarg.h>
 #include <stdio.h>
+#include <console.h>
 
 #include <generated/csr.h>
 
@@ -8,7 +9,7 @@
 static int buffer_index;
 static char buffer[LOG_BUFFER_SIZE];
 
-void log_va(const char *fmt, va_list args)
+void lognonl_va(const char *fmt, va_list args)
 {
     char outbuf[256];
     int i, len;
@@ -18,16 +19,29 @@ void log_va(const char *fmt, va_list args)
         buffer[buffer_index] = outbuf[i];
         buffer_index = (buffer_index + 1) % LOG_BUFFER_SIZE;
     }
-    buffer[buffer_index] = '\n';
-    buffer_index = (buffer_index + 1) % LOG_BUFFER_SIZE;
 
 #ifdef CSR_ETHMAC_BASE
     /* Since main comms are over ethernet, the serial port
      * is free for us to use. */
-    puts(outbuf);
+    putsnonl(outbuf);
 #endif
 }
 
+void lognonl(const char *fmt, ...)
+{
+    va_list args;
+
+    va_start(args, fmt);
+    lognonl_va(fmt, args);
+    va_end(args);
+}
+
+void log_va(const char *fmt, va_list args)
+{
+    lognonl_va(fmt, args);
+    lognonl("\n");
+}
+
 void log(const char *fmt, ...)
 {
     va_list args;

diff --git a/soc/runtime/log.h b/soc/runtime/log.h
@@ -5,6 +5,9 @@
 
 #define LOG_BUFFER_SIZE 4096
 
+void lognonl_va(const char *fmt, va_list args);
+void lognonl(const char *fmt, ...);
+
 void log_va(const char *fmt, va_list args);
 void log(const char *fmt, ...);
 

diff --git a/soc/runtime/messages.h b/soc/runtime/messages.h
@@ -80,6 +80,7 @@ struct msg_rpc_reply {
 struct msg_log {
     int type;
     const char *fmt;
+    int no_newline;
     va_list args;
 };