[pk] send stdout/stderr to both fesvr and debug console

4 files changed, 13 insertions, 7 deletions

diff --git a/pk/file.c b/pk/file.c
index febd9f7..e35256e 100644
--- a/pk/file.c
+++ b/pk/file.c
@@ -3,6 +3,7 @@
 #include "file.h"
 #include "pk.h"
 #include "frontend.h"
+#include "pcr.h"
 
 #define MAX_FDS 128
 file_t* fds[MAX_FDS];
@@ -112,13 +113,19 @@ int fd_close(int fd)
   return 0;
 }
 
-sysret_t file_read(file_t* f, void* buf, size_t size)
+sysret_t file_read(file_t* f, char* buf, size_t size)
 {
   return frontend_syscall(SYS_read,f->kfd,(long)buf,size,0);
 }
 
-sysret_t file_write(file_t* f, const void* buf, size_t size)
+sysret_t file_write(file_t* f, const char* buf, size_t size)
 {
+  if(f->kfd == 1 || f->kfd == 2)
+  {
+    for(size_t i = 0; i < size; i++)
+      mtpcr(buf[i],PCR_CONSOLE);
+  }
+
   return frontend_syscall(SYS_write,f->kfd,(long)buf,size,0);
 }
 
diff --git a/pk/file.h b/pk/file.h
index 95bf02c..b98092c 100644
--- a/pk/file.h
+++ b/pk/file.h
@@ -17,14 +17,12 @@ file_t* file_get(int fd);
 sysret_t file_open(const char* fn, size_t len, int flags, int mode);
 int file_dup(file_t*);
 
-sysret_t file_write(file_t* f, const void* buf, size_t n);
-sysret_t file_read(file_t* f, void* buf, size_t n);
+sysret_t file_write(file_t* f, const char* buf, size_t n);
+sysret_t file_read(file_t* f, char* buf, size_t n);
 sysret_t file_stat(file_t* f, struct stat* s);
 sysret_t file_lseek(file_t* f, size_t ptr, int dir);
 int fd_close(int fd);
 
 void file_init();
 
-#define cons_write(buf,sz) file_write(stdout,buf,sz)
-
 #endif
diff --git a/pk/pcr.h b/pk/pcr.h
index 144b12c..fb0d1bf 100644
--- a/pk/pcr.h
+++ b/pk/pcr.h
@@ -20,6 +20,7 @@
 #define PCR_CAUSE    6
 #define PCR_TOHOST   16
 #define PCR_FROMHOST 17
+#define PCR_CONSOLE  18
 #define PCR_K0       24
 #define PCR_K1       25
 
diff --git a/pk/pk.c b/pk/pk.c
index e9e3e71..bb0b555 100644
--- a/pk/pk.c
+++ b/pk/pk.c
@@ -87,7 +87,7 @@ void printk(const char* s, ...)
 
   char out[1024]; // XXX
   vsprintk(out,s,vl);
-  cons_write(out,strlen(out));
+  file_write(stderr,out,strlen(out));
 
   va_end(vl);
 }