Changeset 16fd5a9 in rtems

Timestamp:

08/15/06 21:02:55 (17 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

67eede5

Parents:

5f88544

Message:

2006-08-15 Kolja Waschk <kawk@…>

• linkcmds.c, linkcmds.h, memory.c, memory.h, sample.ptf: New files.
• bridges.c: corrected detection of bridged connections
• clocks.c: removed a printf
• linkcmds.[ch] new files, added output of linker script
• Makefile.am: added new files
• memory.[ch]: new files, detection of memory in SOPC configuration
• nios2gen.c: updated command line parsing and output control
• output.[ch]: improved output of BSP header file
• ptf.[ch]: added ptf_dump_ptf_item and small fixes
• sample.ptf: new file, sample configuration for nios2gen
• README: updated

Location:

tools/cpu/nios2

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• README (modified) (2 diffs)
• bridges.c (modified) (2 diffs)
• clocks.c (modified) (1 diff)
• linkcmds.c (added)
• linkcmds.h (added)
• memory.c (added)
• memory.h (added)
• nios2gen.c (modified) (9 diffs)
• output.c (modified) (4 diffs)
• output.h (modified) (1 diff)
• ptf.c (modified) (5 diffs)
• ptf.h (modified) (1 diff)
• sample.ptf (added)

tools/cpu/nios2/ChangeLog

@@ +1 @@
+2006-08-15      Kolja Waschk <kawk@telos.de>
+
+        * linkcmds.c, linkcmds.h, memory.c, memory.h, sample.ptf: New files.
+        * bridges.c: corrected detection of bridged connections
+        * clocks.c: removed a printf
+        * linkcmds.[ch] new files, added output of linker script
+        * Makefile.am: added new files
+        * memory.[ch]: new files, detection of memory in SOPC configuration
+        * nios2gen.c: updated command line parsing and output control
+        * output.[ch]: improved output of BSP header file
+        * ptf.[ch]: added ptf_dump_ptf_item and small fixes
+        * sample.ptf: new file, sample configuration for nios2gen
+        * README: updated
+
 2006-08-10      Joel Sherrill <joel@oarcorp.com>
 

tools/cpu/nios2/Makefile.am

@@ -12 +12 @@
                                    clocks.c clocks.h \
                                    output.c output.h \
+                                   linkcmds.c linkcmds.h \
+                                   memory.c memory.h \
                    ptf.h ptf.c
 

tools/cpu/nios2/README

@@ -1 +1 @@
 $Id$
-
-As an output from SOPC Builder you get a file with extension ".ptf" that fully
-describes the SOPC, including all CPUs, memory and integrated peripherals.
-
-It is structured as 
-
-
-
 
 nios2gen:
   Tool to generate BSP data for boards utilizing NIOS2 soft core processor.
 
-Specify the PTF and name of the CPU (if there are more than one).
+=================================
+What it does
+
+It creates a sopc.h and linkcmds file for RTEMS nios2 BSPs from one or more inputs:
+
+1. SOPC System Description PTF
+
+As an output from SOPC Builder you get a file with extension ".ptf" that fully
+describes the SOPC, including all CPUs, memory and integrated peripherals.
+(PTF simply means "plain-text file").
+
+2. BSP Configuration PTF
+
+This file, using the same format as the SOPC System Description PTF, describes
+which components of the SOPC shall be used by the BSP. For example, there may
+be several timers, but a BSP wants at least one named "CLOCK" and optionally
+another named "TIMER". This mapping can be specified in the BSP.
+
+=================================
+Contents of the configuration PTF
+
+There can be definitions of ...
+
+HEADER: This is written to sopc.h before anything else. Example:
+
+  HEADER = "
+  #ifndef __SOPC_H
+  #define __SOPC_H 1
+  ";
+
+EPILOG: This is written to sopc.h after anything else. Example:
+
+  EPILOG = "
+  #endif
+  ";
+
+CLOCKS section: Used to specify names for clocks to be used in definitions in 
+the sopc.h. The default name (if none is specified here) is the uppercased name
+as in the system description PTF. Specify the name you want on the left, the
+name in the sopc PTF on the right! Example:
+
+  CLOCKS
+  {
+    GLOBAL_CLOCK = "sys_clk";
+  }
+
+MODULES section: Same as clocks but for modules / peripherals. As a special definition,
+if the PTF contains more than one nios2 CPU, it /must/ define a CPU to use. Example to
+select cpu_0 and rename timer_0 to CLOCK and timer_1 to TIMER:
+
+  MODULES
+  {
+    CPU = "cpu_0";
+    CLOCK = "timer_0";
+    TIMER = "timer_1";
+  }
+
+CLASS xyz sections: These specify what you want in the sopc.h, and how the definitions
+shall be named. Actually, the CLASS xyz should look exactly like the corresponding MODULE
+specification in the system description PTF of modules belonging to that class; e.g. a
+a JTAG UART is originally described like this:
+
+   MODULE jtag_uart_0
+   {
+      class = "altera_avalon_jtag_uart";
+      class_version = "1.0";
+      iss_model_name = "altera_avalon_jtag_uart";
+      SLAVE avalon_jtag_slave
+      {
+         SYSTEM_BUILDER_INFO
+         {
+            Bus_Type = "avalon";
+            Is_Printable_Device = "1";
+            Address_Alignment = "native";
+            Address_Width = "1";
+            Data_Width = "32";
+            Has_IRQ = "1";
+            Read_Wait_States = "peripheral_controlled";
+            Write_Wait_States = "peripheral_controlled";
+            JTAG_Hub_Base_Id = "0x04006E";
+            JTAG_Hub_Instance_Id = "0";
+            MASTERED_BY cpu_0/data_master
+            {
+               priority = "1";
+            }
+            IRQ_MASTER cpu_0/data_master
+            {
+               IRQ_Number = "2";
+            }
+            Base_Address = "0x08000000";
+         }
+      }
+      ...
+   } 
+
+If you want to have definitions about its base address and irq number in your sopc.h,
+define a CLASS for altera_avalon_jtag_uart that matches the MODULE description above,
+but instead of values for the items you specify names to be used in your sopc.h (You
+can omit items from the MODULE as you like, but the section nesting must match; and
+section names (such as avalon_jtag_slave for the SLAVE section) also have to match)
+
+   CLASS altera_avalon_jtag_uart
+   {
+       SLAVE avalon_jtag_slave
+       {
+           SYSTEM_BUILDER_INFO
+           {
+               Base_Address = "BASE_ADDR";
+               IRQ_MASTER { IRQ_Number = "IRQ"; }
+           }
+       }
+   }
+
+The output for jtag_uart_0 will be:
+
+   #define JTAG_UART_BASE_ADDR 0x021208D0
+   #define JTAG_UART_IRQ 1
+
+There are some values with special meaning to nios2gen,
+
+N2G_CLOCKREF_CLOCK: This should be used whereever the value in the SOPC PTF
+specifies the name of a clock. nios2gen will use whatever you  configured for
+the selected clock in your CLOCKS section.
+
+N2G_CLOCKREF_DEVICE: This should be used whereever the value in the SOPC PTF
+specifies the name of a module. nios2gen will use whatever you  configured for
+the selected module in your MODULES section.
+
+Additionally, you can specify items in your CLASSes so that nios2gen will include
+constant definitions in the sopc.h whenever such CLASS is present. The format is
+
+  N2G_DEFINE_xyz = "123"
+
+and will result in 
+
+#define MODULENAME_xyz 123
 
 
@@ -18 +145 @@
 
 
+
+

tools/cpu/nios2/bridges.c

@@ -30 +30 @@
  */
 
+#include <string.h>
+#include <stdlib.h>
+
 #include "ptf.h"
 #include "bridges.h"
@@ -41 +44 @@
   bus_bridge_pair *bbp;
 
-  curr_master = dev_master;
-  while(curr_master != NULL)
+  if(strcmp(cpu_master, dev_master) == 0) return 1; /* cpu directly masters dev */
+
+  for(bbp = bridges; bbp != NULL; bbp=bbp->next)
   {
-    /* Does cpu_master master curr_master? */
-    if(strcmp(cpu_master, curr_master) == 0) return 1; /* yes, cpu_masters cm */
-
-    /* No, cm is attached to a bridge? */
-    bbp = bridges;
-    while(bbp != NULL)
+    if(strcmp(cpu_master, bbp->mastered_by) == 0 && 
+       is_bridged(bbp->bridges_to, dev_master, bridges))
     {
-      if(strcmp(bbp->bridges_to, curr_master) == 0)
-      {
-        curr_master = bbp->mastered_by;
-        break;
-      };
-      bbp = bbp->next;
-    };
-    if(bbp == NULL) curr_master = NULL;
+      return 1; /* cpu masters dev via bridge */
+    }
   };
 

tools/cpu/nios2/clocks.c

@@ -24 +24 @@
 
   new_clock->freq = strtoul(pi->item[pi->level]->value, 0, 0);
-  printf("freq = %lu (%s?)\n", new_clock->freq, pi->item[pi->level]->value);
 
   new_clock->cfgname = NULL;

tools/cpu/nios2/nios2gen.c

@@ -17 +17 @@
 #include "clocks.h"
 #include "devices.h"
+#include "memory.h"
 #include "output.h"
+#include "linkcmds.h"
+
+#define NIOS2GEN_PACKAGE PACKAGE
+#define NIOS2GEN_VERSION VERSION
+
+#include "getopt.h"
 
 /********************************************************/
@@ -65 +72 @@
 }
 
-void usage()
-{
-printf(
-  "Usage: nios2gen [PTFFILE]\n"
-  "Generate BSP data based upon PTF file from SOPC Builder.\n"
-  "\n"
-  "Please specify the name of a nios2gen PTF file that describes where to\n"
-  "find the system description PTF from SOPC Builder on the command line.\n"
-);
-}
-
-void version()
-{
-printf(
-  "RTEMS/NIOS nios2gen\n"
+/********************************************************/
+
+void version(FILE *f)
+{
+fprintf(f,
+  "nios2gen (" __DATE__ ")\n"
   "  Copyright (c) 2006 Kolja Waschk rtemsdev/ixo.de\n"
   "\n"
@@ -85 +83 @@
   "  found in the file LICENSE in this distribution or at\n"
   "  http://www.rtems.com/license/LICENSE.\n"
+  , VERSION
 );
+}
+
+void usage (FILE *f, char *errmsg)
+{
+  char *info = "Purpose:\n  Create RTEMS nios2 BSP configuration from Altera SOPC description\n";
+  if(errmsg) info=errmsg;
+  version(f);
+  fprintf(f,"\n%s\nUsage: nios2gen [OPTIONS] <SOPC PTF> [CONFIG PTF] [CONFIG PTF]...\n", info);
+  fprintf(f,"   -h         --help               Print help and exit\n");
+  fprintf(f,"   -V         --version            Print version and exit\n");
+  fprintf(f,"   -bFILENAME --bspheader=FILENAME Output BSP configuration header file (default='sopc.h')\n");
+  fprintf(f,"   -B         --no-bspheader       Do not output BSP configuration header file\n");
+  fprintf(f,"   -lFILENAME --linkcmds=FILENAME  Output linker script (default='linkcmds')\n");
+  fprintf(f,"   -L         --no-linkcmds        Do not output linker script\n");
+  fprintf(f,"   -pFILENAME --parsed=FILENAME    Output PTF contents as long list (default: don't)\n");
+  fprintf(f,"   -P         --no-parsed          Do not output PTF contents as long list\n");
+  fprintf(f,"   -q         --quiet              Do not print progress info to stdout\n\n");
+  fprintf(f,"Using \"-\" as the FILENAME means standard output (stdout).\n");
 }
 
@@ -97 +114 @@
     bus_bridge_pair *bridges;
     clock_desc *clocks;
-
-    if (argc<2)
-    {
-        usage();
+    memory_desc *memory;
+
+    int verbose = 1;
+    int output_order = 127;
+    char *parsed_filename = NULL;
+    int output_parsed = 0;
+    char *bspheader_filename = "sopc.h";
+    int output_bspheader = 1;
+    char *linkcmds_filename = "linkcmds";
+    int output_linkcmds = 2;
+
+    optarg = 0;
+    optind = 1;
+    opterr = 1;
+    optopt = '?';
+
+    if(argc > 126)
+    {
+      usage(stderr,"Too many commandline arguments!\n");
+      return -1;
+    };
+
+    while(1)
+    {
+      int c, long_index = 0;
+      static char *optstring = "hVBb:Ll:Pp:q";
+
+      static struct option long_options[] =
+      {
+        { "help",           0, NULL, 'h' },
+        { "version",        0, NULL, 'V' },
+        { "no-bspheader",   0, NULL, 'B' },
+        { "bspheader",      1, NULL, 'b' },
+        { "no-linkcmds",    0, NULL, 'L' },
+        { "linkcmds",       1, NULL, 'l' },
+        { "no-parsed",      0, NULL, 'P' },
+        { "parsed",         1, NULL, 'p' },
+        { "quiet",          0, NULL, 'q' },
+        { NULL, 0, NULL, 0 }
+      };
+
+      c = getopt_long (argc, argv, optstring, long_options, &long_index);
+
+      if(c == -1) break; /* Exit from while(1) loop */
+
+      switch(c)
+      {
+      case 'q': /* Be quiet */
+        verbose = 0;
+        break;
+
+      case 'h': /* Print help and exit */
+        usage(stdout,NULL);
+        return 0;
+
+      case 'V': /* Print version and exit */
+        version(stdout);
+        return 0;
+
+      case 'B': /* Do not output BSP configuration header file */
+        output_bspheader = 0;
+        break;
+
+      case 'b': /* Output BSP configuration header file */
+        bspheader_filename = optarg;
+        output_bspheader = output_order;
+        output_order--;
+        break;
+
+      case 'L': /* Do not output linker script */ 
+        output_linkcmds = 0;
+        break;
+
+      case 'l': /* Output linker script */
+        linkcmds_filename = optarg;
+        output_linkcmds = output_order;
+        output_order--;
+        break;
+
+      case 'P': /* Do not output PTF contents */
+        output_parsed = 0;
+        break;
+
+      case 'p': /* Output PTF contents as long list */
+        parsed_filename = optarg;
+        output_parsed = output_order;
+        output_order--;
+        break;
+
+      case 0:
+      case '?':
         return -1;
-    };
-
-    if ( !strcmp(argv[1], "--help") || !strcmp(argv[1],"-?") ) {
-        usage();
-        return 0;
-    };
-
-    if ( !strcmp(argv[1], "--version") ) {
-        version();
-        return 0;
-    };
-
-    cfg = ptf_parse_file(argv[1]);
-    if(cfg == NULL)
-    {
-        fprintf(stderr, "Couldn't parse '%s'.\n", argv[1]);
+
+      default:
+        fprintf(stderr, "%s: unknown option: %c\n", NIOS2GEN_PACKAGE, c);
+      };
+    };
+
+    if(optind >= argc)
+    {
+        usage(stderr,"No PTF specified!\n");
         return -1;
     };
 
-    printf("Successfully read config PTF file %s.\n", argv[1]);
-
-    /********************************************************/
+    /********************************************************/
+
+    sopc = ptf_parse_file(argv[optind]);
+    if(sopc == NULL)
+    {
+        fprintf(stderr, "Could not parse system description PTF '%s'.\n", argv[optind]);
+        return -1;
+    };
+
+    if(verbose) printf("Successfully read SOPC PTF file %s.\n", argv[optind]);
+
+    /********************************************************/
+
+    cfg = NULL;
+
+    for(optind++;optind<argc;optind++)
+    {
+      struct ptf *morecfg = ptf_parse_file(argv[optind]);
+
+      if(morecfg == NULL)
+      {
+        fprintf(stderr, "Couldn't parse '%s'.\n", argv[optind]);
+        return -1;
+      };
+  
+      if(verbose) printf("Successfully read config PTF file %s.\n", argv[optind]);
+
+      cfg = ptf_concat(cfg, morecfg);
+    };
+
+    /********************************************************/
+    /* Pull in include files specified in the configs; */
+    /* Only one level is read; included files are not */
+    /* checked for further INCLUDEs */
 
     {
@@ -132 +260 @@
 
     /********************************************************/
-    
-    {
-      struct ptf *p;
-      struct ptf sopc_ptf_item = { item, "SOPC_PTF", 0, 0, 0 };
-      struct ptf_item sopc_ptf_spec = { 1, &sopc_ptf_item };
-      ptf_match(cfg, &sopc_ptf_spec, store_ptf_ptr, &p);
-
-      if(p == NULL)
-      {
-          fprintf(stderr, "Missing 'SOPC_PTF' filename in %s!\n", argv[1]);
-          return -1;
-      };
-
-      sopc = ptf_parse_file(p->value);
-      if(sopc == NULL)
-      {
-          fprintf(stderr, "Could not parse SOPC_PTF '%s'.\n", p->value);
-          return -1;
-      };
-
-      printf("Successfully read SOPC PTF file %s.\n", p->value);
-    };
-
-    /********************************************************/
     /* Find CPU */
 
-    printf("Looking for usable CPUs...\n");
-
+    if(verbose) printf("Looking for usable CPUs...\n");
+
+    /* Check if a CPU has been specified in the config PTF */
     {
       struct ptf modules         = { section, "MODULES", 0, 0, 0 };
@@ -168 +273 @@
     };
 
+    /* Look for CPUs in system description PTF */
     {
       int cpu_count;
@@ -181 +287 @@
       if(cpu_count > 1)
       {
-        printf("There is more than one CPU. Please specify the one\n");
-        printf("you want to use with this BSP in your config file.\n");
-        printf("The available CPUs are named as follows:\n");
+        fprintf(stderr, "There is more than one CPU. Please specify the one\n");
+        fprintf(stderr, "you want to use with this BSP in your config file.\n");
+        fprintf(stderr, "The available CPUs are named as follows:\n");
         ptf_match(sopc, &class_spec, printf_ptf_value, "  %s\n");
         return -1;  
@@ -190 +296 @@
       if(cpu_count == 0)
       {
-        printf("There is no NIOS2 cpu in the system.\n");
+        fprintf(stderr, "There is no NIOS2 cpu in the system.\n");
         return -1;  
       }
     };
 
-    printf("Using NIOS II CPU '%s'.\n", cpu->value);
-    printf("Only modules mastered by this CPU are considered now.\n");
+    if(verbose)
+    { 
+      printf("Using NIOS II CPU '%s'.\n", cpu->value);
+      printf("Only modules mastered by this CPU are considered now.\n");
+    };
+
+    /********************************************************/
+    /* Find Bridges */
+
+    if(verbose) printf("Looking for bus bridges...\n");
+
+    bridges = find_bridges(sopc);
+
+    if(verbose)
+    {
+      if(bridges)
+      {
+        bus_bridge_pair *bbp;
+        for(bbp = bridges; bbp; bbp=bbp->next)
+        {
+          printf("Found bridge: %s\n", bbp->mastered_by);
+          printf("               \\_%s\n", bbp->bridges_to);
+        };
+      }
+      else
+      {
+        printf("No bridges present.\n");
+      };
+    };
 
     /********************************************************/
     /* Find clocks */
 
-    printf("Looking for clock definitions...\n");
+    if(verbose) printf("Looking for clock definitions...\n");
 
     clocks = find_clocks(sopc, cfg);
 
-    if(clocks)
-    {
-      clock_desc *cs;
-      for(cs = clocks; cs; cs = cs->next)
-      {
-        printf("Found clock: %s (%lu Hz)\n", cs->name, cs->freq);
-      };
-    }
-    else
-    {
-      printf("No clocks present.\n");
-    };
-
-    /********************************************************/
-    /* Find Bridges */
-
-    printf("Looking for bus bridges...\n");
-
-    bridges = find_bridges(sopc);
-
-    if(bridges)
-    {
-      bus_bridge_pair *bbp;
-      for(bbp = bridges; bbp; bbp=bbp->next)
-      {
-        printf("Found bridge: %s\n", bbp->mastered_by);
-        printf("               \\_%s\n", bbp->bridges_to);
-      };
-    }
-    else
-    {
-      printf("No bridges present.\n");
+    if(verbose)
+    {
+      if(clocks)
+      {
+        clock_desc *cs;
+        for(cs = clocks; cs; cs = cs->next)
+        {
+          printf("Found clock \"%s\" (%lu Hz), naming it %s\n", cs->name, cs->freq, cs->cfgname);
+        };
+      }
+      else
+      {
+        printf("No clocks present.\n");
+      };
     };
 
@@ -242 +357 @@
     /* Find other devices available to the selected CPU */
 
+    if(verbose) printf("Looking for devices...\n");
+
     devices = find_devices(sopc, cfg, cpu, bridges);
 
-    fwrite_header_file(stdout, cfg, devices, clocks);
-
-    // ptf_printf(stdout, ptf, "");
-    // ptf_printf(stdout, cfg, "");
+    if(verbose)
+    {
+      if(devices)
+      {
+        device_desc *dd;
+        for(dd = devices; dd; dd=dd->next)
+        {
+          printf("Found device \"%s\", naming it %s\n", dd->ptf->value, dd->cfgname);
+        };
+      }
+      else
+      {
+        printf("No devices present.\n");
+      };
+    };
+
+    /********************************************************/
+    /* Find out which devices are actually memory */
+
+    if(verbose) printf("Looking for memory...\n");
+
+    memory = find_memory(devices);
+    
+    if(verbose)
+    {
+      if(memory)
+      {
+        memory_desc *md;
+        for(md = memory; md; md=md->next)
+        {
+          printf("Found memory in \"%s\", base=0x%08X, size=%lu bytes\n",
+                          md->dev->cfgname,
+                          md->base, md->size);
+        };
+      }
+      else
+      {
+        printf("None of the devices seems to provide memory?!\n");
+      };
+    };
+
+
+    /********************************************************/
+    /* Output files in the order they were specified
+       on the command line */
+
+    {
+      int i;
+      for(i=0;i<3;i++)
+      {
+        if(output_bspheader>0
+           && output_bspheader>=output_linkcmds
+           && output_bspheader>=output_parsed)
+        {
+          output_bspheader = 0;
+          if(bspheader_filename == NULL || (bspheader_filename[0]=='-' && bspheader_filename[1]==0))
+          {
+            fwrite_header_file(stdout, cfg, devices, clocks);
+          }
+          else
+          {
+            FILE *f = fopen(bspheader_filename, "w");
+            if(!f)
+            {
+              perror(bspheader_filename);
+              return -1;
+            }
+            else
+            {
+              fwrite_header_file(f, cfg, devices, clocks);
+              fclose(f);
+            }
+          }
+        };
+        if(output_linkcmds>0
+           && output_linkcmds>=output_bspheader
+           && output_linkcmds>=output_parsed)
+        {
+          output_linkcmds = 0;
+          if(linkcmds_filename == NULL || (linkcmds_filename[0]=='-' && linkcmds_filename[1]==0))
+          {
+            fwrite_linkcmds_file(stdout, cfg, cpu, devices, memory);
+          }
+          else
+          {
+            FILE *f = fopen(linkcmds_filename, "w");
+            if(!f)
+            {
+              perror(linkcmds_filename);
+              return -1;
+            }
+            else
+            {
+              fwrite_linkcmds_file(f, cfg, cpu, devices, memory);
+              fclose(f);
+            }
+          }
+        };
+        if(output_parsed>0
+           && output_parsed>=output_linkcmds
+           && output_parsed>=output_bspheader)
+        {
+          output_parsed = 0;
+          if(parsed_filename == NULL || (parsed_filename[0]=='-' && parsed_filename[1]==0))
+          {
+            ptf_printf(stdout, sopc, "");
+          }
+          else
+          {
+            FILE *f = fopen(parsed_filename, "w");
+            if(!f)
+            {
+              perror(parsed_filename);
+              return -1;
+            }
+            else
+            {
+              ptf_printf(f, sopc, "");
+              fclose(f);
+            }
+          }
+        };
+      }
+    };
+
+    if(verbose) printf("Done.\n");
 
     return 0;

tools/cpu/nios2/output.c

@@ -151 +151 @@
   struct ptf_item matchaclass = { 1, &aclass };
 
-  struct ptf header = { item, "HEADER", 0, 0, 0 };
-  struct ptf_item matchheader = { 1, &header };
+  struct ptf bspsect = { section, "BSPHEADER", 0, 0, 0 };
+  struct ptf leadtext = { item, "LEADTEXT", 0, 0, 0 };
+  struct ptf_item matchleadtext = { 2, &bspsect, &leadtext };
 
   struct ptf epilog = { item, "EPILOG", 0, 0, 0 };
-  struct ptf_item matchepilog = { 1, &epilog };
+  struct ptf_item matchepilog = { 2, &bspsect, &epilog };
 
   out_desc dinfo;
@@ -163 +164 @@
   dinfo.devices = devices;
 
-  ptf_match(cfg, &matchheader, fwrite_value, file);
+  ptf_match(cfg, &matchleadtext, fwrite_value, file);
 
   if(clocks)
@@ -178 +179 @@
     for(dinfo.dev = devices; dinfo.dev; dinfo.dev=dinfo.dev->next)
     {
-      fprintf(file, "\n");
+      /* fprintf(file, "\n#define SOPC_HAS_%s 1\n", dinfo.dev->cfgname); */
 
       p = ptf_find(dinfo.dev->ptf, &pi, item, "class", 0);
@@ -192 +193 @@
 }
 
-
  

tools/cpu/nios2/output.h

@@ -20 +20 @@
 #include "devices.h"
 
+void fwrite_value(struct ptf_item *pi, void *arg);
 void fwrite_header_file(FILE *file, struct ptf *cfg, device_desc *devices, clock_desc *clocks);
 

tools/cpu/nios2/ptf.c

@@ -10 +10 @@
 
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 #include "ptf.h"
@@ -365 +366 @@
     default:
 #if DEBUG&DEBUG_EXPECTATIONS
-      printf("Expectation: %d (???)\n", state->expectation);
+      printf("Expectation: %d (?)\n", state->expectation);
 #endif
 
@@ -507 +508 @@
 
   return state.tree;
+}
+
+/***************************************************************************/
+
+struct ptf *ptf_concat(struct ptf *a, struct ptf *b)
+{
+  struct ptf *leaf = a;
+
+  if(!a) return b;
+  if(!b) return a;
+
+  for(leaf = a; leaf->next != NULL; leaf = leaf->next);
+  leaf->next = b;
+  return a;
+}
+
+/***************************************************************************/
+
+void ptf_dump_ptf_item(FILE *f, struct ptf_item *pi)
+{
+  int i;
+  fprintf(f, "level=%d in %p\n", pi->level, pi);
+  for(i=pi->level;i>=0;i--)
+  {
+    if(pi->item[i] != NULL)
+    {
+      fprintf(f, "  %d: %s name=%s value=%s\n",
+        i,
+        pi->item[i]->type == item ? "item":"section",
+        pi->item[i]->name,
+        pi->item[i]->value);
+    }
+    else
+    {
+        fprintf(f, "  %d: NULL\n");
+    }
+    fflush(f);
+  }
 }
 
@@ -533 +572 @@
         if(leaf->value != NULL && leaf->value[0] != 0)
         {
-          strcat(new_prefix, "_");
+          strcat(new_prefix, ":");
           strcat(new_prefix, leaf->value);
         };
         strcat(new_prefix, "/");
         fputs(new_prefix, s);
-        fputs("\r\n", s);
+        fputs("\n", s);
         ptf_printf(s, leaf->sub, new_prefix);
         break;
@@ -549 +588 @@
         fputs(leaf->name, s);
         fputs(" = \"", s);
-        for(c=leaf->value; *c; c++)
-        {
-          if(*c=='\\' || *c=='"') putc('\\', s);
-          putc(*c, s);
-        };
-        fprintf(s, "\"\r\n");
+        if(leaf->value == NULL)
+        {
+          fputs("(NULL)", s);
+        }
+        else
+        {
+          for(c=leaf->value; *c; c++)
+          {
+            if(*c=='\\' || *c=='"') putc('\\', s);
+            putc(*c, s);
+          };
+        }
+        fprintf(s, "\"\n");
         break;
       };

tools/cpu/nios2/ptf.h

@@ -41 +41 @@
 
 struct ptf *ptf_parse_file(char *filename);
+struct ptf *ptf_concat(struct ptf *a, struct ptf *b);
 struct ptf *ptf_alloc_item(ptf_item_type t, char *name, char *value);
 void ptf_printf(FILE *s, struct ptf *tree, char *prefix);
+void ptf_dump_ptf_item(FILE *s, struct ptf_item *pi);
 
 struct ptf *ptf_find(