Fix asm label generation. Suppress some warning

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

diff --git a/src/SDCCset.c b/src/SDCCset.c
index 2632e9c515fad4dab6b038d441f762566c61cb3c..0843b719abff921068e965d4d48c58bac5cbcae0 100644 (file)
--- a/src/SDCCset.c
+++ b/src/SDCCset.c
@@ -277,7 +277,7 @@ set *unionSetsWith (set *list1 , set *list2, int (*cFunc)(),int throw)
     /* now for all those in list2 which does not */
     /* already exist in the list add             */
     for (lp = list2 ; lp ; lp = lp->next )
-  if (!isinSetWith(un,lp->item,cFunc))
+  if (!isinSetWith(un,lp->item,(int(*)(void*,void*))cFunc))
       addSet (&un,lp->item);
 
     switch (throw) {

diff --git a/src/SDCCset.h b/src/SDCCset.h
index b5e2ccde84b64a5b2843f7d78296b138ef7dc546..298ab89c3c7b705edb8fe0bba79389f993be0b24 100644 (file)
--- a/src/SDCCset.h
+++ b/src/SDCCset.h
@@ -59,7 +59,7 @@ void          *getSet             ( set  ** );
 void          deleteSetItem       ( set  ** , void * );
 void          deleteItemIf        ( set  ** , int (*cond) (void *, va_list), ... );
 int            isinSet            ( set  * , void * );
-int            isinSetWith        ( set  *,  void *, int (*cfunc)());
+int            isinSetWith        ( set  *,  void *, int (*cfunc)(void*,void*));
 int           applyToSet          ( set  *list ,int (*somefunc)(void *,va_list), ...);
 int           applyToSetFTrue     ( set  *list ,int (*somefunc)(void *,va_list), ...);
 set         *unionSets           ( set *, set *, int);
@@ -70,8 +70,8 @@ set         *setFromSet        ( set * );
 int           isSetsEqual        ( set *, set *);
 set         *subtractFromSet     ( set *, set *,int);
 int          elementsInSet       (set *);
-set         *intersectSetsWith (set *, set *,int (*cFunc)(),int );
-int         isSetsEqualWith    ( set *, set *, int (*cFunc)());
+set         *intersectSetsWith (set *, set *,int (*cFunc)(void *,void *),int );
+int         isSetsEqualWith    ( set *, set *, int (*cFunc)(void *,void *));
 void        *peekSet           ( set *);
 void        *setFirstItem      ( set *);
 void        *setNextItem       ( set *);

diff --git a/src/asm.c b/src/asm.c
index 353e60f3a53ea0b147ccb4999f39bfd59bbbee01..e18a60c46bf17dc7fda547a871f3f06dcb212bb9 100644 (file)
--- a/src/asm.c
+++ b/src/asm.c
@@ -15,6 +15,20 @@
 
 static hTab *_h;
 
+char * FileBaseName(char * fileFullName)
+{
+       char * p = fileFullName;
+
+       while (*fileFullName) {
+               if((*fileFullName=='/')||(*fileFullName=='\\')||(*fileFullName==':')) {
+                       p = fileFullName;
+                       p++;
+               }
+               fileFullName++;
+       }
+       return p;
+}
+
 static const char *_findMapping(const char *szKey)
 {
     return shash_find(_h, szKey);

diff --git a/src/asm.h b/src/asm.h
index 8a75766c6de27256a8c4fadd4be6c019b25fd5a3..5e77328086c8dead5b9cf7290edf01ab4f4c910c 100644 (file)
--- a/src/asm.h
+++ b/src/asm.h
@@ -27,4 +27,6 @@ extern const ASM_MAPPINGS asm_asxxxx_mapping;
  */
 void asm_addTree(const ASM_MAPPINGS *pMappings);
 
+char * FileBaseName(char * fileFullName);
+
 #endif

diff --git a/src/avr/gen.c b/src/avr/gen.c
index 89bb52a8ff53fccb15506090138b0956798e8904..e9a3c378f755176c23e881e924e07fd85bc12a23 100644 (file)
--- a/src/avr/gen.c
+++ b/src/avr/gen.c
@@ -4762,7 +4762,7 @@ void genAVRCode (iCode *lic)
       if ( options.debug ) {
         _G.debugLine = 1;
         emitcode("","C$%s$%d$%d$%d ==.",
-           ic->filename,ic->lineno,
+           FileBaseName(ic->filename),ic->lineno,
            ic->level,ic->block);
         _G.debugLine = 0;
       }

diff --git a/src/ds390/gen.c b/src/ds390/gen.c
index 09a78e8390b2f035d1e7e1683c4d4b89b86c9aea..a9a97d6d62be10aa9b125510e397c81e2b16ed24 100644 (file)
--- a/src/ds390/gen.c
+++ b/src/ds390/gen.c
@@ -2525,7 +2525,7 @@ static void genEndFunction (iCode *ic)
   if (currFunc) {
       _G.debugLine = 1;
       emitcode("","C$%s$%d$%d$%d ==.",
-         ic->filename,currFunc->lastLine,
+         FileBaseName(ic->filename),currFunc->lastLine,
          ic->level,ic->block);
       if (IS_STATIC(currFunc->etype))
     emitcode("","XF%s$%s$0$0 ==.",moduleName,currFunc->name);
@@ -2559,7 +2559,7 @@ static void genEndFunction (iCode *ic)
   if (currFunc) {
       _G.debugLine = 1;
       emitcode("","C$%s$%d$%d$%d ==.",
-         ic->filename,currFunc->lastLine,
+         FileBaseName(ic->filename),currFunc->lastLine,
          ic->level,ic->block);
       if (IS_STATIC(currFunc->etype))
     emitcode("","XF%s$%s$0$0 ==.",moduleName,currFunc->name);
@@ -8358,7 +8358,7 @@ void gen390Code (iCode *lic)
       if ( options.debug ) {
     _G.debugLine = 1;
     emitcode("","C$%s$%d$%d$%d ==.",
-       ic->filename,ic->lineno,
+       FileBaseName(ic->filename),ic->lineno,
        ic->level,ic->block);
     _G.debugLine = 0;
       }

diff --git a/src/mcs51/gen.c b/src/mcs51/gen.c
index 634d2fa6dea68594ade84c0d893b9b237d4495af..1909992e16b36b90c1f5e5993d787a93f45754a5 100644 (file)
--- a/src/mcs51/gen.c
+++ b/src/mcs51/gen.c
@@ -2247,7 +2247,7 @@ static void genEndFunction (iCode *ic)
   if (currFunc) {
       _G.debugLine = 1;
       emitcode("","C$%s$%d$%d$%d ==.",
-         ic->filename,currFunc->lastLine,
+         FileBaseName(ic->filename),currFunc->lastLine,
          ic->level,ic->block);
       if (IS_STATIC(currFunc->etype))
     emitcode("","XF%s$%s$0$0 ==.",moduleName,currFunc->name);
@@ -2281,7 +2281,7 @@ static void genEndFunction (iCode *ic)
   if (currFunc) {
       _G.debugLine = 1;
       emitcode("","C$%s$%d$%d$%d ==.",
-         ic->filename,currFunc->lastLine,
+         FileBaseName(ic->filename),currFunc->lastLine,
          ic->level,ic->block);
       if (IS_STATIC(currFunc->etype))
     emitcode("","XF%s$%s$0$0 ==.",moduleName,currFunc->name);
@@ -7438,7 +7438,7 @@ void gen51Code (iCode *lic)
       if ( options.debug ) {
     _G.debugLine = 1;
     emitcode("","C$%s$%d$%d$%d ==.",
-       ic->filename,ic->lineno,
+       FileBaseName(ic->filename),ic->lineno,
        ic->level,ic->block);
     _G.debugLine = 0;
       }

diff --git a/src/pic/gen.c b/src/pic/gen.c
index 8872f3042c443d552a93486d0f382f4d81b3563c..5195cdf5b16c6d21636095ad490485ac08b70ea2 100644 (file)
--- a/src/pic/gen.c
+++ b/src/pic/gen.c
@@ -2406,7 +2406,7 @@ static void genEndFunction (iCode *ic)
   if (currFunc) {
       _G.debugLine = 1;
       emitcode(";","C$%s$%d$%d$%d ==.",
-         ic->filename,currFunc->lastLine,
+         FileBaseName(ic->filename),currFunc->lastLine,
          ic->level,ic->block);
       if (IS_STATIC(currFunc->etype))
     emitcode(";","XF%s$%s$0$0 ==.",moduleName,currFunc->name);
@@ -2440,7 +2440,7 @@ static void genEndFunction (iCode *ic)
   if (currFunc) {
       _G.debugLine = 1;
       emitcode(";","C$%s$%d$%d$%d ==.",
-         ic->filename,currFunc->lastLine,
+         FileBaseName(ic->filename),currFunc->lastLine,
          ic->level,ic->block);
       if (IS_STATIC(currFunc->etype))
     emitcode(";","XF%s$%s$0$0 ==.",moduleName,currFunc->name);
@@ -8486,7 +8486,7 @@ void genpic14Code (iCode *lic)
       if ( options.debug ) {
     _G.debugLine = 1;
     emitcode("",";C$%s$%d$%d$%d ==.",
-       ic->filename,ic->lineno,
+       FileBaseName(ic->filename),ic->lineno,
        ic->level,ic->block);
     _G.debugLine = 0;
       }

diff --git a/src/port.h b/src/port.h
index 44156d3528f38f354e493d57322aa85e06bb8d51..b9aa3b6f1179a8faa2cd248ff98fdda5bf664175 100644 (file)
--- a/src/port.h
+++ b/src/port.h
@@ -191,6 +191,8 @@ extern PORT avr_port;
 #endif
 #if !OPT_DISABLE_DS390
 extern PORT ds390_port;
+#else
+PORT ds390_port;
 #endif
 #if !OPT_DISABLE_PIC
 extern PORT pic14_port;

diff --git a/src/z80/gen.c b/src/z80/gen.c
index 2b66449381d695ebeefc50aad6ac0b294e374dd7..89fd2f2e18827b3d1772429dffeeae262587a3ec 100644 (file)
--- a/src/z80/gen.c
+++ b/src/z80/gen.c
@@ -2001,7 +2001,7 @@ static void genEndFunction (iCode *ic)
   if (options.debug && currFunc) {
       debugLine = 1;
       emitcode("","C$%s$%d$%d$%d ==.",
-         ic->filename,currFunc->lastLine,
+         FileBaseName(ic->filename),currFunc->lastLine,
          ic->level,ic->block);
       if (IS_STATIC(currFunc->etype))
     emitcode("","XF%s$%s$0$0 ==.",moduleName,currFunc->name);
@@ -4711,7 +4711,7 @@ void genZ80Code (iCode *lic)
       if ( options.debug ) {
     debugLine = 1;
     emitcode("","C$%s$%d$%d$%d ==.",
-       ic->filename,ic->lineno,
+       FileBaseName(ic->filename),ic->lineno,
        ic->level,ic->block);
     debugLine = 0;
       }