Changeset cc6f688 in mainline

Timestamp:

2005-11-22T17:07:38Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3a6d6656

Parents:

25b0e6a

Message:

uspace work

Files:

• init/init.c (modified) (1 diff)
• libc/Makefile (modified) (2 diffs)
• libc/Makefile.toolchain (modified) (1 diff)
• libc/_link.ld.in (modified) (1 diff)
• libc/arch/ia32/include/types.h (moved) (moved from libc/arch/ia32/syscall.c ) (1 diff)
• libc/arch/ia32/src/entry.s (moved) (moved from libc/arch/ia32/entry.s )
• libc/arch/ia32/src/syscall.c (added)
• libc/arch/mips32/entry.s (deleted)
• libc/arch/mips32/include (added)
• libc/arch/mips32/src (added)
• libc/arch/mips32/syscall.c (deleted)
• libc/arch/mips32el/include/types.h (added)
• libc/arch/mips32el/src/entry.s (moved) (moved from libc/arch/mips32el/entry.s )
• libc/arch/mips32el/src/syscall.c (moved) (moved from libc/arch/mips32el/syscall.c ) (2 diffs)
• libc/generic/io.c (added)
• libc/include/libc.h (modified) (1 diff)
• libc/include/stdio.h (moved) (moved from libc/include/unistd.h ) (1 diff)

init/init.c

@@ -28 +28 @@
 
 #include <unistd.h>
+#include <stdio.h>
 
 int main(int argc, char *argv[])
 {
+        puts("Hello world\n");
         return 0;
 }

libc/Makefile

@@ -31 +31 @@
 
 LIBC_PREFIX = .
-DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include
-LFLAGS = -M
-AFLAGS =
 
 ## Setup toolchain
@@ -45 +41 @@
 
 GENERIC_SOURCES = \
-        generic/libc.c
+        generic/libc.c \
+        generic/io.c
 
 ARCH_SOURCES = \
-        arch/$(ARCH)/entry.s \
-        arch/$(ARCH)/syscall.c
+        arch/$(ARCH)/src/entry.s \
+        arch/$(ARCH)/src/syscall.c
 
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))

libc/Makefile.toolchain

@@ -28 +28 @@
 
 DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include
+CFLAGS = -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -I$(LIBC_PREFIX)/arch/$(ARCH)/include
 LFLAGS = -M
 AFLAGS =

libc/_link.ld.in

@@ -1 +1 @@
 OUTPUT_FORMAT(binary)
-STARTUP(../libc/arch/ARCH/entry.o)
+STARTUP(../libc/arch/ARCH/src/entry.o)
 ENTRY(__entry)
 

libc/arch/ia32/include/types.h

@@ -27 +27 @@
  */
 
-#include <libc.h>
+#ifndef __LIBC__TYPES_H__
+#define __LIBC__TYPES_H__
 
-void __syscall(const unsigned int id, const unsigned int p1, const unsigned int p2, const unsigned int p3)
-{
+typedef unsigned int sysarg_t;
+typedef unsigned int size_t;
+typedef signed int ssize_t;
 
-}
+#endif

libc/arch/mips32el/src/syscall.c

@@ -29 +29 @@
 #include <libc.h>
 
-void __syscall(const unsigned int id, const unsigned int p1, const unsigned int p2, const unsigned int p3)
+unsigned int __syscall(const syscall_t id, const unsigned int p1, const unsigned int p2, const unsigned int p3)
 {
         register unsigned int __mips_reg_a0 asm("$4") = p1;
@@ -35 +35 @@
         register unsigned int __mips_reg_a2 asm("$6") = p3;
         register unsigned int __mips_reg_a3 asm("$7") = id;
+        register unsigned int __mips_reg_v0 asm("$2");
         
         asm volatile (
                 "syscall\n"
-                :
+                : "=r" (__mips_reg_v0)
                 : "r" (__mips_reg_a0),
                   "r" (__mips_reg_a1),
                   "r" (__mips_reg_a2),
                   "r" (__mips_reg_a3)
-                : "v0"
         );
+        
+        return __mips_reg_v0;
 }

libc/include/libc.h

@@ -30 +30 @@
 #define __LIBC__LIBC_H__
 
+#include <types.h>
+
+
+typedef enum {
+        SYS_CTL = 0,
+        SYS_IO  = 1
+} syscall_t;
+
 
 extern void __main(void);
 extern void __exit(void);
-extern void __syscall(const unsigned int id, const unsigned int p1, const unsigned int p2, const unsigned int p3);
+extern unsigned int __syscall(const syscall_t id, const sysarg_t p1, const sysarg_t p2, const sysarg_t p3);
 
 

libc/include/stdio.h

@@ -27 +27 @@
  */
 
-#ifndef __LIBC__UNISTD_H__
-#define __LIBC__UNISTD_H__
+#ifndef __LIBC__STDIO_H__
+#define __LIBC__STDIO_H__
 
-#define NULL 0
+#include <types.h>
 
-extern void puts(const char *str);
+#define EOF -1
+
+extern int puts(const char * str);
 
 #endif