Correct several m9s12x link issues

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

4 files changed, 205 insertions, 17 deletions

diff --git a/nuttx/arch/hc/src/common/up_exit.c b/nuttx/arch/hc/src/common/up_exit.c
new file mode 100644
index 000000000..77c627b4a
--- /dev/null
+++ b/nuttx/arch/hc/src/common/up_exit.c
@@ -0,0 +1,174 @@
+/****************************************************************************
+ * arch/hc/src/common/up_exit.c
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sched.h>
+#include <debug.h>
+#include <nuttx/arch.h>
+
+#include "os_internal.h"
+#include "up_internal.h"
+
+#ifdef CONFIG_DUMP_ON_EXIT
+#include <nuttx/fs.h>
+#endif
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: _up_dumponexit
+ *
+ * Description:
+ *   Dump the state of all tasks whenever on task exits.  This is debug
+ *   instrumentation that was added to check file-related reference counting
+ *   but could be useful again sometime in the future.
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+static void _up_dumponexit(FAR _TCB *tcb, FAR void *arg)
+{
+#if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NFILE_STREAMS > 0
+  int i;
+#endif
+
+  sdbg("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
+  sdbg("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+  if (tcb->filelist)
+    {
+      sdbg("    filelist refcount=%d\n",
+           tcb->filelist->fl_crefs);
+
+      for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
+        {
+          struct inode *inode = tcb->filelist->fl_files[i].f_inode;
+          if (inode)
+            {
+              sdbg("      fd=%d refcount=%d\n",
+                   i, inode->i_crefs);
+            }
+        }
+    }
+#endif
+
+#if CONFIG_NFILE_STREAMS > 0
+  if (tcb->streams)
+    {
+      sdbg("    streamlist refcount=%d\n",
+           tcb->streams->sl_crefs);
+
+      for (i = 0; i < CONFIG_NFILE_STREAMS; i++)
+        {
+          struct file_struct *filep = &tcb->streams->sl_streams[i];
+          if (filep->fs_filedes >= 0)
+            {
+#if CONFIG_STDIO_BUFFER_SIZE > 0
+              sdbg("      fd=%d nbytes=%d\n",
+                   filep->fs_filedes,
+                  filep->fs_bufpos - filep->fs_bufstart);
+#else
+              sdbg("      fd=%d\n", filep->fs_filedes);
+#endif
+            }
+        }
+    }
+#endif
+}
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: _exit
+ *
+ * Description:
+ *   This function causes the currently executing task to cease
+ *   to exist.  This is a special case of task_delete() where the task to
+ *   be deleted is the currently executing task.  It is more complex because
+ *   a context switch must be perform to the next ready to run task.
+ *
+ ****************************************************************************/
+
+void _exit(int status)
+{
+  _TCB* tcb;
+
+  /* Disable interrupts.  They will be restored when the next
+   * task is started.
+   */
+
+  (void)irqsave();
+
+  slldbg("TCB=%p exitting\n", g_readytorun.head);
+
+#if defined(CONFIG_DUMP_ON_EXIT) && defined(CONFIG_DEBUG)
+  slldbg("Other tasks:\n");
+  sched_foreach(_up_dumponexit, NULL);
+#endif
+
+  /* Destroy the task at the head of the ready to run list. */
+
+  (void)task_deletecurrent();
+
+  /* Now, perform the context switch to the new ready-to-run task at the
+   * head of the list.
+   */
+
+  tcb = (_TCB*)g_readytorun.head;
+
+  /* Then switch contexts */
+
+  up_fullcontextrestore(tcb->xcp.regs);
+}
+
diff --git a/nuttx/arch/hc/src/m9s12/Make.defs b/nuttx/arch/hc/src/m9s12/Make.defs
index e7c0109ee..f3ef80795 100755
--- a/nuttx/arch/hc/src/m9s12/Make.defs
+++ b/nuttx/arch/hc/src/m9s12/Make.defs
@@ -37,7 +37,7 @@ HEAD_ASRC	= m9s12_vectors.S
 
 CMN_ASRCS	= 
 CMN_CSRCS	= up_allocateheap.c up_blocktask.c up_copystate.c up_createstack.c \
-			  up_doirq.c up_idle.c up_initialize.c up_interruptcontext.c \
+			  up_doirq.c up_exit.c up_idle.c up_initialize.c up_interruptcontext.c \
 			  up_mdelay.c up_modifyreg16.c up_modifyreg32.c up_modifyreg8.c \
 			  up_puts.c up_releasepending.c up_releasestack.c up_reprioritizertr.c \
 			  up_udelay.c up_unblocktask.c up_usestack.c
diff --git a/nuttx/configs/ne64badge/ostest/ld.script.banked b/nuttx/configs/ne64badge/ostest/ld.script.banked
index 59b70293b..a0e07cb65 100755
--- a/nuttx/configs/ne64badge/ostest/ld.script.banked
+++ b/nuttx/configs/ne64badge/ostest/ld.script.banked
@@ -39,16 +39,20 @@
 
 MEMORY
 {
-  /* The 8Kb SRAM is mapped to 0x2000-0x2fff.  The top 256 bytes are reserved
-   * for the serial monitor stack space.
+  /* The register space resides at address 0x0000-0x03ff.  The following
+   * address, 0x0400-0x1fff are unused.
+   *
+   * The 8Kb SRAM is mapped to 0x2000-0x2fff.
    */
 
-  sram   (rwx)  : ORIGIN = 0x2000, LENGTH = 8K-256
+  sram   (rwx)  : ORIGIN = 0x2000, LENGTH = 8K
 
-  /* Two fixed text flash pages (corresponding to page 3e and 3f) */
+  /* Two fixed text flash pages (corresponding to page 3e and 3f).  The
+   * top 256 bytes of page 3f is reserved to hold the interrupt vectors
+   */
 
   lowtext(rx)   : ORIGIN = 0x4000, LENGTH = 16K			/* Page 3e */
-  hitext (rx)   : ORIGIN = 0xc000, LENGTH = 16K-2k		/* Page 3f */
+  hitext (rx)   : ORIGIN = 0xc000, LENGTH = 16K-256		/* Page 3f */
 
   /* Flash memory pages:
    *
@@ -79,9 +83,9 @@ MEMORY
   page3e (rx)   : ORIGIN = 0x0f8000, LENGTH = 16K		/* Page 3e */
   page3f (rx)   : ORIGIN = 0x0fc000, LENGTH = 16K-2K	/* Page 3f */
 
-  /* Vectors.  These get relocated to 0xf780-f7ff by the serial loader */
+  /* Vectors */
 
-  vectors (rx)  : ORIGIN = 0xff80,   LENGTH = 256
+  vectors (rx)  : ORIGIN = 0xff80, LENGTH = 256
 }
 
 ENTRY(_stext)
@@ -89,7 +93,7 @@ SECTIONS
 {
 	.text : {
 		_stext = ABSOLUTE(.);
-		*(.vectors)
+		*(nonbanked)
 		*(.text .text.*)        
 		*(.fixup)
 		*(.gnu.warning)
@@ -113,6 +117,10 @@ SECTIONS
 		_edata = ABSOLUTE(.);
 	} > sram AT > lowtext
 
+	.vectors : {
+		*(vectors)
+	} > vectors
+
 	.bss : {			/* BSS				*/
 		_sbss = ABSOLUTE(.);
 		*(.bss .bss.*)
diff --git a/nuttx/configs/ne64badge/ostest/ld.script.nonbanked b/nuttx/configs/ne64badge/ostest/ld.script.nonbanked
index bc3004bd2..81fe56c42 100755
--- a/nuttx/configs/ne64badge/ostest/ld.script.nonbanked
+++ b/nuttx/configs/ne64badge/ostest/ld.script.nonbanked
@@ -39,20 +39,22 @@
 
 MEMORY
 {
-  /* The 8Kb SRAM is mapped to 0x2000-0x2fff.  The top 256 bytes are reserved
-   * for the serial monitor stack space.
+  /* The register space resides at address 0x0000-0x03ff.  The following
+   * address, 0x0400-0x1fff are unused.
+   *
+   * The 8Kb SRAM is mapped to 0x2000-0x2fff.
    */
 
-  sram    (rwx) : ORIGIN = 0x2000, LENGTH = 8K-256
+  sram    (rwx) : ORIGIN = 0x2000, LENGTH = 8K
 
   /* Three fixed text flash pages (corresponding to page 3e, 3d, and 3f) at
-   * 16Kb each (minus 2Kb at the end of page 3f that is reserved at the top for
-   * the serial boot loader
+   * 16Kb each (minus 256 bytes at the end of page 3f that is reserved for
+   * interrupt vectors).
    */
 
-  text    (rx)  : ORIGIN = 0x4000, LENGTH = 48K-2k		/* Page 3e, 3d, and 3f */
+  text    (rx)  : ORIGIN = 0x4000, LENGTH = 48K-256		/* Page 3e, 3d, and 3f */
 
-  /* Vectors.  These get relocated to 0xf780-f7ff by the serial loader */
+  /* Vectors */
 
   vectors (rx)  : ORIGIN = 0xff80, LENGTH = 256
 }
@@ -62,7 +64,7 @@ SECTIONS
 {
 	.text : {
 		_stext = ABSOLUTE(.);
-		*(.vectors)
+		*(nonbanked)
 		*(.text .text.*)        
 		*(.fixup)
 		*(.gnu.warning)
@@ -86,6 +88,10 @@ SECTIONS
 		_edata = ABSOLUTE(.);
 	} > sram AT > text
 
+	.vectors : {
+		*(vectors)
+	} > vectors
+
 	.bss : {			/* BSS				*/
 		_sbss = ABSOLUTE(.);
 		*(.bss .bss.*)