Changeset c196671 in mainline

Timestamp:

2012-05-18T11:31:26Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a54bd98, df3f85f

Parents:

3e67ab1 (diff), 68f57e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge MSIM simulator port (#401)

Merged from lp:~vojtech-horky/helenos/msim.

Not all features work, but it is possible to boot HelenOS running in
MSIM that runs in HelenOS in Qemu
(i.e. host → Qemu → HelenOS → MSIM → HelenOS).

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/killall/killall.c (modified) (1 diff)
• uspace/app/msim/Makefile (added)
• uspace/app/msim/Makefile.msim.src (added)
• uspace/app/msim/arch_helenos/helenos.h (added)
• uspace/app/msim/arch_helenos/input.c (added)
• uspace/app/msim/arch_helenos/misc.c (added)
• uspace/app/msim/config.h.msim (added)
• uspace/app/nettest1/nettest1.c (modified) (1 diff)
• uspace/app/nettest2/nettest2.c (modified) (1 diff)
• uspace/app/sbi/src/mytypes.h (modified) (1 diff)
• uspace/app/sysinfo/sysinfo.c (modified) (1 diff)
• uspace/app/websrv/websrv.c (modified) (1 diff)
• uspace/drv/bus/usb/ohci/utils/malloc32.h (modified) (1 diff)
• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (1 diff)
• uspace/lib/c/generic/stacktrace.c (modified) (1 diff)
• uspace/lib/c/generic/stats.c (modified) (1 diff)
• uspace/lib/c/generic/sysinfo.c (modified) (1 diff)
• uspace/lib/c/generic/time.c (modified) (1 diff)
• uspace/lib/c/include/errno.h (modified) (1 diff)
• uspace/lib/c/include/stdarg.h (modified) (1 diff)
• uspace/lib/c/include/stdio.h (modified) (1 diff)
• uspace/lib/clui/tinput.h (modified) (1 diff)
• uspace/lib/drv/generic/logbuf.c (modified) (1 diff)
• uspace/lib/drv/include/ddf/interrupt.h (modified) (1 diff)
• uspace/lib/posix/Makefile (modified) (1 diff)
• uspace/lib/posix/errno.h (modified) (1 diff)
• uspace/lib/posix/getopt.c (added)
• uspace/lib/posix/getopt.h (added)
• uspace/lib/posix/pwd.c (modified) (1 diff)
• uspace/lib/posix/stdbool.h (modified) (1 diff)
• uspace/lib/posix/stdio.h (modified) (1 diff)
• uspace/lib/posix/time.c (modified) (1 diff)
• uspace/lib/posix/unistd.c (modified) (1 diff)
• uspace/lib/posix/unistd.h (modified) (2 diffs)
• uspace/srv/fs/fat/fat_dentry.c (modified) (1 diff)

HelenOS.config

@@ -573 +573 @@
 ! CONFIG_BINUTILS (n/y)
 
+% Build MSIM binary
+! CONFIG_MSIM (n/y)
+
 % Line debugging information
 ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)

boot/Makefile.common

@@ -201 +201 @@
 endif
 
+ifeq ($(CONFIG_MSIM),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/msim/msim
+endif
+
 COMPONENTS = \
         $(KERNEL_PATH)/kernel.bin \

uspace/Makefile

@@ -138 +138 @@
 endif
 
+ifeq ($(CONFIG_MSIM),y)
+DIRS += \
+        app/msim
+endif
+
 ## Platform-specific hardware support
 #

uspace/app/killall/killall.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <task.h>
 #include <stats.h>

uspace/app/nettest1/nettest1.c

@@ -40 +40 @@
 #include <malloc.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <str.h>
 #include <task.h>

uspace/app/nettest2/nettest2.c

@@ -40 +40 @@
 #include <malloc.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <str.h>
 #include <task.h>

uspace/app/sbi/src/mytypes.h

@@ -51 +51 @@
 /** Error return codes. */
 #include <errno.h>
+/** We need NULL defined. */
+#include <unistd.h>
 #define EOK 0
 

uspace/app/sysinfo/sysinfo.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <sysinfo.h>
 #include <malloc.h>

uspace/app/websrv/websrv.c

@@ -36 +36 @@
 #include <bool.h>
 #include <errno.h>
+#include <assert.h>
 #include <stdio.h>
 #include <sys/types.h>

uspace/drv/bus/usb/ohci/utils/malloc32.h

@@ -37 +37 @@
 #include <assert.h>
 #include <malloc.h>
+#include <unistd.h>
 #include <errno.h>
 #include <mem.h>

uspace/drv/bus/usb/uhci/utils/malloc32.h

@@ -36 +36 @@
 
 #include <assert.h>
+#include <unistd.h>
 #include <errno.h>
 #include <malloc.h>

uspace/lib/c/generic/stacktrace.c

@@ -38 +38 @@
 #include <sys/types.h>
 #include <errno.h>
+#include <unistd.h>
 
 static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);

uspace/lib/c/generic/stats.c

@@ -40 +40 @@
 #include <inttypes.h>
 #include <malloc.h>
+#include <unistd.h>
 
 #define SYSINFO_STATS_MAX_PATH  64

uspace/lib/c/generic/sysinfo.c

@@ -39 +39 @@
 #include <malloc.h>
 #include <bool.h>
+#include <unistd.h>
 
 /** Get sysinfo keys size

uspace/lib/c/generic/time.c

@@ -43 +43 @@
 #include <ddi.h>
 #include <libc.h>
+#include <unistd.h>
 
 /** Pointer to kernel shared variables with time */

uspace/lib/c/include/errno.h

@@ -37 +37 @@
 
 #include <abi/errno.h>
-#include <fibril.h>
 
 #define errno  (*(__errno()))

uspace/lib/c/include/stdarg.h

@@ -43 +43 @@
 #define va_arg(ap, type)    __builtin_va_arg(ap, type)
 #define va_end(ap)          __builtin_va_end(ap)
+#define va_copy(dst, src)   __builtin_va_copy(dst, src)
 
 #endif

uspace/lib/c/include/stdio.h

@@ -39 +39 @@
 #include <stdarg.h>
 #include <str.h>
-#include <adt/list.h>
 
 #ifndef NVERIFY_PRINTF

uspace/lib/clui/tinput.h

@@ -37 +37 @@
 #define LIBCLUI_TINPUT_H_
 
-#include <adt/list.h>
-#include <async.h>
 #include <inttypes.h>
 #include <io/console.h>

uspace/lib/drv/generic/logbuf.c

@@ -35 +35 @@
 #include <ddf/log.h>
 #include <assert.h>
+#include <unistd.h>
 
 /** Formatting string for printing number of not-printed items. */

uspace/lib/drv/include/ddf/interrupt.h

@@ -36 +36 @@
 #define DDF_INTERRUPT_H_
 
+#include <libarch/common.h>
+#include <libarch/types.h>
 #include <abi/ddi/irq.h>
 #include <adt/list.h>

uspace/lib/posix/Makefile

@@ -43 +43 @@
         fcntl.c \
         fnmatch.c \
+        getopt.c \
         locale.c \
         math.c \

uspace/lib/posix/errno.h

@@ -66 +66 @@
 #undef errno
 #define errno (*__posix_errno())
+
+#include "unistd.h"
 
 extern int *__posix_errno(void);

uspace/lib/posix/pwd.c

@@ -38 +38 @@
 #include "string.h"
 #include "errno.h"
+#include "assert.h"
 
 static bool entry_read = false;

uspace/lib/posix/stdbool.h

@@ -37 +37 @@
 
 #ifdef LIBC_BOOL_H_
-        #error "You can't include bool.h and stdbool.h at the same time."
+#if (!defined(POSIX_STDIO_H_)) \
+                && (!defined(POSIX_STDLIB_H_)) \
+                && (!defined(POSIX_STRING_H_))
+#error "You can't include bool.h and stdbool.h at the same time."
 #endif
+#endif
+
 #define LIBC_BOOL_H_
 

uspace/lib/posix/stdio.h

@@ -37 +37 @@
 #define POSIX_STDIO_H_
 
+#include "stddef.h"
+#include "unistd.h"
 #include "libc/stdio.h"
 #include "sys/types.h"

uspace/lib/posix/time.c

@@ -45 +45 @@
 #include "errno.h"
 #include "signal.h"
+#include "assert.h"
 
 #include "libc/malloc.h"

uspace/lib/posix/unistd.c

@@ -49 +49 @@
 /* Array of environment variable strings (NAME=VALUE). */
 char **posix_environ = NULL;
+char *posix_optarg;
 
 /**

uspace/lib/posix/unistd.h

@@ -43 +43 @@
 #define _exit exit
 
-/* Option Arguments */
-extern char *optarg;
+extern char *posix_optarg;
 extern int optind, opterr, optopt;
-extern int getopt(int, char * const [], const char *);
+extern int posix_getopt(int, char * const [], const char *);
 
 /* Environment */
@@ -144 +143 @@
 
 #ifndef LIBPOSIX_INTERNAL
+        #define getopt posix_getopt
+        #define optarg posix_optarg
+
         #define environ posix_environ
 

uspace/srv/fs/fat/fat_dentry.c

@@ -43 +43 @@
 #include <byteorder.h>
 #include <assert.h>
+#include <unistd.h>
 
 /** Compare path component with the name read from the dentry.