From b487511f2155fa77fa0bd178663db31315f867c7 Mon Sep 17 00:00:00 2001 From: jbess Date: Wed, 7 Feb 2001 10:04:15 +0000 Subject: [PATCH] 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 --- src/SDCCset.c | 2 +- src/SDCCset.h | 6 +++--- src/asm.c | 14 ++++++++++++++ src/asm.h | 2 ++ src/avr/gen.c | 2 +- src/ds390/gen.c | 6 +++--- src/mcs51/gen.c | 6 +++--- src/pic/gen.c | 6 +++--- src/port.h | 2 ++ src/z80/gen.c | 4 ++-- 10 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/SDCCset.c b/src/SDCCset.c index 2632e9c5..0843b719 100644 --- 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 b5e2ccde..298ab89c 100644 --- 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 353e60f3..e18a60c4 100644 --- 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 8a75766c..5e773280 100644 --- 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 89bb52a8..e9a3c378 100644 --- 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 09a78e83..a9a97d6d 100644 --- 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 634d2fa6..1909992e 100644 --- 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 8872f304..5195cdf5 100644 --- 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 44156d35..b9aa3b6f 100644 --- 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 2b664493..89fd2f2e 100644 --- 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; } -- 2.30.2