Separate CVS parsing logic from tools/mksyscall.c; Create tools/mksymtab.c to create symbol tables from CSV files

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5075 7fd9a85b-ad96-42d3-883c-3090e2eb8679

16 files changed, 601 insertions, 165 deletions

diff --git a/nuttx/tools/Makefile.export b/nuttx/tools/Makefile.export
index fa2909972a..ce4842187a 100644
--- a/nuttx/tools/Makefile.export
+++ b/nuttx/tools/Makefile.export
@@ -2,7 +2,7 @@
 # Makefile.export
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/nuttx/tools/Makefile.host b/nuttx/tools/Makefile.host
index cf421aa3bf..33b7aaab2b 100644
--- a/nuttx/tools/Makefile.host
+++ b/nuttx/tools/Makefile.host
@@ -58,8 +58,13 @@ mkversion: mkconfig.c cfgparser.c
 
 # mksyscall - Convert a CSV file into syscall stubs and proxies
 
-mksyscall: mksyscall.c
-	@gcc $(CFLAGS) -o mksyscall mksyscall.c
+mksyscall: mksyscall.c csvparser.c
+	@gcc $(CFLAGS) -o mksyscall mksyscall.c csvparser.c
+
+# mksymtab - Convert a CSV file into a symbol table
+
+mksymtab: mksymtab.c csvparser.c
+	@gcc $(CFLAGS) -o mksymtab mksymtab.c csvparser.c
 
 # bdf-converter - Converts a BDF font to the NuttX font format
 
diff --git a/nuttx/tools/README.txt b/nuttx/tools/README.txt
index 2a3416adb7..ae19be2738 100755
--- a/nuttx/tools/README.txt
+++ b/nuttx/tools/README.txt
@@ -67,7 +67,7 @@ mkversion.c, cfgparser.c, and cfgparser.h
   .version file in the top level directory into include/nuttx/version.h.
   version.h provides version information that can be included by C files.
 
-mksyscall.c
+mksyscall.c, cvsparser.c, and cvsparser.h
 
   This is a C file that is used to build mksyscall program.  The mksyscall
   program is used during the initial NuttX build by the logic in the top-
@@ -89,6 +89,26 @@ mksyscall.c
   accept this CVS file as input and generate all of the required proxy or
   stub files as output.  See syscall/README.txt for additonal information.
 
+mksymtab.c, cvsparser.c, and cvsparser.h
+
+  This is a C file that is used to build symbol tables from common-separated
+  value (CSV) files.  This tool is not used during the NuttX build, but
+  can be used as needed to generate files.
+
+  USAGE: ./mksymtab <cvs-file> <symtab-file>
+
+  Where:
+
+    <cvs-file>   : The path to the input CSV file
+    <symtab-file>: The path to the output symbol table file
+    -d           : Enable debug output
+
+  Example:
+
+    cd nuttx/tools
+    cat ../syscall/syscall.csv ../lib/lib.csv | sort >tmp.csv
+    ./mksymtab.exe tmp.csv tmp.c
+
 pic32mx
 
   This directory contains build tools used only for PIC32MX platforms
diff --git a/nuttx/tools/cfgparser.h b/nuttx/tools/cfgparser.h
index 02de42928b..b1c4bae762 100644
--- a/nuttx/tools/cfgparser.h
+++ b/nuttx/tools/cfgparser.h
@@ -2,7 +2,7 @@
  * tools/cfgpaser.h
  *
  *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh
index 3aaed06817..8b4a3e4860 100755
--- a/nuttx/tools/configure.sh
+++ b/nuttx/tools/configure.sh
@@ -2,7 +2,7 @@
 # configure.sh
 #
 #   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/nuttx/tools/csvparser.c b/nuttx/tools/csvparser.c
new file mode 100644
index 0000000000..739e5e1f8b
--- /dev/null
+++ b/nuttx/tools/csvparser.c
@@ -0,0 +1,205 @@
+/****************************************************************************
+ * tools/csvparser.c
+ *
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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 <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include "csvparser.h"
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+bool g_debug;
+char g_line[LINESIZE+1];
+char g_parm[MAX_FIELDS][MAX_PARMSIZE];
+int g_lineno;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static char *skip_space(char *ptr)
+{
+  while (*ptr && isspace((int)*ptr)) ptr++;
+  return ptr;
+}
+
+static char *copy_parm(char *src, char *dest)
+{
+  char *start = src;
+  int i;
+
+  for (i = 0; i < MAX_PARMSIZE; i++)
+    {
+      if (*src == '"')
+        {
+          *dest = '\0';
+          return src;
+        }
+      else if (*src == '\n' || *src == '\0')
+        {
+          fprintf(stderr, "%d: Unexpected end of line: \"%s\"\n", g_lineno, start);
+          exit(4);
+        }
+      else
+        {
+          *dest++ = *src++;
+        }
+    }
+
+  fprintf(stderr, "%d: Parameter too long: \"%s\"\n", g_lineno, start);
+  exit(3);
+}
+
+static char *find_parm(char *ptr)
+{
+  char *start = ptr;
+
+  if (*ptr != '"')
+    {
+      fprintf(stderr, "%d: I'm confused: \"%s\"\n", g_lineno, start);
+      exit(5);
+    }
+  ptr++;
+
+  ptr = skip_space(ptr);
+  if (*ptr == '\n' || *ptr == '\0')
+    {
+      return NULL;
+    }
+  else if (*ptr != ',')
+    {
+      fprintf(stderr, "%d: Expected ',': \"%s\"\n", g_lineno, start);
+      exit(6);
+    }
+  ptr++;
+
+  ptr = skip_space(ptr);
+  if (*ptr != '"')
+    {
+      fprintf(stderr, "%d: Expected \": \"%s\"\n", g_lineno, start);
+      exit(7);
+    }
+  ptr++;
+
+  return ptr;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+char *read_line(FILE *stream)
+{
+  char *ptr;
+
+  for (;;)
+    {
+      g_line[LINESIZE] = '\0';
+      if (!fgets(g_line, LINESIZE, stream))
+        {
+          return NULL;
+        }
+      else
+        {
+          g_lineno++;
+          if (g_debug)
+            {
+              printf("Line: %s\n", g_line);
+            }
+
+          ptr = skip_space(g_line);
+          if (*ptr && *ptr != '#' && *ptr != '\n')
+            {
+              return ptr;
+            }
+        }
+    }
+}
+
+int parse_csvline(char *ptr)
+{
+  int nparms;
+  int i;
+
+  /* Format "arg1","arg2","arg3",... Spaces will be tolerated outside of the
+   * quotes.  Any initial spaces have already been skipped so the first thing
+   * should be '"'.
+   */
+
+  if (*ptr != '"')
+    {
+      fprintf(stderr, "%d: Bad line: \"%s\"\n", g_lineno, g_line);
+      exit(2);
+    }
+
+  ptr++;
+  nparms = 0;
+
+  do
+    {
+      ptr = copy_parm(ptr, &g_parm[nparms][0]);
+      nparms++;
+      ptr = find_parm(ptr);
+    }
+  while (ptr);
+
+  if (g_debug)
+    {
+      printf("Parameters: %d\n", nparms);
+      for (i = 0; i < nparms; i++)
+        {
+          printf("  Parm%d: \"%s\"\n", i+1, g_parm[i]);
+        }
+    }
+  return nparms;
+}
diff --git a/nuttx/tools/csvparser.h b/nuttx/tools/csvparser.h
new file mode 100644
index 0000000000..872dc3c020
--- /dev/null
+++ b/nuttx/tools/csvparser.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+ * tools/csvparser.h
+ *
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+#ifndef __TOOLS_CSVPARSER_H
+#define __TOOLS_CSVPARSER_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdbool.h>
+#include <limits.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define LINESIZE      (PATH_MAX > 256 ? PATH_MAX : 256)
+
+#define MAX_FIELDS    16
+#define MAX_PARMSIZE  128
+#define NAME_INDEX    0
+#define HEADER_INDEX  1
+#define COND_INDEX    2
+#define RETTYPE_INDEX 3
+#define PARM1_INDEX   4
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+extern bool g_debug;
+extern char g_line[LINESIZE+1];
+extern char g_parm[MAX_FIELDS][MAX_PARMSIZE];
+extern int  g_lineno;
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+char *read_line(FILE *stream);
+int parse_csvline(char *ptr);
+
+#endif /* __TOOLS_CSVPARSER_H */
diff --git a/nuttx/tools/define.sh b/nuttx/tools/define.sh
index 8b2b0e364c..c53cb92a83 100755
--- a/nuttx/tools/define.sh
+++ b/nuttx/tools/define.sh
@@ -2,7 +2,7 @@
 # tools/define.sh
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/nuttx/tools/indent.sh b/nuttx/tools/indent.sh
index 938502e0f9..739b791bdc 100755
--- a/nuttx/tools/indent.sh
+++ b/nuttx/tools/indent.sh
@@ -3,7 +3,7 @@
 # tools/indent.sh
 #
 #   Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/nuttx/tools/link.sh b/nuttx/tools/link.sh
index 7927d65c83..da1e6e7ae5 100755
--- a/nuttx/tools/link.sh
+++ b/nuttx/tools/link.sh
@@ -3,7 +3,7 @@
 # tools/link.sh
 #
 #   Copyright (C) 2008 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/nuttx/tools/mkdeps.sh b/nuttx/tools/mkdeps.sh
index 6d83f2ca01..acb6001509 100755
--- a/nuttx/tools/mkdeps.sh
+++ b/nuttx/tools/mkdeps.sh
@@ -3,7 +3,7 @@
 # tools/mkdeps.sh
 #
 #   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/nuttx/tools/mknulldeps.sh b/nuttx/tools/mknulldeps.sh
index 6dc3e9635b..033205e6fb 100755
--- a/nuttx/tools/mknulldeps.sh
+++ b/nuttx/tools/mknulldeps.sh
@@ -2,7 +2,7 @@
 # tools/mknulldeps.sh
 #
 #   Copyright (C) 2008 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/nuttx/tools/mkromfsimg.sh b/nuttx/tools/mkromfsimg.sh
index b628d24196..b774119800 100755
--- a/nuttx/tools/mkromfsimg.sh
+++ b/nuttx/tools/mkromfsimg.sh
@@ -3,7 +3,7 @@
 # tools/mkromfsimg.sh
 #
 #   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/nuttx/tools/mksymtab.c b/nuttx/tools/mksymtab.c
new file mode 100644
index 0000000000..14101f3d9d
--- /dev/null
+++ b/nuttx/tools/mksymtab.c
@@ -0,0 +1,277 @@
+/****************************************************************************
+ * tools/mksymtab.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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 <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "csvparser.h"
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+#define MAX_HEADER_FILES 500
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const char *g_hdrfiles[MAX_HEADER_FILES];
+static int nhdrfiles;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void show_usage(const char *progname)
+{
+  fprintf(stderr, "USAGE: %s <cvs-file> <symtab-file>\n\n", progname);
+  fprintf(stderr, "Where:\n\n");
+  fprintf(stderr, "  <cvs-file>   : The path to the input CSV file\n");
+  fprintf(stderr, "  <symtab-file>: The path to the output symbol table file\n");
+  fprintf(stderr, "  -d           : Enable debug output\n");
+  exit(EXIT_FAILURE);
+}
+
+static bool check_hdrfile(const char *hdrfile)
+{
+  int i;
+
+  for (i = 0; i < nhdrfiles; i++)
+    {
+      if (strcmp(g_hdrfiles[i], hdrfile) == 0)
+        {
+          return true;
+        }
+    }
+
+  return false;
+}
+
+static void add_hdrfile(const char *hdrfile)
+{
+  if (!check_hdrfile(hdrfile))
+    {
+      if (nhdrfiles > MAX_HEADER_FILES)
+        {
+          fprintf(stderr, "ERROR:  Too man header files.  Increase MAX_HEADER_FILES\n");
+          exit(EXIT_FAILURE);
+        }
+
+      g_hdrfiles[nhdrfiles] = strdup(hdrfile);
+      nhdrfiles++;
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char **argv, char **envp)
+{
+  char *csvpath;
+  char *symtab;
+  char *terminator;
+  char *ptr;
+  bool cond;
+  FILE *instream;
+  FILE *outstream;
+  int ch;
+  int i;
+
+  /* Parse command line options */
+
+  g_debug = false;
+
+  while ((ch = getopt(argc, argv, ":d")) > 0)
+    {
+      switch (ch)
+        {
+          case 'd' :
+            g_debug = true;
+            break;
+
+          case '?' :
+            fprintf(stderr, "Unrecognized option: %c\n", optopt);
+            show_usage(argv[0]);
+
+          case ':' :
+            fprintf(stderr, "Missing option argument, option: %c\n", optopt);
+            show_usage(argv[0]);
+
+           break;
+            fprintf(stderr, "Unexpected option: %c\n", ch);
+            show_usage(argv[0]);
+        }
+    }
+
+  if (optind >= argc)
+    {
+       fprintf(stderr, "Missing <cvs-file> and <symtab-file>\n");
+       show_usage(argv[0]);          
+    }
+
+  csvpath = argv[optind];
+  optind++;
+
+  if (optind >= argc)
+    {
+       fprintf(stderr, "Missing <symtab-file>\n");
+       show_usage(argv[0]);      
+    }
+
+  symtab = argv[optind];
+  optind++;
+
+  if (optind < argc)
+    {
+       fprintf(stderr, "Unexpected garbage at the end of the line\n");
+       show_usage(argv[0]);      
+    }    
+
+  /* Open the CSV file for reading */
+
+  instream = fopen(csvpath, "r");
+  if (!instream)
+    {
+      fprintf(stderr, "open %s failed: %s\n", csvpath, strerror(errno));
+      exit(EXIT_FAILURE);
+    }
+
+  /* Open the Symbol table file for writing */
+
+  outstream = fopen(symtab, "w");
+  if (!outstream)
+    {
+      fprintf(stderr, "open %s failed: %s\n", csvpath, strerror(errno));
+      exit(EXIT_FAILURE);
+    }
+
+  /* Get all of the header files that we need to include */
+
+  while ((ptr = read_line(instream)) != NULL)
+    {
+      /* Parse the line from the CVS file */
+
+      int nargs = parse_csvline(ptr);
+      if (nargs < PARM1_INDEX)
+        {
+          fprintf(stderr, "Only %d arguments found: %s\n", nargs, g_line);
+          exit(EXIT_FAILURE);
+        }
+
+      /* Add the header file to the list of header files we need to include */
+
+      add_hdrfile(g_parm[HEADER_INDEX]);
+    }
+
+  /* Back to the beginning */
+
+  rewind(instream);
+
+  /* Output up-front file boilerplate */
+
+  fprintf(outstream, "/* %s: Auto-generated symbol table.  Do not edit */\n\n", symtab);
+  fprintf(outstream, "#include <nuttx/config.h>\n");
+  fprintf(outstream, "#include <nuttx/symtab.h>\n\n");
+
+  /* Output all of the require header files */
+
+  for (i = 0; i < nhdrfiles; i++)
+    {
+      fprintf(outstream, "#include <%s>\n", g_hdrfiles[i]);
+    }
+
+  /* Now the symbol table itself */
+
+  fprintf(outstream, "\nstruct symtab_s g_symtab[] =\n");
+  fprintf(outstream, "{\n");
+
+  /* Parse each line in the CVS file */
+
+  terminator = "";
+  while ((ptr = read_line(instream)) != NULL)
+    {
+      /* Parse the line from the CVS file */
+
+      int nargs = parse_csvline(ptr);
+      if (nargs < PARM1_INDEX)
+        {
+          fprintf(stderr, "Only %d arguments found: %s\n", nargs, g_line);
+          exit(EXIT_FAILURE);
+        }
+
+      /* Output any conditional compilation */
+
+      cond = (g_parm[COND_INDEX] && strlen(g_parm[COND_INDEX]) > 0);
+      if (cond)
+        {
+          fprintf(outstream, "%s#if %s\n", terminator, g_parm[COND_INDEX]);
+          terminator = "";
+        }
+
+      /* Output the symbol table entry */
+
+      fprintf(outstream, "%s  { \"%s\", (FAR const void *)%s }",
+              terminator, g_parm[NAME_INDEX], g_parm[NAME_INDEX]);
+      terminator = ",\n";
+
+      if (cond)
+        {
+          fprintf(outstream, "%s#endif", terminator);
+          terminator = "\n";
+        }
+    }
+
+  fprintf(outstream, "\n};\n");
+
+  /* Close the CSV and symbol table files and exit */
+
+  fclose(instream);
+  fclose(outstream);
+  return EXIT_SUCCESS;
+}
diff --git a/nuttx/tools/mksyscall.c b/nuttx/tools/mksyscall.c
index a8f2cf99b7..a75e82d280 100644
--- a/nuttx/tools/mksyscall.c
+++ b/nuttx/tools/mksyscall.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * tools/mksyscall.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,174 +41,26 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
-#include <ctype.h>
 #include <unistd.h>
-#include <getopt.h>
 #include <errno.h>
 
+#include "csvparser.h"
+
 /****************************************************************************
  * Definitions
  ****************************************************************************/
 
-#define LINESIZE      (PATH_MAX > 256 ? PATH_MAX : 256)
-
-#define MAX_FIELDS    16
-#define MAX_PARMSIZE  128
-#define NAME_INDEX    0
-#define HEADER_INDEX  1
-#define COND_INDEX    2
-#define RETTYPE_INDEX 3
-#define PARM1_INDEX   4
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
-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;
-static int g_lineno;
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
-static char *skip_space(char *ptr)
-{
-  while (*ptr && isspace(*ptr)) ptr++;
-  return ptr;
-}
-
-static char *read_line(FILE *stream)
-{
-  char *ptr;
-
-  for (;;)
-    {
-      g_line[LINESIZE] = '\0';
-      if (!fgets(g_line, LINESIZE, stream))
-        {
-          return NULL;
-        }
-      else
-        {
-          g_lineno++;
-          if (g_debug)
-            {
-              printf("Line: %s\n", g_line);
-            }
-
-          ptr = skip_space(g_line);
-          if (*ptr && *ptr != '#' && *ptr != '\n')
-            {
-              return ptr;
-            }
-        }
-    }
-}
-
-static char *copy_parm(char *src, char *dest)
-{
-  char *start = src;
-  int i;
-
-  for (i = 0; i < MAX_PARMSIZE; i++)
-    {
-      if (*src == '"')
-        {
-          *dest = '\0';
-          return src;
-        }
-      else if (*src == '\n' || *src == '\0')
-        {
-          fprintf(stderr, "%d: Unexpected end of line: \"%s\"\n", g_lineno, start);
-          exit(4);
-        }
-      else
-        {
-          *dest++ = *src++;
-        }
-    }
-
-  fprintf(stderr, "%d: Parameter too long: \"%s\"\n", g_lineno, start);
-  exit(3);
-}
-
-static char *find_parm(char *ptr)
-{
-  char *start = ptr;
-
-  if (*ptr != '"')
-    {
-      fprintf(stderr, "%d: I'm confused: \"%s\"\n", g_lineno, start);
-      exit(5);
-    }
-  ptr++;
-
-  ptr = skip_space(ptr);
-  if (*ptr == '\n' || *ptr == '\0')
-    {
-      return NULL;
-    }
-  else if (*ptr != ',')
-    {
-      fprintf(stderr, "%d: Expected ',': \"%s\"\n", g_lineno, start);
-      exit(6);
-    }
-  ptr++;
-
-  ptr = skip_space(ptr);
-  if (*ptr != '"')
-    {
-      fprintf(stderr, "%d: Expected \": \"%s\"\n", g_lineno, start);
-      exit(7);
-    }
-  ptr++;
-
-  return ptr;
-}
-
-static int parse_csvline(char *ptr)
-{
-  int nparms;
-  int i;
-
-  /* Format "arg1","arg2","arg3",... Spaces will be tolerated outside of the
-   * quotes.  Any initial spaces have already been skipped so the first thing
-   * should be '"'.
-   */
-
-  if (*ptr != '"')
-    {
-      fprintf(stderr, "%d: Bad line: \"%s\"\n", g_lineno, g_line);
-      exit(2);
-    }
-
-  ptr++;
-  nparms = 0;
-
-  do
-    {
-      ptr = copy_parm(ptr, &g_parm[nparms][0]);
-      nparms++;
-      ptr = find_parm(ptr);
-    }
-  while (ptr);
-
-  if (g_debug)
-    {
-      printf("Parameters: %d\n", nparms);
-      for (i = 0; i < nparms; i++)
-        {
-          printf("  Parm%d: \"%s\"\n", i+1, g_parm[i]);
-        }
-    }
-  return nparms;
-}
-
 static bool is_vararg(const char *type, int index, int nparms)
 {
   if (strcmp(type,"...") == 0)
@@ -719,6 +571,7 @@ static void show_usage(const char *progname)
   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");
+  fprintf(stderr, "\t-d : Enable debug output\n");
   exit(1);
 }
 
diff --git a/nuttx/tools/mkversion.c b/nuttx/tools/mkversion.c
index f2086d13a5..32068df38b 100644
--- a/nuttx/tools/mkversion.c
+++ b/nuttx/tools/mkversion.c
@@ -2,7 +2,7 @@
  * tools/mkversion.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions