From ddb4c5f0ef7891023d099716f1750f50c3f46a59 Mon Sep 17 00:00:00 2001 From: tecodev Date: Mon, 10 Nov 2008 16:44:25 +0000 Subject: [PATCH] * device/lib/pic16/libdev/mkmk.sh: obey pics.all * device/lib/pic16/libio/mkmk.sh: properly match whole lines in .ignore files, fixes IO libs for 18f242, 18f252, 18f442, and 18f452 (patch by Nick Materer, #2253980) * device/lib/pic16/libio/adc.ignore, device/lib/pic16/libio/i2c.ignore, device/lib/pic16/libio/usart.ignore, device/lib/pic16/pics.all: updated to build more device libs * device/lib/pic16/libdev/Makefile.am, device/lib/pic16/libdev/Makefile.in, device/lib/pic16/libio/Makefile.am, device/lib/pic16/libio/Makefile.in: regenerated * src/pic16/device.c (pic16_dump_usection): fixed output of multiple names per memory location, applied SDCC style to more functions git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5261 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 20 + device/lib/pic16/libdev/Makefile.am | 25 - device/lib/pic16/libdev/Makefile.in | 25 - device/lib/pic16/libdev/mkmk.sh | 10 +- device/lib/pic16/libio/Makefile.am | 80 +- device/lib/pic16/libio/Makefile.in | 1916 ++++++++++++++++++++++++++- device/lib/pic16/libio/adc.ignore | 8 - device/lib/pic16/libio/i2c.ignore | 10 +- device/lib/pic16/libio/mkmk.sh | 9 +- device/lib/pic16/libio/usart.ignore | 9 +- device/lib/pic16/pics.all | 12 +- src/pic16/device.c | 525 ++++---- 12 files changed, 2248 insertions(+), 401 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10a45c98..cc710508 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2008-11-10 Raphael Neider + + * device/lib/pic16/libdev/mkmk.sh: obey pics.all + * device/lib/pic16/libio/mkmk.sh: properly match whole lines in + .ignore files, fixes IO libs for 18f242, 18f252, 18f442, and 18f452 + (patch by Nick Materer, #2253980) + + * device/lib/pic16/libio/adc.ignore, + device/lib/pic16/libio/i2c.ignore, + device/lib/pic16/libio/usart.ignore, + device/lib/pic16/pics.all: updated to build more device libs + + * device/lib/pic16/libdev/Makefile.am, + device/lib/pic16/libdev/Makefile.in, + device/lib/pic16/libio/Makefile.am, + device/lib/pic16/libio/Makefile.in: regenerated + + * src/pic16/device.c (pic16_dump_usection): fixed output of multiple + names per memory location, applied SDCC style to more functions + 2008-11-09 Gudjon I. Gudjonsson * device/include/mcs51/p89lpc933_4.h: new NXP header file diff --git a/device/lib/pic16/libdev/Makefile.am b/device/lib/pic16/libdev/Makefile.am index 431a59c6..fc596962 100644 --- a/device/lib/pic16/libdev/Makefile.am +++ b/device/lib/pic16/libdev/Makefile.am @@ -15,10 +15,6 @@ lib_LIBRARIES += libdev18f2220.a libdev18f2220_a_SOURCES = pic18f2220.c libdev18f2220_a_CFLAGS = -p18f2220 $(AM_CFLAGS) -#lib_LIBRARIES += libdev18f2221.a -#libdev18f2221_a_SOURCES = pic18f2221.c -#libdev18f2221_a_CFLAGS = -p18f2221 $(AM_CFLAGS) - lib_LIBRARIES += libdev18f2320.a libdev18f2320_a_SOURCES = pic18f2320.c libdev18f2320_a_CFLAGS = -p18f2320 $(AM_CFLAGS) @@ -43,10 +39,6 @@ lib_LIBRARIES += libdev18f2420.a libdev18f2420_a_SOURCES = pic18f2420.c libdev18f2420_a_CFLAGS = -p18f2420 $(AM_CFLAGS) -#lib_LIBRARIES += libdev18f2423.a -#libdev18f2423_a_SOURCES = pic18f2423.c -#libdev18f2423_a_CFLAGS = -p18f2423 $(AM_CFLAGS) - lib_LIBRARIES += libdev18f2431.a libdev18f2431_a_SOURCES = pic18f2431.c libdev18f2431_a_CFLAGS = -p18f2431 $(AM_CFLAGS) @@ -71,11 +63,6 @@ lib_LIBRARIES += libdev18f24j10.a libdev18f24j10_a_SOURCES = pic18f24j10.c libdev18f24j10_a_CFLAGS = -p18f24j10 $(AM_CFLAGS) -# Not supported by gputils as of 2008-11-01 -#lib_LIBRARIES += libdev18f2510.a -#libdev18f2510_a_SOURCES = pic18f2510.c -#libdev18f2510_a_CFLAGS = -p18f2510 $(AM_CFLAGS) - lib_LIBRARIES += libdev18f2515.a libdev18f2515_a_SOURCES = pic18f2515.c libdev18f2515_a_CFLAGS = -p18f2515 $(AM_CFLAGS) @@ -140,10 +127,6 @@ lib_LIBRARIES += libdev18f4220.a libdev18f4220_a_SOURCES = pic18f4220.c libdev18f4220_a_CFLAGS = -p18f4220 $(AM_CFLAGS) -#lib_LIBRARIES += libdev18f4221.a -#libdev18f4221_a_SOURCES = pic18f4221.c -#libdev18f4221_a_CFLAGS = -p18f4221 $(AM_CFLAGS) - lib_LIBRARIES += libdev18f4320.a libdev18f4320_a_SOURCES = pic18f4320.c libdev18f4320_a_CFLAGS = -p18f4320 $(AM_CFLAGS) @@ -168,10 +151,6 @@ lib_LIBRARIES += libdev18f4420.a libdev18f4420_a_SOURCES = pic18f4420.c libdev18f4420_a_CFLAGS = -p18f4420 $(AM_CFLAGS) -#lib_LIBRARIES += libdev18f4423.a -#libdev18f4423_a_SOURCES = pic18f4423.c -#libdev18f4423_a_CFLAGS = -p18f4423 $(AM_CFLAGS) - lib_LIBRARIES += libdev18f4431.a libdev18f4431_a_SOURCES = pic18f4431.c libdev18f4431_a_CFLAGS = -p18f4431 $(AM_CFLAGS) @@ -212,10 +191,6 @@ lib_LIBRARIES += libdev18f4520.a libdev18f4520_a_SOURCES = pic18f4520.c libdev18f4520_a_CFLAGS = -p18f4520 $(AM_CFLAGS) -#lib_LIBRARIES += libdev18f4523.a -#libdev18f4523_a_SOURCES = pic18f4523.c -#libdev18f4523_a_CFLAGS = -p18f4523 $(AM_CFLAGS) - lib_LIBRARIES += libdev18f4525.a libdev18f4525_a_SOURCES = pic18f4525.c libdev18f4525_a_CFLAGS = -p18f4525 $(AM_CFLAGS) diff --git a/device/lib/pic16/libdev/Makefile.in b/device/lib/pic16/libdev/Makefile.in index eac9e29b..98b2b62c 100644 --- a/device/lib/pic16/libdev/Makefile.in +++ b/device/lib/pic16/libdev/Makefile.in @@ -530,31 +530,6 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -#lib_LIBRARIES += libdev18f2221.a -#libdev18f2221_a_SOURCES = pic18f2221.c -#libdev18f2221_a_CFLAGS = -p18f2221 $(AM_CFLAGS) - -#lib_LIBRARIES += libdev18f2423.a -#libdev18f2423_a_SOURCES = pic18f2423.c -#libdev18f2423_a_CFLAGS = -p18f2423 $(AM_CFLAGS) - -# Not supported by gputils as of 2008-11-01 -#lib_LIBRARIES += libdev18f2510.a -#libdev18f2510_a_SOURCES = pic18f2510.c -#libdev18f2510_a_CFLAGS = -p18f2510 $(AM_CFLAGS) - -#lib_LIBRARIES += libdev18f4221.a -#libdev18f4221_a_SOURCES = pic18f4221.c -#libdev18f4221_a_CFLAGS = -p18f4221 $(AM_CFLAGS) - -#lib_LIBRARIES += libdev18f4423.a -#libdev18f4423_a_SOURCES = pic18f4423.c -#libdev18f4423_a_CFLAGS = -p18f4423 $(AM_CFLAGS) - -#lib_LIBRARIES += libdev18f4523.a -#libdev18f4523_a_SOURCES = pic18f4523.c -#libdev18f4523_a_CFLAGS = -p18f4523 $(AM_CFLAGS) lib_LIBRARIES = libdev18f1220.a libdev18f1320.a libdev18f2220.a \ libdev18f2320.a libdev18f2321.a libdev18f2331.a \ libdev18f2410.a libdev18f242.a libdev18f2420.a libdev18f2431.a \ diff --git a/device/lib/pic16/libdev/mkmk.sh b/device/lib/pic16/libdev/mkmk.sh index e8e33e62..403065e4 100755 --- a/device/lib/pic16/libdev/mkmk.sh +++ b/device/lib/pic16/libdev/mkmk.sh @@ -17,13 +17,11 @@ lib_LIBRARIES = HERE -ls -1 *.c | sort | while read file; do - arch=${file%.c}; - arch=${arch#pic}; +sed -e 's/\s*#.*$//' ../pics.all | grep -v '^\s*$' | sort | while read arch; do cat <>${arch}<<" >&2; cat < /dev/null 2>&1 || cat < /dev/null 2>&1 && { echo "No adc." >&2 ; } || cat < /dev/null 2>&1 || cat < /dev/null 2>&1 && { echo "No i2c." >&2 ; } || cat < /dev/null 2>&1 || cat < /dev/null 2>&1 && { echo "No usart." >&2 ; } || cat < #include "common.h" // Include everything in the SDCC src directory #include "newalloc.h" #include "dbuf_string.h" - #include "main.h" #include "pcode.h" #include "ralloc.h" #include "device.h" +void pic16_printIval (symbol * sym, sym_link * type, initList * ilist, char ptype, void *p); +extern void pic16_pCodeConstString (char *name, char *value, unsigned length); + stats_t statistics = { 0, 0, 0, 0 }; #define DEVICE_FILE_NAME "pic16devices.txt" static PIC16_device default_device = { - { "p18f452", "18f452", "pic18f452", "f452" }, - 0x600, - 0x80, - { /* configuration words */ - 0x300001, 0x30000d, - { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , - { 0x0f, 0, 0xff } /* 3 */ , { -1 , 0, 0xff } /* 4 */ , - { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , - { -1 , 0, 0xff } /* 7 */ , { 0x0f, 0, 0xff } /* 8 */ , - { 0xc0, 0, 0xff } /* 9 */ , { 0x0f, 0, 0xff } /* a */ , - { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , - { 0x40, 0, 0xff } /* d */ } - }, - { /* ID locations */ - 0x200000, 0x200007, - { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, - { 0, 0 }, { 0, 0 }, { 0, 0 } } - }, - NULL + { "p18f452", "18f452", "pic18f452", "f452" }, + 0x600, + 0x80, + { /* configuration words */ + 0x300001, 0x30000d, + { { 0x27, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , + { 0x0f, 0, 0xff } /* 3 */ , { -1 , 0, 0xff } /* 4 */ , + { 0x01, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , + { -1 , 0, 0xff } /* 7 */ , { 0x0f, 0, 0xff } /* 8 */ , + { 0xc0, 0, 0xff } /* 9 */ , { 0x0f, 0, 0xff } /* a */ , + { 0xe0, 0, 0xff } /* b */ , { 0x0f, 0, 0xff } /* c */ , + { 0x40, 0, 0xff } /* d */ } + }, + { /* ID locations */ + 0x200000, 0x200007, + { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, + { 0, 0 }, { 0, 0 }, { 0, 0 } } + }, + NULL }; PIC16_device *pic16 = &default_device; @@ -75,301 +68,371 @@ extern set *userIncDirsSet; extern char *iComments2; -void pic16_dump_equates(FILE *of, set *equs) +void +pic16_dump_equates (FILE *of, set *equs) { regs *r; - r = setFirstItem(equs); - if(!r)return; + r = setFirstItem (equs); + if (!r) + return; - fprintf(of, "%s", iComments2); - fprintf(of, ";\tEquates to used internal registers\n"); - fprintf(of, "%s", iComments2); + fprintf (of, "%s", iComments2); + fprintf (of, ";\tEquates to used internal registers\n"); + fprintf (of, "%s", iComments2); - for(; r; r = setNextItem(equs)) { - fprintf(of, "%s\tequ\t0x%02x\n", r->name, r->address); - } + for (; r; r = setNextItem (equs)) + { + fprintf (of, "%s\tequ\t0x%02x\n", r->name, r->address); + } // for } -void pic16_dump_access(FILE *of, set *section) +void +pic16_dump_access (FILE *of, set *section) { regs *r; - r = setFirstItem(section); - if(!r)return; + r = setFirstItem (section); + if (!r) + return; - fprintf(of, "%s", iComments2); - fprintf(of, ";\tAccess bank symbols\n"); - fprintf(of, "%s", iComments2); + fprintf (of, "%s", iComments2); + fprintf (of, ";\tAccess bank symbols\n"); + fprintf (of, "%s", iComments2); - fprintf(of, "\tudata_acs\n"); - for(; r; r = setNextItem(section)) { - fprintf(of, "%s\tres\t%d\n", r->name, r->size); - statistics.adsize += r->size; - } + fprintf (of, "\tudata_acs\n"); + for (; r; r = setNextItem (section)) + { + fprintf (of, "%s\tres\t%d\n", r->name, r->size); + statistics.adsize += r->size; + } // for } - -int regCompare(const void *a, const void *b) +int +regCompare (const void *a, const void *b) { const regs *const *i = a; const regs *const *j = b; - /* sort primarily by the address */ - if( (*i)->address > (*j)->address)return 1; - if( (*i)->address < (*j)->address)return -1; + /* Sort primarily by the address ... */ + if ((*i)->address > (*j)->address) + return (1); - /* and secondarily by size */ - /* register size sorting may have strange results use with care */ - if( (*i)->size > (*j)->size)return 1; - if( (*i)->size < (*j)->size)return -1; + if ((*i)->address < (*j)->address) + return (-1); - /* finally if in same address and same size sort by name */ - return (strcmp( (*i)->name, (*j)->name)); + /* ... and secondarily by size. */ + /* Register size sorting may have strange results, use with care! */ + if ((*i)->size > (*j)->size) + return (1); - return 0; + if ((*i)->size < (*j)->size) + return (-1); + + /* Finally, if in same address and same size, sort by name. */ + return (strcmp ((*i)->name, (*j)->name)); } -int symCompare(const void *a, const void *b) +int +symCompare (const void *a, const void *b) { const symbol *const *i = a; const symbol *const *j = b; - /* sort primarily by the address */ - if( SPEC_ADDR((*i)->etype) > SPEC_ADDR((*j)->etype))return 1; - if( SPEC_ADDR((*i)->etype) < SPEC_ADDR((*j)->etype))return -1; + /* Sort primarily by the address ... */ + if (SPEC_ADDR ((*i)->etype) > SPEC_ADDR ((*j)->etype)) + return (1); - /* and secondarily by size */ - /* register size sorting may have strange results use with care */ - if( getSize((*i)->etype) > getSize((*j)->etype))return 1; - if( getSize((*i)->etype) < getSize((*j)->etype))return -1; + if (SPEC_ADDR ((*i)->etype) < SPEC_ADDR ((*j)->etype)) + return (-1); - /* finally if in same address and same size sort by name */ - return (strcmp( (*i)->rname, (*j)->rname)); + /* ... and secondarily by size. */ + /* Register size sorting may have strange results, use with care! */ + if (getSize ((*i)->etype) > getSize ((*j)->etype)) + return (1); - return 0; + if (getSize ((*i)->etype) < getSize ((*j)->etype)) + return (-1); + + /* Finally, if in same address and same size, sort by name. */ + return (strcmp ((*i)->rname, (*j)->rname)); } -void pic16_dump_usection(FILE *of, set *section, int fix) +void +pic16_dump_usection (FILE *of, set *section, int fix) { - static int abs_usection_no=0; - static unsigned int usection_no=0; + static int abs_usection_no = 0; + static unsigned int usection_no = 0; regs *r, *rprev; unsigned int init_addr, i; regs **rlist; regs *r1; - /* put all symbols in an array */ - if (!elementsInSet(section)) return; - rlist = Safe_calloc(elementsInSet(section), sizeof(regs *)); - r = rlist[0]; i = 0; - for(rprev = setFirstItem(section); rprev; rprev = setNextItem(section)) { - rlist[i] = rprev; i++; - } + /* put all symbols in an array */ + if (!elementsInSet (section)) + return; - if(!i) { - if(rlist)Safe_free(rlist); - return; - } + rlist = Safe_calloc (elementsInSet (section), sizeof (regs *)); + r = rlist[0]; + i = 0; + for (rprev = setFirstItem (section); rprev; rprev = setNextItem (section)) + { + rlist[i] = rprev; + i++; + } // for - /* sort symbols according to their address */ - qsort(rlist, i /*elementsInSet(section)*/, sizeof(regs *), regCompare); + if (!i) + { + if (rlist) + Safe_free (rlist); - if(!fix) { + return; + } // if + /* sort symbols according to their address */ + qsort (rlist, i, sizeof (regs *), regCompare); + + if (!fix) + { #define EMIT_SINGLE_UDATA_SECTION 0 #if EMIT_SINGLE_UDATA_SECTION - fprintf(of, "\n\n\tudata\n"); - for(r = setFirstItem(section); r; r = setNextItem(section)) { - fprintf(of, "%s\tres\t%d\n", r->name, r->size); - statistics.udsize += r->size; - } + fprintf (of, "\n\n\tudata\n"); + for (r = setFirstItem (section); r; r = setNextItem (section)) + { + fprintf (of, "%s\tres\t%d\n", r->name, r->size); + statistics.udsize += r->size; + } // for #else - for(r = setFirstItem(section); r; r = setNextItem(section)) { - //fprintf(of, "\nudata_%s_%s\tudata\n", moduleName, r->name); - fprintf(of, "\nudata_%s_%u\tudata\n", moduleName, usection_no++); - fprintf(of, "%s\tres\t%d\n", r->name, r->size); - statistics.udsize += r->size; - } + for (r = setFirstItem (section); r; r = setNextItem (section)) + { + //fprintf (of, "\nudata_%s_%s\tudata\n", moduleName, r->name); + fprintf (of, "\nudata_%s_%u\tudata\n", moduleName, usection_no++); + fprintf (of, "%s\tres\t%d\n", r->name, r->size); + statistics.udsize += r->size; + } // for #endif - } else { - unsigned int j=0; - - rprev = NULL; - init_addr = (rlist[j]->address & 0x0FFF); // warning(s) emitted below - fprintf(of, "\n\nustat_%s_%02d\tudata\t0X%04X\n", moduleName, abs_usection_no++, (init_addr & 0x0FFF)); - - for(j=0;jaddress & 0x0FFF); // warning(s) emitted below + fprintf (of, "\n\nustat_%s_%02d\tudata\t0X%04X\n", moduleName, abs_usection_no++, (init_addr & 0x0FFF)); + + for (j = 0; j < i; j++) + { + r = rlist[j]; + r1 = NULL; + if (j < i - 1) + r1 = rlist[j + 1]; + + init_addr = (r->address & 0x0FFF); + if (init_addr != r->address) + { + fprintf (stderr, "%s: WARNING: Changed address of pinned variable %s from 0x%x to 0x%x\n", + moduleName, r->name, r->address, init_addr); + } // if - init_addr = (r->address & 0x0FFF); - if (init_addr != r->address) { - fprintf (stderr, "%s: WARNING: Changed address of pinned variable %s from 0x%x to 0x%x\n", - moduleName, r->name, r->address, init_addr); - } // if + if ((rprev && (init_addr != ((rprev->address & 0x0FFF) + prev_size)))) + fprintf (of, "\n\nustat_%s_%02d\tudata\t0X%04X\n", moduleName, abs_usection_no++, init_addr); - if((rprev && (init_addr != ((rprev->address & 0x0FFF) + rprev->size)))) { - fprintf(of, "\n\nustat_%s_%02d\tudata\t0X%04X\n", moduleName, abs_usection_no++, init_addr); - } + /* XXX: Does not handle partial overlap correctly. */ + if (r1 && (init_addr == (r1->address & 0x0FFF))) + { + prev_size = 0; + fprintf (of, "%-15s\n", r->name); + } + else + { + prev_size = r->size; + fprintf (of, "%-15s\tres\t%d\n", r->name, prev_size); + statistics.udsize += prev_size; + } - /* XXX: Does not handle partial overlap correctly. */ - if(r1 && (init_addr == (r1->address & 0x0FFF))) { - fprintf(of, "\n%s\tres\t0\n", r->name); - } else { - fprintf(of, "%s\tres\t%d\n", r->name, r->size); - statistics.udsize += r->size; - } + rprev = r; + } // for + } // if - rprev = r; - } - } - Safe_free(rlist); + Safe_free (rlist); } -void pic16_dump_gsection(FILE *of, set *sections) +void +pic16_dump_gsection (FILE *of, set *sections) { regs *r; sectName *sname; - for(sname = setFirstItem(sections); sname; sname = setNextItem(sections)) { - if(!strcmp(sname->name, "access"))continue; - fprintf(of, "\n\n%s\tudata\n", sname->name); + for (sname = setFirstItem (sections); sname; sname = setNextItem (sections)) + { + if (!strcmp (sname->name, "access")) + continue; + + fprintf (of, "\n\n%s\tudata\n", sname->name); - for(r=setFirstItem(sname->regsSet); r; r=setNextItem(sname->regsSet)) { + for (r = setFirstItem (sname->regsSet); r; r = setNextItem (sname->regsSet)) + { #if 0 - fprintf(stderr, "%s:%d emitting variable %s for section %s (%p)\n", __FILE__, __LINE__, - r->name, sname->name, sname); + fprintf (stderr, "%s:%d emitting variable %s for section %s (%p)\n", + __FILE__, __LINE__, r->name, sname->name, sname); #endif - fprintf(of, "%s\tres\t%d\n", r->name, r->size); - statistics.udsize += r->size; - } - } + fprintf (of, "%s\tres\t%d\n", r->name, r->size); + statistics.udsize += r->size; + } // for + } // for } - -/* forward declaration */ -void pic16_printIval(symbol * sym, sym_link * type, initList * ilist, char ptype, void *p); -extern void pic16_pCodeConstString(char *name, char *value, unsigned length); - -void pic16_dump_isection(FILE *of, set *section, int fix) +void +pic16_dump_isection (FILE *of, set *section, int fix) { - static int abs_isection_no=0; + static int abs_isection_no = 0; symbol *s, *sprev; unsigned int init_addr, i; symbol **slist; - /* put all symbols in an array */ - if (!elementsInSet(section)) return; - slist = Safe_calloc(elementsInSet(section), sizeof(symbol *)); - s = slist[0]; i = 0; - for(sprev = setFirstItem(section); sprev; sprev = setNextItem(section)) { - slist[i] = sprev; i++; - } + /* put all symbols in an array */ + if (!elementsInSet (section)) + return; - if(!i) { - if(slist)Safe_free(slist); - return; - } + slist = Safe_calloc (elementsInSet (section), sizeof (symbol *)); + s = slist[0]; + i = 0; + for (sprev = setFirstItem (section); sprev; sprev = setNextItem (section)) + { + slist[i] = sprev; + i++; + } // for - /* sort symbols according to their address */ - qsort(slist, i, sizeof(symbol *), symCompare); + if (!i) + { + if (slist) + Safe_free (slist); - pic16_initDB(); + return; + } // if - if(!fix) { - fprintf(of, "\n\n\tidata\n"); - for(s = setFirstItem(section); s; s = setNextItem(section)) { + /* sort symbols according to their address */ + qsort (slist, i, sizeof (symbol *), symCompare); - if(s->ival) { - fprintf(of, "%s", s->rname); - pic16_printIval(s, s->type, s->ival, 'f', (void *)of); - pic16_flushDB('f', (void *)of); - } else { - if (IS_ARRAY (s->type) && IS_CHAR (s->type->next) - && SPEC_CVAL (s->etype).v_char) { - -// fprintf(stderr, "%s:%d printing code string from %s\n", __FILE__, __LINE__, s->rname); - pic16_pCodeConstString(s->rname , SPEC_CVAL (s->etype).v_char, getSize(s->type)); - } else { - assert(0); - } - } + pic16_initDB (); + if (!fix) + { + fprintf (of, "\n\n\tidata\n"); + for (s = setFirstItem (section); s; s = setNextItem (section)) + { + if (s->ival) + { + fprintf (of, "%s", s->rname); + pic16_printIval (s, s->type, s->ival, 'f', (void *)of); + pic16_flushDB ('f', (void *)of); + } + else + { + if (IS_ARRAY (s->type) && IS_CHAR (s->type->next) + && SPEC_CVAL (s->etype).v_char) + { + //fprintf (stderr, "%s:%d printing code string from %s\n", __FILE__, __LINE__, s->rname); + pic16_pCodeConstString (s->rname , SPEC_CVAL (s->etype).v_char, getSize (s->type)); } - } else { - unsigned int j=0; - symbol *s1; + else + { + assert (0); + } // if + } // if + } // for + } + else + { + unsigned int j = 0; + symbol *s1; - sprev = NULL; - init_addr = SPEC_ADDR(slist[j]->etype); - fprintf(of, "\n\nistat_%s_%02d\tidata\t0X%04X\n", moduleName, abs_isection_no++, init_addr); + sprev = NULL; + init_addr = SPEC_ADDR (slist[j]->etype); + fprintf (of, "\n\nistat_%s_%02d\tidata\t0X%04X\n", moduleName, abs_isection_no++, init_addr); - for(j=0;jetype); + init_addr = SPEC_ADDR (s->etype); - if(sprev && (init_addr > (SPEC_ADDR(sprev->etype) + getSize(sprev->etype)))) { - fprintf(of, "\nistat_%s_%02d\tidata\t0X%04X\n", moduleName, abs_isection_no++, init_addr); - } + if (sprev && (init_addr > (SPEC_ADDR (sprev->etype) + getSize (sprev->etype)))) + fprintf(of, "\nistat_%s_%02d\tidata\t0X%04X\n", moduleName, abs_isection_no++, init_addr); - if(s->ival) { - fprintf(of, "%s", s->rname); - pic16_printIval(s, s->type, s->ival, 'f', (void *)of); - pic16_flushDB('f', (void *)of); - } else { - if (IS_ARRAY (s->type) && IS_CHAR (s->type->next) - && SPEC_CVAL (s->etype).v_char) { - -// fprintf(stderr, "%s:%d printing code string from %s\n", __FILE__, __LINE__, s->rname); - pic16_pCodeConstString(s->rname , SPEC_CVAL (s->etype).v_char, getSize(s->type)); - } else { - assert(0); - } - } + if (s->ival) + { + fprintf (of, "%s", s->rname); + pic16_printIval (s, s->type, s->ival, 'f', (void *)of); + pic16_flushDB ('f', (void *)of); + } + else + { + if (IS_ARRAY (s->type) && IS_CHAR (s->type->next) + && SPEC_CVAL (s->etype).v_char) + { + //fprintf (stderr, "%s:%d printing code string from %s\n", __FILE__, __LINE__, s->rname); + pic16_pCodeConstString (s->rname , SPEC_CVAL (s->etype).v_char, getSize (s->type)); + } + else + { + assert (0); + } // if + } // if + sprev = s; + } // for + } // if - sprev = s; - } - } - Safe_free(slist); + Safe_free (slist); } - -void pic16_dump_int_registers(FILE *of, set *section) +void +pic16_dump_int_registers (FILE *of, set *section) { regs *r, *rprev; int i; regs **rlist; - /* put all symbols in an array */ - if (!elementsInSet(section)) return; - rlist = Safe_calloc(elementsInSet(section), sizeof(regs *)); - r = rlist[0]; i = 0; - for(rprev = setFirstItem(section); rprev; rprev = setNextItem(section)) { - rlist[i] = rprev; i++; - } + /* put all symbols in an array */ + if (!elementsInSet (section)) + return; - /* sort symbols according to their address */ - qsort(rlist, elementsInSet(section), sizeof(regs *), regCompare); + rlist = Safe_calloc (elementsInSet (section), sizeof (regs *)); + r = rlist[0]; + i = 0; + for (rprev = setFirstItem (section); rprev; rprev = setNextItem (section)) + { + rlist[i] = rprev; + i++; + } // for - if(!i) { - if(rlist)Safe_free(rlist); - return; - } + if (!i) + { + if (rlist) + Safe_free (rlist); - fprintf(of, "\n\n; Internal registers\n"); + return; + } // if - fprintf(of, "%s\tudata_ovr\t0x0000\n", ".registers"); - for(r = setFirstItem(section); r; r = setNextItem(section)) { - fprintf(of, "%s\tres\t%d\n", r->name, r->size); - statistics.intsize += r->size; - } + /* sort symbols according to their address */ + qsort (rlist, i, sizeof (regs *), regCompare); + + fprintf (of, "\n\n; Internal registers\n"); + + fprintf (of, "%s\tudata_ovr\t0x0000\n", ".registers"); + for (r = setFirstItem (section); r; r = setNextItem (section)) + { + fprintf (of, "%s\tres\t%d\n", r->name, r->size); + statistics.intsize += r->size; + } // for - Safe_free(rlist); + Safe_free (rlist); } /** -- 2.30.2