Stubs are working/Proxies are close

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3451 42af7a65-404d-4744-a932-0658087f49c3

Documentation/NuttxPortingGuide.html

@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: March 23, 2011</p>
+      <p>Last Updated: April 1, 2011</p>
     </td>
   </tr>
 </table>
@@ -57,11 +57,12 @@
     <a href="#DirStructMm">2.11 nuttx/mm/</a><br>
     <a href="#DirStructNet">2.12 nuttx/net</a><br>
     <a href="#DirStructSched">2.13 nuttx/sched/</a><br>
-    <a href="#DirStructTools">2.14 nuttx/tools/</a><br>
-    <a href="#topmakefile">2.15 nuttx/Makefile</a>
-    <a href="#DirStructNetUtils">2.16 apps/netutils</a><br>
-    <a href="#DirStructNshLib">2.17 apps/nshlib</a><br>
-    <a href="#DirStructExamples">2.18 apps/examples/</a><br>
+    <a href="#DirStructSyscall">2.14 nuttx/syscall/</a><br>
+    <a href="#DirStructTools">2.15 nuttx/tools/</a><br>
+    <a href="#topmakefile">2.16 nuttx/Makefile</a>
+    <a href="#DirStructNetUtils">2.17 apps/netutils</a><br>
+    <a href="#DirStructNshLib">2.18 apps/nshlib</a><br>
+    <a href="#DirStructExamples">2.19 apps/examples/</a><br>
   </ul>
   <a href="#configandbuild">3.0 Configuring and Building</a>
   <ul>
@@ -234,6 +235,9 @@
 |   |-- <a href="#DirStructSched">sched</a>/
 |   |   |-- Makefile
 |   |   `-- <i>(sched source files)</i>
+|   |-- <a href="#DirStructSysCall">syscall</a>/
+|   |   |-- Makefile
+|   |   `-- <i>(syscall source files)</i>
 |   `-- <a href="#DirStructTools">tools</a>/
 |       `-- <i>(miscellaneous scripts and programs)</i>
 `- apps
@@ -320,7 +324,8 @@
 |   |-- arch.h
 |   |-- irq.h
 |   |-- types.h
-|   `-- limits.h
+|   |-- limits.h
+|   `-- syscall.h
 `-- src/
     |--<i>&lt;chip-name&gt;</i>/
     |  `-- <i>(chip-specific source files)</i>
@@ -377,7 +382,7 @@
   <li>
     <code>include/irq.h</code>:
     This file needs to define some architecture specific functions (usually
-    inline if the compiler supports inlining) and structure.  These include:
+    inline if the compiler supports inlining) and some structures.  These include:
     <ul>
       <li>
         <code>struct xcptcontext</code>:
@@ -397,6 +402,57 @@
        by the board.
     </p>
   </li>
+  <li>
+    <code>include/syscall.h</code>:
+    This file needs to define some architecture specific functions (usually
+    inline if the compiler supports inlining) to support software interrupts
+    or <i>syscall</i>s that can be used all from user-mode applications into
+    kernel-mode NuttX functions.
+    This directory must always be provided to prevent compilation errors.
+    However, it need only contain valid function declarations if the architecture
+    supports the <code>CONFIG_NUTTX_KERNEL</code> configuration.
+    <ul>
+      <li>
+        <code>uintptr_t sys_call0(unsigned int nbr)</code>:
+        <code>nbr</code> is one of the system call numbers that can be found in <code>include/sys/syscall.h</code>.
+        This function will perform a system call with no (additional) parameters.
+      </li>
+      <li>
+        <code>uintptr_t sys_call1(unsigned int nbr, uintptr_t parm1)</code>:
+        <code>nbr</code> is one of the system call numbers that can be found in <code>include/sys/syscall.h</code>.
+        This function will perform a system call with one (additional) parameter.
+      </li>
+      <li>
+        <code>uintptr_t sys_call2(unsigned int nbr, uintptr_t parm1, uintptr_t parm2)</code>:
+        <code>nbr</code> is one of the system call numbers that can be found in <code>include/sys/syscall.h</code>.
+        This function will perform a system call with two (additional) parameters.
+      </li>
+      <li>
+        <code>uintptr_t sys_call3(unsigned int nbr, uintptr_t parm1, uintptr_t parm2, uintptr_t parm3)</code>:
+        <code>nbr</code> is one of the system call numbers that can be found in <code>include/sys/syscall.h</code>.
+        This function will perform a system call with three (additional) parameters.
+      </li>
+      <li>
+        <code>uintptr_t sys_call4(unsigned int nbr, uintptr_t parm1, uintptr_t parm2, uintptr_t parm3, uintptr_t parm4)</code>:
+        <code>nbr</code> is one of the system call numbers that can be found in <code>include/sys/syscall.h</code>.
+        This function will perform a system call with four (additional) parameters.
+      </li>
+      <li>
+        <code>uintptr_t sys_call5(unsigned int nbr, uintptr_t parm1, uintptr_t parm2, uintptr_t parm3, uintptr_t parm4, uintptr_t parm5)</code>:
+        <code>nbr</code> is one of the system call numbers that can be found in <code>include/sys/syscall.h</code>.
+        This function will perform a system call with five (additional) parameters.
+      </li>
+      <li>
+        <code>uintptr_t sys_call6(unsigned int nbr, uintptr_t parm1, uintptr_t parm2, uintptr_t parm3, uintptr_t parm4, uintptr_t parm5, uintptr_t parm6)</code>:
+        <code>nbr</code> is one of the system call numbers that can be found in <code>include/sys/syscall.h</code>.
+        This function will perform a system call with six (additional) parameters.
+      </li>
+    </ul>
+    <p>
+      This file must also define <code>NR_IRQS</code>, the total number of IRQs supported
+       by the board.
+    </p>
+  </li>
   <li>
     <code>src/</code><i>&lt;chip-name&gt;</i><code>/</code>
     This sub-directory contains chip-specific source files.
@@ -909,7 +965,15 @@ include/
   The files forming core of the NuttX RTOS reside here.
 </p>
 
-<h2>2.14 <a name="DirStructTools">nuttx/tools</a></h2>
+<h2>2.14 <a name="DirStructSyscall">nuttx/syscall</a></h2>
+<p>
+  If NuttX is built as a separately compiled kernel (with CONFIG_NUTTX_KERNEL=y),
+  then the contents of this directory are built.
+  This directory holds a syscall interface that can be used for communication
+  between user-mode applications and the kernel-mode RTOS.
+</p>
+
+<h2>2.15 <a name="DirStructTools">nuttx/tools</a></h2>
 <p>
   This directory holds a collection of tools and scripts to simplify
   configuring, building and maintaining NuttX.
@@ -931,14 +995,14 @@ tools/
 `-- zipme
 </pre></ul>
 
-<h2>2.15 <a name="topmakefile">nuttx/Makefile</a></h2>
+<h2>2.16 <a name="topmakefile">nuttx/Makefile</a></h2>
 <p>
   The top-level <code>Makefile</code> in the <code>${TOPDIR}</code> directory contains all of the top-level control
   logic to build NuttX.
   Use of this <code>Makefile</code> to build NuttX is described <a href="#buildingnuttx">below</a>.
 </p>
 
-<h2>2.16 <a name="DirStructNetUtils">apps/netutils</a></h2>
+<h2>2.17 <a name="DirStructNetUtils">apps/netutils</a></h2>
 <p>
   This directory contains most of the network applications.
   Some of these are original with NuttX (like tftpc and dhcpd) and others were leveraged from the uIP-1.0 apps directory.
@@ -980,12 +1044,12 @@ netutils/
 `-- <i>(netutils common files)</i>
 </pre></ul>
 
-<h2>2.17 <a name="DirStructNshLib">apps/nshlib</a></h2>
+<h2>2.18 <a name="DirStructNshLib">apps/nshlib</a></h2>
 <p>
   This directory contains for the core of the NuttShell (NSH) application.
 </p>
 
-<h2>2.18 <a name="DirStructExamples">apps/examples</a></h2>
+<h2>2.19 <a name="DirStructExamples">apps/examples</a></h2>
 <p>
   Example and test programs to build against.
 </p>
@@ -2791,6 +2855,15 @@ build
     <code>CONFIG_ARCH_LOWPUTC</code>: architecture supports low-level, boot
     time console output
   </li>
+  <li>
+    <code>CONFIG_NUTTX_KERNEL</code>:
+      With most MCUs, NuttX is built as a flat, single executable image
+      containing the NuttX RTOS along with all application code.
+      The RTOS code and the application run in the same address space and at the same kernel-mode privileges.
+      If this option is selected, NuttX will be built separately as a monolithic, kernel-mode module and the applications
+      can be added as a separately built, user-mode module.
+      In this a system call layer will be built to support the user- to kernel-mode interface to the RTOS.
+  </li>
   <li>
     <code>CONFIG_MM_REGIONS</code>: If the architecture includes multiple
     regions of memory to allocate from, this specifies the

Makefile

@@ -76,18 +76,42 @@ APPDIR		:= ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_AP
 
 PCODE_DIR	:= ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi}
 
-# All add-on directories
+# All add-on directories.
+#
+# NUTTX_ADDONS is the list of directories built into the NuttX kernel.
+# USER_ADDONS is the list of directories that will be built into the user application
 
-ADDON_DIRS	:= $(PCODE_DIR) $(NX_DIR) $(APPDIR)
+NUTTX_ADDONS	:= $(PCODE_DIR) $(NX_DIR)
+USER_ADDONS		:=
 
-# FSDIRS depend on file descriptor support; NONFSDIRS do not
-#   (except for parts of FSDIRS).  We will exclude FSDIRS
-#   from the build if file descriptor support is disabled
+ifeq ($(CONFIG_NUTTX_KERNEL),y)
+USER_ADDONS		+= $(APPDIR)
+else
+NUTTX_ADDONS	+= $(APPDIR)
+endif
 
-NONFSDIRS	= sched lib $(ARCH_SRC) mm $(ADDON_DIRS)
+# Lists of build directories.
+#
+# FSDIRS depend on file descriptor support; NONFSDIRS do not (except for parts
+#   of FSDIRS).  We will exclude FSDIRS from the build if file descriptor
+#   support is disabled
+# CONTEXTDIRS include directories that have special, one-time pre-build
+#   requirements.  Normally this includes things like auto-generation of
+#   configuration specific files or creation of configurable symbolic links
+# USERDIRS - When NuttX is build is a monolithic kernel, this provides the
+#   list of directories that must be built
+
+NONFSDIRS	= sched lib $(ARCH_SRC) mm $(NUTTX_ADDONS)
 FSDIRS		= fs drivers binfmt
 NETFSDIRS	= fs drivers
 CONTEXTDIRS	= $(APPDIR)
+USERDIRS	=
+
+ifeq ($(CONFIG_NUTTX_KERNEL),y)
+NONFSDIRS	+= syscall
+CONTEXTDIRS	+= syscall
+USERDIRS	+= syscall $(USER_ADDONS)
+endif
 
 ifeq ($(CONFIG_NX),y)
 NONFSDIRS	+= graphics
@@ -133,62 +157,78 @@ ifeq ($(CONFIG_BUILD_2PASS),y)
 EXTRA_OBJS	+= $(CONFIG_PASS1_OBJECT)
 endif
 
-# LINKLIBS is the list of NuttX libraries that is passed to the
-#   processor-specific Makefile to build the final target.
+# NUTTXLIBS is the list of NuttX libraries that is passed to the
+#   processor-specific Makefile to build the final NuttX target.
 #   Libraries in FSDIRS are excluded if file descriptor support
 #   is disabled.
+# USERLIBS is the list of libraries used to build the final user-space
+#   application
 
-LINKLIBS	= sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEXT) \
+NUTTXLIBS	= sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEXT) \
 		  lib/liblib$(LIBEXT)
+USERLIBS	=
+
+# Add libraries for syscall support.
+
+ifeq ($(CONFIG_NUTTX_KERNEL),y)
+NUTTXLIBS	+= syscall/libstubs$(LIBEXT)
+USERLIBS	+= syscall/libproxies$(LIBEXT)
+endif
 
 # Add libraries for network support.  CXX, CXXFLAGS, and COMPILEXX must
 # be defined in Make.defs for this to work!
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-LINKLIBS	+= libxx/liblibxx$(LIBEXT)
+ifeq ($(CONFIG_NUTTX_KERNEL),y)
+USERLIBS	+= libxx/liblibxx$(LIBEXT)
+else
+NUTTXLIBS	+= libxx/liblibxx$(LIBEXT)
+endif
 endif
 
-# Add library for application support
-# Always compile the framework which includes exec_namedapp if users
-# or nuttX applications are to be included.
+# Add library for application support.
 
 ifneq ($(APPDIR),)
-LINKLIBS	+= $(APPDIR)/libapps$(LIBEXT)
+ifeq ($(CONFIG_NUTTX_KERNEL),y)
+USERLIBS	+= $(APPDIR)/libapps$(LIBEXT)
+else
+NUTTXLIBS	+= $(APPDIR)/libapps$(LIBEXT)
+endif
 endif
 
 # Add libraries for network support
 
 ifeq ($(CONFIG_NET),y)
-LINKLIBS	+= net/libnet$(LIBEXT)
+NUTTXLIBS	+= net/libnet$(LIBEXT)
 endif
 
 # Add libraries for file system support
 
 ifeq ($(CONFIG_NFILE_DESCRIPTORS),0)
 ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0)
-LINKLIBS	+= fs/libfs$(LIBEXT)
+NUTTXLIBS	+= fs/libfs$(LIBEXT)
 endif
 ifeq ($(CONFIG_NET),y)
-LINKLIBS	+= drivers/libdrivers$(LIBEXT)
+NUTTXLIBS	+= drivers/libdrivers$(LIBEXT)
 endif
 else
-LINKLIBS	+= fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT) binfmt/libbinfmt$(LIBEXT)
+NUTTXLIBS	+= fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT) binfmt/libbinfmt$(LIBEXT)
 endif
 
 # Add libraries for Pascall P-Code
 
 ifneq ($(PCODE_DIR),)
-LINKLIBS	+= $(PCODE_DIR)/libpcode$(LIBEXT)
+NUTTXLIBS	+= $(PCODE_DIR)/libpcode$(LIBEXT)
 endif
 
 # Add libraries for the NX graphics sub-system
 
 ifneq ($(NX_DIR),)
-LINKLIBS	+= $(NX_DIR)/libnx$(LIBEXT)
+NUTTXLIBS	+= $(NX_DIR)/libnx$(LIBEXT)
 endif
 
 ifeq ($(CONFIG_NX),y)
-LINKLIBS        += graphics/libgraphics$(LIBEXT)
+NUTTXLIBS        += graphics/libgraphics$(LIBEXT)
 endif
 
 # This is the name of the final target
@@ -287,6 +327,12 @@ pcode/libpcode$(LIBEXT): context
 graphics/libgraphics$(LIBEXT): context
 	@$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT)
 
+syscall/libstubs$(LIBEXT): context
+	@$(MAKE) -C syscall TOPDIR="$(TOPDIR)" libstubs$(LIBEXT)
+
+syscall/libproxies$(LIBEXT): context
+	@$(MAKE) -C syscall TOPDIR="$(TOPDIR)" libproxies$(LIBEXT)
+
 # If the 2 pass build option is selected, then this pass1 target is
 # configured be build a extra link object. This is assumed to be an
 # incremental (relative) link object, but could be a static library
@@ -311,11 +357,11 @@ ifeq ($(CONFIG_BUILD_2PASS),y)
 		echo "ERROR: No Makefile in CONFIG_PASS1_BUILDIR"; \
 		exit 1; \
 	fi
-	@$(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" LINKLIBS="$(LINKLIBS)" "$(ARCH_SRC)/$(CONFIG_PASS1_OBJECT)"
+	@$(MAKE) -C $(CONFIG_PASS1_BUILDIR) TOPDIR="$(TOPDIR)" LINKLIBS="$(NUTTXLIBS)" "$(ARCH_SRC)/$(CONFIG_PASS1_OBJECT)"
 endif
 
-$(BIN):	context depend $(LINKLIBS) pass1
-	@$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" EXTRA_OBJS="$(EXTRA_OBJS)" LINKLIBS="$(LINKLIBS)" $(BIN)
+$(BIN):	context depend $(NUTTXLIBS) $(USERLIBS) pass1
+	@$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" EXTRA_OBJS="$(EXTRA_OBJS)" LINKLIBS="$(NUTTXLIBS)" $(BIN)
 	@if [ -w /tftpboot ] ; then \
 		cp -f $(TOPDIR)/$@ /tftpboot/$@.${CONFIG_ARCH}; \
 	fi

arch/8051/include/syscall.h

@@ -0,0 +1,82 @@
+/****************************************************************************
+ * arch/8051/include/syscall.h
+ *
+ *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* This file should never be included directed but, rather, only indirectly
+ * through include/syscall.h or include/sys/sycall.h
+ */
+
+#ifndef __ARCH_8051_INCLUDE_SYSCALL_H
+#define __ARCH_8051_INCLUDE_SYSCALL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Inline functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#endif /* __ARCH_8051_INCLUDE_SYSCALL_H */
+

arch/sh/include/syscall.h

@@ -0,0 +1,82 @@
+/****************************************************************************
+ * arch/sh/include/syscall.h
+ *
+ *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* This file should never be included directed but, rather, only indirectly
+ * through include/syscall.h or include/sys/sycall.h
+ */
+
+#ifndef __ARCH_SH_INCLUDE_SYSCALL_H
+#define __ARCH_SH_INCLUDE_SYSCALL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Inline functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#endif /* __ARCH_SH_INCLUDE_SYSCALL_H */
+

arch/sim/include/syscall.h

@@ -0,0 +1,82 @@
+/****************************************************************************
+ * arch/sim/include/syscall.h
+ *
+ *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* This file should never be included directed but, rather, only indirectly
+ * through include/syscall.h or include/sys/sycall.h
+ */
+
+#ifndef __ARCH_SIM_INCLUDE_SYSCALL_H
+#define __ARCH_SIM_INCLUDE_SYSCALL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Inline functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#endif /* __ARCH_SIM_INCLUDE_SYSCALL_H */
+

arch/z16/include/syscall.h

@@ -0,0 +1,82 @@
+/****************************************************************************
+ * arch/z16/include/syscall.h
+ *
+ *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* This file should never be included directed but, rather, only indirectly
+ * through include/syscall.h or include/sys/sycall.h
+ */
+
+#ifndef __ARCH_Z16_INCLUDE_SYSCALL_H
+#define __ARCH_Z16_INCLUDE_SYSCALL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Inline functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#endif /* __ARCH_Z16_INCLUDE_SYSCALL_H */
+

arch/z80/include/syscall.h

@@ -0,0 +1,90 @@
+/****************************************************************************
+ * arch/z80/include/syscall.h
+ *
+ *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* This file should never be included directed but, rather, only indirectly
+ * through include/syscall.h or include/sys/sycall.h
+ */
+
+#ifndef __ARCH_Z80_INCLUDE_SYSCALL_H
+#define __ARCH_Z80_INCLUDE_SYSCALL_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/* Include ARM architecture-specific syscall macros */
+
+#ifdef CONFIG_ARCH_CORTEXM3
+# include <arch/cortexm3/syscall.h>
+#else
+# include <arch/arm/syscall.h>
+#endif
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Inline functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#endif /* __ARCH_Z80_INCLUDE_SYSCALL_H */
+

configs/sam3u-ek/README.txt

@@ -308,6 +308,11 @@ can be selected as follow:
 
 Where <subdir> is one of the following:
 
+  knsh:
+    This is identical to the nsh configuration below except that NuttX
+    is built as a kernel-mode, monolithic module and the user applications
+    are built separately.
+
   nsh:
     Configures the NuttShell (nsh) located at examples/nsh.  The
     Configuration enables both the serial and telnetd NSH interfaces.
@@ -320,3 +325,4 @@ Where <subdir> is one of the following:
     This configuration directory, performs a simple OS test using
     examples/ostest.  By default, this project assumes that you are
     using the DFU bootloader.
+

configs/sam3u-ek/knsh/Make.defs

@@ -0,0 +1,162 @@
+############################################################################
+# configs/sam3u-ek/knsh/Make.defs
+#
+#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+
+# Setup for the selected toolchain
+
+ifeq ($(CONFIG_SAM3U_CODESOURCERYW),y)
+  # CodeSourcery under Windows
+  CROSSDEV = arm-none-eabi-
+  WINTOOL = y
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+endif
+ifeq ($(CONFIG_SAM3U_CODESOURCERYL),y)
+  # CodeSourcery under Linux
+  CROSSDEV = arm-none-eabi-
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+  MAXOPTIMIZATION = -O2
+endif
+ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
+  # devkitARM under Windows
+  CROSSDEV = arm-eabi-
+  WINTOOL = y
+  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+endif
+ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
+  # NuttX buildroot under Linux or Cygwin
+  CROSSDEV = arm-elf-
+  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  MAXOPTIMIZATION = -Os
+endif
+
+ifeq ($(WINTOOL),y)
+  # Windows-native toolchains
+  DIRLINK = $(TOPDIR)/tools/winlink.sh
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/knsh/ld.script}"
+  MAXOPTIMIZATION = -O2
+else
+  # Linux/Cygwin-native toolchain 
+  MKDEP = $(TOPDIR)/tools/mkdeps.sh
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/knsh/ld.script
+endif
+
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(CROSSDEV)ar rcs
+NM = $(CROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
+  ARCHOPTIMIZATION = -g
+else
+  ARCHOPTIMIZATION = $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
+ARCHWARNINGSXX = -Wall -Wshadow
+ARCHDEFINES =
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat.ld -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
+
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
+
+ifneq ($(CROSSDEV),arm-elf-)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  LDFLAGS += -g
+endif
+
+define PREPROCESS
+	@echo "CPP: $1->$2"
+	@$(CPP) $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+	@echo "CC: $1"
+	@$(CC) -c $(CFLAGS) $1 -o $2
+endef
+
+define COMPILEXX
+	@echo "CXX: $1"
+	@$(CXX) -c $(CXXFLAGS) $1 -o $2
+endef
+
+define ASSEMBLE
+	@echo "AS: $1"
+	@$(CC) -c $(AFLAGS) $1 -o $2
+endef
+
+define ARCHIVE
+	echo "AR: $2"; \
+	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
+endef
+
+define CLEAN
+	@rm -f *.o *.a
+endef
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS =
+

configs/sam3u-ek/knsh/appconfig

@@ -0,0 +1,43 @@
+############################################################################
+# configs/sam3u-ek/nsh/appconfig
+#
+#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+# Path to example in apps/examples containing the user_start entry point
+
+CONFIGURED_APPS += examples/nsh
+
+# The NSH library
+
+CONFIGURED_APPS += nshlib
+

configs/sam3u-ek/knsh/ld.script

@@ -0,0 +1,111 @@
+/****************************************************************************
+ * configs/sam3u-ek/knsh/ld.script
+ *
+ *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* The AT91SAM3U-4 has 256Kb of FLASH beginning at address 0x0008:0000, 
+ * 32Kb of SRAM beginning at address 0x2000:0000, and 16Kb of SRAM beginning
+ * at address 0x2008:000 (used only for heap).  When booting from FLASH,
+ * FLASH memory is aliased to address 0x0000:0000 where the code expects to
+ * begin execution by jumping to the entry point in the 0x0800:0000 address
+ * range.
+ */
+
+MEMORY
+{
+    flash (rx)  : ORIGIN = 0x00080000, LENGTH = 256K
+    sram1 (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
+    sram2 (rwx) : ORIGIN = 0x20080000, LENGTH = 16K
+}
+
+OUTPUT_ARCH(arm)
+ENTRY(_stext)
+SECTIONS
+{
+	.text : {
+		_stext = ABSOLUTE(.);
+		*(.vectors)
+		*(.text .text.*)        
+		*(.fixup)
+		*(.gnu.warning)
+		*(.rodata .rodata.*)        
+		*(.gnu.linkonce.t.*)
+		*(.glue_7)
+		*(.glue_7t)
+		*(.got)
+		*(.gcc_except_table)
+		*(.gnu.linkonce.r.*)
+		_etext = ABSOLUTE(.);
+	} > flash
+
+	_eronly = ABSOLUTE(.);		/* See below                    */
+
+	.data : {
+		_sdata = ABSOLUTE(.);
+		*(.data .data.*)
+		*(.gnu.linkonce.d.*)
+		CONSTRUCTORS
+		_edata = ABSOLUTE(.);
+	} > sram1 AT > flash
+
+	.ARM.extab : {
+		*(.ARM.extab*)
+	} >sram1
+
+	.ARM.exidx : {
+		__exidx_start = ABSOLUTE(.);
+		*(.ARM.exidx*)
+		__exidx_end = ABSOLUTE(.);
+	} >sram1
+
+	.bss : {			/* BSS				*/
+		_sbss = ABSOLUTE(.);
+		*(.bss .bss.*)
+		*(.gnu.linkonce.b.*)
+		*(COMMON)
+		_ebss = ABSOLUTE(.);
+	} > sram1
+					/* Stabs debugging sections.	*/
+	.stab 0 : { *(.stab) }
+	.stabstr 0 : { *(.stabstr) }
+	.stab.excl 0 : { *(.stab.excl) }
+	.stab.exclstr 0 : { *(.stab.exclstr) }
+	.stab.index 0 : { *(.stab.index) }
+	.stab.indexstr 0 : { *(.stab.indexstr) }
+	.comment 0 : { *(.comment) }
+	.debug_abbrev 0 : { *(.debug_abbrev) }
+	.debug_info 0 : { *(.debug_info) }
+	.debug_line 0 : { *(.debug_line) }
+	.debug_pubnames 0 : { *(.debug_pubnames) }
+	.debug_aranges 0 : { *(.debug_aranges) }
+}

configs/sam3u-ek/knsh/setenv.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+# configs/sam3u-ek/knsh/setenv.sh
+#
+#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+if [ "$(basename $0)" = "setenv.sh" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
+
+WD=`pwd`
+export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export PATH="${BUILDROOT_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+echo "PATH : ${PATH}"

lib/stdlib/lib_abort.c

@@ -1,7 +1,7 @@
 /************************************************************************
- * sched/abort.c
+ * lib/stdlib/abort.c
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without

sched/Makefile

@@ -45,10 +45,10 @@ MISC_SRCS	= os_start.c os_bringup.c get_errno_ptr.c sched_garbage.c \
 
 TSK_SRCS	= task_create.c task_init.c task_setup.c task_activate.c \
 		  task_start.c task_delete.c task_deletecurrent.c task_restart.c \
-		  exit.c abort.c atexit.c getpid.c  \
-		  sched_addreadytorun.c sched_removereadytorun.c sched_addprioritized.c \
-		  sched_mergepending.c sched_addblocked.c sched_removeblocked.c \
-		  sched_free.c sched_gettcb.c sched_verifytcb.c sched_releasetcb.c
+		  exit.c atexit.c getpid.c sched_addreadytorun.c sched_removereadytorun.c \
+		  sched_addprioritized.c sched_mergepending.c sched_addblocked.c \
+		  sched_removeblocked.c sched_free.c sched_gettcb.c sched_verifytcb.c \
+		  sched_releasetcb.c
 
 SCHED_SRCS	= sched_setparam.c sched_setpriority.c sched_getparam.c \
 		  sched_setscheduler.c sched_getscheduler.c \

syscall/Makefile

@@ -60,7 +60,7 @@ VPATH = proxies:stubs
 BIN1 = libproxies$(LIBEXT)
 BIN2 = libstubs$(LIBEXT)
 
-all: $(BIN)
+all: $(BIN1) $(BIN2)
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -88,7 +88,7 @@ depend: .depend
 $(MKSYSCALL):
 	@$(MAKE) -C $(TOPDIR)/tools -f Makefile.host mksyscall
 
-.context: $(MKSYSCALL)
+.context: $(MKSYSCALL) syscall.csv
 	@(cd proxies; $(MKSYSCALL) -p $(CSVFILE);)
 	@(cd stubs; $(MKSYSCALL) -s $(CSVFILE);)
 	@touch $@

syscall/README.txt

@@ -11,7 +11,7 @@ and the application run in the same address space and at the same kernel-
 mode privileges.  In order to exploit security features of certain
 processors, an alternative build model is also supported:  NuttX can
 be built separately as a monolithic, kernel-mode module and the applications
-can be add as a separately built, user-mode module.
+can be added as a separately built, user-mode module.
 
 The syscall layer provided in this directory serves as the communication
 layer from the user-mode application into the kernel-mode RTOS.  The

syscall/syscall.csv

@@ -1,7 +1,6 @@
 "_exit","unistd.h","void","int"
-"abort","stdlib.h","void"
 "accept","sys/socket.h","int","int","struct sockaddr*","socklen_t*"
-"atexit","stdlib.h","int","void *(*)(void)"
+"atexit","stdlib.h","int","void (*)(void)"
 "bind","sys/socket.h","int","int","FAR const struct sockaddr*","socklen_t"
 "clearenv","stdlib.h","int"
 "clock_getres","time.h","int","clockid_t","struct timespec*"
@@ -18,7 +17,7 @@
 "fstat","sys/stat.h","int","int","FAR struct stat*"
 "fstatfs","sys/statfs.h","int","int","struct statfs*"
 "fsync","unistd.h","int","int"
-"get_environ_ptr","stdlib.h","FAR char**"," void "
+"get_environ_ptr","stdlib.h","FAR char**"
 "get_errno_ptr","errno.h","FAR int*"
 "getenv","stdlib.h","FAR char*","FAR const char*"
 "getpid","unistd.h","pidt_t"
@@ -27,9 +26,9 @@
 "ioctl","sys/ioctl.h","int","int","int","unsigned long"
 "kill","signal.h","int","pid_t","int"
 "listen","sys/socket.h","int","int","int"
-"lseek","unistd.h","off_t","int","off_t offset","int"
-"mkdir","sys/stat.h","int","FAR const char*","mode_t mode"
-"mkfifo","sys/stat.h","int","FAR const char*","mode_t mode"
+"lseek","unistd.h","off_t","int","off_t","int"
+"mkdir","sys/stat.h","int","FAR const char*","mode_t"
+"mkfifo","sys/stat.h","int","FAR const char*","mode_t"
 "mmap","sys/mman.h","FAR void*","FAR void*","size_t","int","int","int","off_t"
 "mount","sys/mount.h","int","const char*","const char*","const char*","unsigned long","const void*"
 "mq_close","mqueue.h","int","mqd_t"
@@ -39,12 +38,12 @@
 "mq_receive","mqueue.h","ssize_t","mqd_t","void*","size_t","int*"
 "mq_send","mqueue.h","int","mqd_t","const void*","size_t","int"
 "mq_setattr","mqueue.h","int","mqd_t","const struct mq_attr*","struct mq_attr*"
-"mq_timedreceive","mqueue.h","ssize_t","mqd_t","void*","size_t","int","const struct timespec*"
-"mq_timedsend","mqueue.h","int","mqd_t","const char*","size_t","int prio","const struct timespec*"
+"mq_timedreceive","mqueue.h","ssize_t","mqd_t","void*","size_t","int*","const struct timespec*"
+"mq_timedsend","mqueue.h","int","mqd_t","const char*","size_t","int","const struct timespec*"
 "mq_unlink","mqueue.h","int","const char*"
 "open","fcntl.h","int","const char*","int","..."
 "opendir","dirent.h","FAR DIR*","FAR const char*"
-"pipe","unistd.h","int","int[2]"
+"pipe","unistd.h","int","int [2]|int*"
 "poll","poll.h","int","FAR struct pollfd*","nfds_t","int"
 "pthread_barrier_destroy","pthread.h","int","FAR pthread_barrier_t*"
 "pthread_barrier_init","pthread.h","int","FAR pthread_barrier_t*","FAR const pthread_barrierattr_t*","unsigned int"
@@ -123,7 +122,7 @@
 "sigpending","signal.h","int","FAR sigset_t*"
 "sigprocmask","signal.h","int","int","FAR const sigset_t*","FAR sigset_t*"
 "sigqueue","signal.h","int","int","int","FAR void*"
-"sigqueue","signal.h","int","int","int","union sigval"
+"sigqueue","signal.h","int","int","int","union sigval|FAR void *"
 "sigsuspend","signal.h","int","FAR const sigset_t*"
 "sigtimedwait","signal.h","int","FAR const sigset_t*","FAR struct siginfo*","FAR const struct timespec*"
 "sigwaitinfo","signal.h","int","FAR const sigset_t*","FAR struct siginfo*"
@@ -134,11 +133,11 @@
 "statfs","stdio.h","int","FAR const char*","FAR struct statfs*"
 "statfs","sys/statfs.h","int","const char*","struct statfs*"
 "task_activate","sched.h","int","FAR _TCB*"
-"task_create","sched.h","int","const char*","int","int","main_t","const char*[]"
-"task_create","sched.h","int","const char*","int","main_t","const char*[]"
+"task_create","sched.h","int","const char*","int","int","main_t","const char* []|const char**"
+#"task_create","sched.h","int","const char*","int","main_t","const char* []|const char**"
 "task_delete","sched.h","int","pid_t"
-"task_init","sched.h","int","FAR _TCB*","const char*","int","FAR uint32_t*","uint32_t","main_t","const char*[]"
-"task_init","sched.h","int","FAR _TCB*","const char*","int","main_t","const char*[]"
+"task_init","sched.h","int","FAR _TCB*","const char*","int","FAR uint32_t*","uint32_t","main_t","const char* []|const char**"
+#"task_init","sched.h","int","FAR _TCB*","const char*","int","main_t","const char* []|const char**"
 "task_restart","sched.h","int","pid_t"
 "telldir","dirent.h","off_t","FAR DIR*"
 "timer_create","time.h","int","clockid_t","FAR struct sigevent*","FAR timer_t*"
@@ -150,11 +149,11 @@
 "unlink","unistd.h","int","FAR const char*"
 "unsetenv","stdlib.h","int","const char*"
 "up_assert","assert.h","void","FAR const uint8_t*","int"
-"up_assert","assert.h","void"
+#"up_assert","assert.h","void"
 "up_assert_code","assert.h","void","FAR const uint8_t*","int","int"
-"up_assert_code","assert.h","void","int"
+#"up_assert_code","assert.h","void","int"
 "usleep","unistd.h","void","useconds_t"
-"wait","sys/wait.h","pidt_t","int*"
-"waitid","sys/wait.h","int","idtype_t","id_t id","siginfo_t*","int"
+#"wait","sys/wait.h","pidt_t","int*"
+#"waitid","sys/wait.h","int","idtype_t","id_t id","siginfo_t*","int"
 "waitpid","sys/wait.h","pidt_t","pid_t","int*","int"
 "write","unistd.h","ssize_t","int","FAR const void*","size_t"

tools/mksyscall.c

@@ -65,8 +65,10 @@
  ****************************************************************************/
 
 static bool g_debug;
+static bool g_inline;
 static char g_line[LINESIZE+1];
 static char g_parm[MAX_FIELDS][MAX_PARMSIZE];
+static FILE *g_stubstream;
 
 /****************************************************************************
  * Private Functions
@@ -204,13 +206,104 @@ static int parse_csvline(char *ptr)
   return nparms;
 }
 
+static bool is_vararg(const char *type, int index, int nparms)
+{
+  if (strcmp(type,"...") == 0)
+    {
+      if (index != (nparms-1))
+        {
+          fprintf(stderr, "... is not the last in the argument list\n");
+          exit(11);
+        }
+      return true;
+    }
+  return false;
+}
+
+static bool is_union(const char *type)
+{
+  return (strncmp(type,"union", 5) == 0);
+}
+
+static const char *check_funcptr(const char *type)
+{
+  const char *str = strstr(type,"(*)");
+  if (str)
+    {
+      return str + 2;
+    }
+  return NULL;
+}
+
+static const char *check_array(const char *type)
+{
+  const char *str = strchr(type, '[');
+  if (str)
+    {
+      return str;
+    }
+  return NULL;
+}
+
+static void print_formalparm(FILE *stream, const char *argtype, int parmno)
+{
+  const char *part2;
+  int len;
+
+  /* Function pointers and array formal parameter types are a little more work */
+
+  if ((part2 = check_funcptr(argtype)) != NULL || (part2 = check_array(argtype)) != NULL)
+    {
+      len = part2 - argtype;
+      (void)fwrite(argtype, 1, len, stream);
+      fprintf(stream, "parm%d%s", parmno, part2);
+    }
+  else
+    {
+      fprintf(stream, "%s parm%d", argtype, parmno);
+    }
+}
+
+static void get_formalparmtype(const char *arg, char *formal)
+{
+  char *ptr = strchr(arg,'|');
+  if (ptr)
+    {
+      /* The formal parm type is a pointer to everything up to the '|' */
+
+      while (*arg != '|')
+        {
+          *formal++ = *arg++;
+        }
+      *formal   = '\0';
+    }
+  else
+    {
+      strncpy(formal, arg, MAX_PARMSIZE);
+    }
+}
+
+static void get_actualparmtype(const char *arg, char *actual)
+{
+  char *ptr = strchr(arg,'|');
+  if (ptr)
+    {
+      ptr++;
+      strncpy(actual, ptr, MAX_PARMSIZE);
+    }
+  else
+    {
+      strncpy(actual, arg, MAX_PARMSIZE);
+    }
+}
+
 static FILE *open_proxy(void)
 {
-  char filename[MAX_PARMSIZE+4];
+  char filename[MAX_PARMSIZE+10];
   FILE *stream;
 
-  snprintf(filename, MAX_PARMSIZE+3, "%s.c", g_parm[NAME_INDEX]);
-  filename[MAX_PARMSIZE+3] = '\0';
+  snprintf(filename, MAX_PARMSIZE+9, "PROXY_%s.c", g_parm[NAME_INDEX]);
+  filename[MAX_PARMSIZE+9] = '\0';
 
   stream = fopen(filename, "w");
   if (stream == NULL)
@@ -224,12 +317,17 @@ static FILE *open_proxy(void)
 static void generate_proxy(int nparms)
 {
   FILE *stream = open_proxy();
+  char formal[MAX_PARMSIZE];
   int i;
 
+  /* Generate "up-front" information, include correct header files */
+
   fprintf(stream, "/* Auto-generated %s proxy file -- do not edit */\n\n", g_parm[NAME_INDEX]);
   fprintf(stream, "#include <%s>\n", g_parm[HEADER_INDEX]);
   fprintf(stream, "#include <syscall.h>\n\n");
 
+  /* Generate the function definition that matches standard function prototype */
+
   fprintf(stream, "%s %s(", g_parm[RETTYPE_INDEX], g_parm[NAME_INDEX]);
 
   if (nparms <= 0)
@@ -240,60 +338,104 @@ static void generate_proxy(int nparms)
     {
       for (i = 0; i < nparms; i++)
         {
+          get_formalparmtype(g_parm[PARM1_INDEX+i], formal);
           if (i > 0)
             {
-              fprintf(stream, ", %s parm%d", g_parm[PARM1_INDEX+i], i+1);
-            }
-          else
-            {
-              fprintf(stream, "%s parm%d", g_parm[PARM1_INDEX+i], i+1);
+              fprintf(stream, ", ");
             }
+          print_formalparm(stream, formal, i+1);
         }
     }
+  fprintf(stream, ")\n{\n");
+
+  /* Generate the system call.  Functions that do not return or return void are special cases */
+
+  if (strcmp(g_parm[RETTYPE_INDEX], "void") == 0)
+    {
+      fprintf(stream, "  (void)sys_call%d(", nparms);
+    }
+  else
+    {
+      fprintf(stream, "  return (%s)sys_call%d(", g_parm[RETTYPE_INDEX], nparms);
+    }
+
+  /* Create the parameter list with the matching types.  The first parametr is always the syscall number. */
+
+  fprintf(stream, "(unsigned int)SYS_%s", g_parm[NAME_INDEX]);
 
-  fprintf(stream, ")\n{\n");
-  fprintf(stream, "  return (%s)sys_call%d(", g_parm[RETTYPE_INDEX], nparms);
   for (i = 0; i < nparms; i++)
     {
-      if (i > 0)
-        {
-          fprintf(stream, ", (uintptr_t)parm%d", i+1);
-        }
-      else
-        {
-          fprintf(stream, "(uintptr_t)parm%d", i+1);
-        }
+      fprintf(stream, ", (uintptr_t)parm%d", i+1);
     }
+
+  /* Handle the tail end of the function. */
+
   fprintf(stream, ");\n}\n");
   fclose(stream);
 }
 
 static FILE *open_stub(void)
 {
-  char filename[MAX_PARMSIZE+8];
-  FILE *stream;
-
-  snprintf(filename, MAX_PARMSIZE+7, "STUB_%s.c", g_parm[NAME_INDEX]);
-  filename[MAX_PARMSIZE+7] = '\0';
-
-  stream = fopen(filename, "w");
-  if (stream == NULL)
+  if (g_inline)
     {
-      fprintf(stderr, "Failed to open %s: %s\n", filename, strerror(errno));
-      exit(9);
+      if (!g_stubstream)
+        {
+          g_stubstream = fopen("STUB.h", "w");
+          if (g_stubstream == NULL)
+            {
+              fprintf(stderr, "Failed to open STUB.h: %s\n", strerror(errno));
+              exit(9);
+            }
+        }
+
+      return g_stubstream;
+    }
+  else
+    {
+      char filename[MAX_PARMSIZE+8];
+      FILE *stream;
+
+      snprintf(filename, MAX_PARMSIZE+7, "STUB_%s.c", g_parm[NAME_INDEX]);
+      filename[MAX_PARMSIZE+7] = '\0';
+
+      stream = fopen(filename, "w");
+      if (stream == NULL)
+        {
+          fprintf(stderr, "Failed to open %s: %s\n", filename, strerror(errno));
+          exit(9);
+        }
+      return stream;
+    }
+}
+
+static void stub_close(FILE *stream)
+{
+  if (!g_inline)
+    {
+      fclose(stream);
     }
-  return stream;
 }
 
 static void generate_stub(int nparms)
 {
   FILE *stream = open_stub();
+  char formal[MAX_PARMSIZE];
+  char actual[MAX_PARMSIZE];
   int i;
+  int j;
+
+  /* Generate "up-front" information, include correct header files */
 
   fprintf(stream, "/* Auto-generated %s stub file -- do not edit */\n\n", g_parm[0]);
+  fprintf(stream, "#include <stdint.h>\n");
   fprintf(stream, "#include <%s>\n\n", g_parm[HEADER_INDEX]);
+
+  /* Generate the function definition that matches standard function prototype */
+
   fprintf(stream, "uintptr_t STUB_%s(", g_parm[NAME_INDEX]);
 
+  /* Generate the formal parameter list.  A function received no parameters is a special case. */
+
   if (nparms <= 0)
     {
       fprintf(stream, "void");
@@ -302,9 +444,27 @@ static void generate_stub(int nparms)
     {
       for (i = 0; i < nparms; i++)
         {
+          /* Treat the first argument in the list differently from the others..
+           * It does not need a comma before it.
+           */
+
           if (i > 0)
             {
-              fprintf(stream, ", uintptr_t parm%d", i+1);
+              /* Check for a variable number of arguments */
+
+              if (is_vararg(g_parm[PARM1_INDEX+i], i, nparms))
+                {
+                  /* Always receive six arguments in this case */
+
+                  for (j = i+1; j <=6; j++)
+                    {
+                      fprintf(stream, ", uintptr_t parm%d", j);
+                    }
+                }
+              else
+                {
+                  fprintf(stream, ", uintptr_t parm%d", i+1);
+                }
             }
           else
             {
@@ -312,27 +472,101 @@ static void generate_stub(int nparms)
             }
         }
     }
-
   fprintf(stream, ")\n{\n");
-  fprintf(stream, "  return (uintptr_t)%s(", g_parm[NAME_INDEX]);
+
+  /* Then call the proxied function.  Functions that have no return value are
+   * a special case.
+   */
+
+  if (strcmp(g_parm[RETTYPE_INDEX], "void") == 0)
+    {
+      fprintf(stream, "  %s(", g_parm[NAME_INDEX]);
+    }
+  else
+    {
+      fprintf(stream, "  return (uintptr_t)%s(", g_parm[NAME_INDEX]);
+    }
+
+  /* The pass all of the system call parameters, casting to the correct type
+   * as necessary.
+   */
+
   for (i = 0; i < nparms; i++)
     {
+      /* Get the formal type of the parameter, and get the type that we
+       * actually have to cast to.  For example for a formal type like 'int parm[]'
+       * we have to cast the actual parameter to 'int*'.  The worst is a union
+       * type like 'union sigval' where we have to cast to (union sigval)((FAR void *)parm)
+       * -- Yech.
+       */
+
+     get_formalparmtype(g_parm[PARM1_INDEX+i], formal);
+     get_actualparmtype(g_parm[PARM1_INDEX+i], actual);
+
+      /* Treat the first argument in the list differently from the others..
+       * It does not need a comma before it.
+       */
+
       if (i > 0)
         {
-          fprintf(stream, ", (%s)parm%d", g_parm[PARM1_INDEX+i], i+1);
+          /* Check for a variable number of arguments */
+
+          if (is_vararg(actual, i, nparms))
+            {
+              /* Always pass six arguments */
+
+              for (j = i+1; j <=6; j++)
+                {
+                  fprintf(stream, ", parm%d", j);
+                }
+            }
+          else
+            {
+              if (is_union(formal))
+                {
+                  fprintf(stream, ", (%s)((%s)parm%d)", formal, actual, i+1);
+                }
+              else
+                {
+                  fprintf(stream, ", (%s)parm%d", actual, i+1);
+                }
+            }
         }
       else
         {
-          fprintf(stream, "(%s)parm%d", g_parm[PARM1_INDEX+i], i+1);
+          if (is_union(formal))
+            {
+              fprintf(stream, "(%s)((%s)parm%d)", formal, actual, i+1);
+            }
+          else
+            {
+              fprintf(stream, "(%s)parm%d",actual, i+1);
+            }
         }
     }
-  fprintf(stream, ");\n}\n");
-  fclose(stream);
+
+  /* Tail end of the function.  The the proxied function has no return
+   * value, just return zero (OK).
+   */
+
+  if (strcmp(g_parm[RETTYPE_INDEX], "void") == 0)
+    {
+      fprintf(stream, ");\n  return 0;\n}\n");
+    }
+  else
+    {
+      fprintf(stream, ");\n}\n");
+    }
+  stub_close(stream);
 }
 
 static void show_usage(const char *progname)
 {
-  fprintf(stderr, "USAGE: %s [-p|s] <CSV file>\n", progname);
+  fprintf(stderr, "USAGE: %s [-p|s|i] <CSV file>\n\n", progname);
+  fprintf(stderr, "Where:\n\n");
+  fprintf(stderr, "\t-p : Generate proxies\n");
+  fprintf(stderr, "\t-s : Generate stubs\n");
+  fprintf(stderr, "\t-i : Generate proxies as static inline functions\n");
   exit(1);
 }
 
@@ -351,6 +585,7 @@ int main(int argc, char **argv, char **envp)
   /* Parse command line options */
 
   g_debug = false;
+  g_inline = false;
 
   while ((ch = getopt(argc, argv, ":dps")) > 0)
     {
@@ -368,6 +603,10 @@ int main(int argc, char **argv, char **envp)
             proxies = false;
             break;
 
+          case 'i' :
+            g_inline = true;
+            break;
+
           case '?' :
             fprintf(stderr, "Unrecognized option: %c\n", optopt);
             show_usage(argv[0]);
@@ -423,7 +662,12 @@ int main(int argc, char **argv, char **envp)
         }
       else
         {
+          g_stubstream = NULL;
           generate_stub(nargs-3);
+          if (g_stubstream != NULL)
+            {
+              fclose(g_stubstream);
+            }
         }
     }