Changeset 204674e in mainline

Timestamp:

2006-01-15T16:49:10Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4be51c8

Parents:

81703f9

Message:

"Hello world" from user space

Files:

• arch/ia32/src/interrupt.c (modified) (2 diffs)
• generic/include/syscall/syscall.h (modified) (2 diffs)
• generic/src/syscall/syscall.c (modified) (1 diff)

arch/ia32/src/interrupt.c

@@ -28 +28 @@
 
 #include <arch/interrupt.h>
+#include <syscall/syscall.h>
 #include <print.h>
 #include <debug.h>
@@ -111 +112 @@
 }
 
-void syscall(int n, void *stack)
+void syscall(int n, void *st)
 {
-        printf("cpu%d: syscall\n", CPU->id);
-        thread_usleep(1000);
+        __native *stack = (__native *) st;
+        
+        if (stack[-2] < SYSCALL_END)
+                syscall_table[stack[-2]](stack[-5], stack[-3], stack[-4]);
+        else
+                panic("Undefined syscall %d", stack[-2]);
 }
 

generic/include/syscall/syscall.h

@@ -30 +30 @@
 #define __SYSCALL_H__
 
+#include <typedefs.h>
+
 typedef enum {
         SYS_CTL = 0,
@@ -39 +41 @@
 
 extern int sys_ctl(void);
-extern int sys_io(void);
+extern int sys_io(int fd, const void *buf, size_t count);
 
 extern syshandler_t syscall_table[SYSCALL_END];

generic/src/syscall/syscall.c

@@ -27 +27 @@
  */
 
-#include <arch/types.h>
 #include <syscall/syscall.h>
+#include <print.h>
+#include <putchar.h>
 
 int sys_ctl(void) {
+        printf("SYS_CTL\n");
         return 0;
 }
 
-int sys_io(void) {
+int sys_io(int fd, const void * buf, size_t count) {
+        
+        // TODO: buf sanity checks and a lot of other stuff ...
+
+        size_t i;
+        
+        for (i = 0; i < count; i++)
+                putchar(((char *) buf)[i]);
+        
         return 0;
 }