* device/lib/pic16/libsdcc/Makefile.rules: fixed bug concerning

sources that searched for headers in installation path, now the
device/include/pic16 is used,
* src/pic16/glue.c (pic16glue),
* src/pic16/pcode.c (pCode2str, genericPrint): don't print .file or
.line directives if not in debug mode, this suppresses assembler's
warnings for ignored directives

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3525 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 37acf3dc5e5a3564d7000d35f19db8fcf55fe924..fd240323f115868d449a6334a22b73382e8e8b25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-06 Vangelis Rokas <vrokas AT otenet.gr>
+
+       * device/lib/pic16/libsdcc/Makefile.rules: fixed bug concerning
+       sources that searched for headers in installation path, now the
+       device/include/pic16 is used,
+       * src/pic16/glue.c (pic16glue),
+       * src/pic16/pcode.c (pCode2str, genericPrint): don't print .file or
+       .line directives if not in debug mode, this suppresses assembler's
+       warnings for ignored directives
+
 2004-10-05 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * src/port.h: made reset_regparms prototype void parameter explicit.

diff --git a/device/lib/pic16/libsdcc/Makefile.rules b/device/lib/pic16/libsdcc/Makefile.rules
index abea515e8e3af4a65d30c0d8b4d28226fd6206ef..bf5f42fde2a937a6ea1f43563af571748c2cf36d 100644 (file)
--- a/device/lib/pic16/libsdcc/Makefile.rules
+++ b/device/lib/pic16/libsdcc/Makefile.rules
@@ -20,6 +20,7 @@ PRJDIR        = ../../../../..
 LIBC_INC_DIR   = $(PRJDIR)/device/include/pic16
 
 COMPILE_FLAGS  += $(MODELFLAGS) --pomit-config-words --pomit-ivt --no-peep --i-code-in-asm
+CFLAGS = --nostdinc -I$(LIBC_INC_DIR)
 
 CFILES = $(patsubst %,%.c,$(SRCS))
 OFILES = $(patsubst %.c,%.o,$(CFILES))

diff --git a/src/pic16/glue.c b/src/pic16/glue.c
index 5e2ddab73c551e194966c434efab8b3d06a8a22d..b0d2886611199684b8bb6f4b66399a5bef55ee71 100644 (file)
--- a/src/pic16/glue.c
+++ b/src/pic16/glue.c
@@ -57,7 +57,6 @@ extern set *tmpfileSet;
 extern set *tmpfileNameSet;
 extern char *iComments1;
 extern char *iComments2;
-//extern void emitStaticSeg (memmap * map);
 
 extern int initsfpnt;
 
@@ -1720,7 +1719,8 @@ pic16glue ()
        pic16initialComments (asmFile);
 
        /* print module name */
-       fprintf(asmFile, "#FILE\t\"%s\"\n", fullSrcFileName);
+       if(options.debug)
+               fprintf(asmFile, "\t.file\t\"%s\"\n", fullSrcFileName);
 
        /* Let the port generate any global directives, etc. */
        if (port->genAssemblerPreamble) {

diff --git a/src/pic16/pcode.c b/src/pic16/pcode.c
index d4324d2dd3b4a8e68430ee2be9ddf832eefbe9de..66c8d0f82b29ad4e7470cb96685eaf23b7ad9cc5 100644 (file)
--- a/src/pic16/pcode.c
+++ b/src/pic16/pcode.c
@@ -4797,7 +4797,7 @@ char *pic16_pCode2str(char *str, size_t size, pCode *pc)
     break;
   case PC_CSOURCE:
 //    SAFE_snprintf(&s,&size,";#CSRC\t%s %d\t%s\n", PCCS(pc)->file_name, PCCS(pc)->line_number, PCCS(pc)->line);
-      SAFE_snprintf(&s,&size,"%s#LINE\t%d; %s\t%s\n", (pic16_mplab_comp?";":""),
+      SAFE_snprintf(&s,&size,"%s\t.line\t%d; %s\t%s\n", ((pic16_mplab_comp || !options.debug)?";":""),
        PCCS(pc)->line_number, PCCS(pc)->file_name, PCCS(pc)->line);
     break;
   case PC_ASMDIR:
@@ -4894,7 +4894,7 @@ static void genericPrint(FILE *of, pCode *pc)
 
   case PC_CSOURCE:
 //    fprintf(of,";#CSRC\t%s %d\t\t%s\n", PCCS(pc)->file_name, PCCS(pc)->line_number, PCCS(pc)->line);
-    fprintf(of,"%s#LINE\t%d; %s\t%s\n", (pic16_mplab_comp?";":""),
+    fprintf(of,"%s\t.line\t%d; %s\t%s\n", ((pic16_mplab_comp || !options.debug)?";":""),
        PCCS(pc)->line_number, PCCS(pc)->file_name, PCCS(pc)->line);
          
     break;