From: vrokas <vrokas@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Fri, 28 May 2004 14:04:42 +0000 (+0000)
Subject: * src/pic16/glue.c,
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=1233a5fd3ec01d6499494ba9dbd341e994a83f2e;p=fw%2Fsdcc

* src/pic16/glue.c,
* src/pic16/ralloc.h,
* src/pic16/ralloc.cc: prefixed IS_CONFIG_ADDRESS with PIC16_
to fix conflict with pic port


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

diff --git a/ChangeLog b/ChangeLog
index 60bb9d11..2ef4b828 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-28 Vangelis Rokas <vrokas AT otenet.gr>
+
+	* src/pic16/glue.c,
+	* src/pic16/ralloc.h,
+	* src/pic16/ralloc.cc: prefixed IS_CONFIG_ADDRESS with PIC16_
+	to fix conflict with pic port
+
 2004-05-28 Vangelis Rokas <vrokas AT otenet.gr>
 
 	* src/pic16/glue.c (pic16emitStaticSeg): do not print as publics or
diff --git a/src/pic16/glue.c b/src/pic16/glue.c
index c797808f..a685c9ab 100644
--- a/src/pic16/glue.c
+++ b/src/pic16/glue.c
@@ -623,7 +623,7 @@ pic16emitStaticSeg (memmap * map)
 
 		/* do not emit if it is a config word declaration */
 		if(!SPEC_ABSA(sym->etype)
-			|| (SPEC_ABSA(sym->etype) && !IS_CONFIG_ADDRESS(SPEC_ADDR(sym->etype))))
+			|| (SPEC_ABSA(sym->etype) && !PIC16_IS_CONFIG_ADDRESS(SPEC_ADDR(sym->etype))))
 			checkAddSym(&externs, sym);
 	  continue;
 	}
@@ -634,7 +634,7 @@ pic16emitStaticSeg (memmap * map)
 
 		/* do not emit if it is a config word declaration */
 		if(!SPEC_ABSA(sym->etype)
-			|| (SPEC_ABSA(sym->etype) && !IS_CONFIG_ADDRESS(SPEC_ADDR(sym->etype))))
+			|| (SPEC_ABSA(sym->etype) && !PIC16_IS_CONFIG_ADDRESS(SPEC_ADDR(sym->etype))))
 				checkAddSym(&publics, sym);
 	}
 
diff --git a/src/pic16/ralloc.c b/src/pic16/ralloc.c
index dca8addf..52932b0c 100644
--- a/src/pic16/ralloc.c
+++ b/src/pic16/ralloc.c
@@ -557,7 +557,7 @@ pic16_dirregWithName (char *name)
   return NULL; // name wasn't found in the hash table
 }
 
-int IS_CONFIG_ADDRESS(int address)
+int PIC16_IS_CONFIG_ADDRESS(int address)
 {
 
   return address >= 0x300000 && address <= 0x300000d;
@@ -660,7 +660,7 @@ pic16_allocDirReg (operand *op )
 	    	  return NULL;
 		}
 
-		if(!IS_CONFIG_ADDRESS(address)) {
+		if(!PIC16_IS_CONFIG_ADDRESS(address)) {
 //			fprintf(stderr,"%s:allocating new reg %s\n",__FUNCTION__, name);
 
 			/* this is an error, why added? -- VR */
@@ -2788,7 +2788,7 @@ packRegsForAssign (iCode * ic, eBBlock * ebp)
 
   /* if this is at an absolute address, then get the address. */
   if (SPEC_ABSA ( OP_SYM_ETYPE(IC_RESULT(ic))) ) {
-    if(IS_CONFIG_ADDRESS( SPEC_ADDR ( OP_SYM_ETYPE(IC_RESULT(ic))))) {
+    if(PIC16_IS_CONFIG_ADDRESS( SPEC_ADDR ( OP_SYM_ETYPE(IC_RESULT(ic))))) {
       debugLog ("  %d - found config word declaration\n", __LINE__);
       if(IS_VALOP(IC_RIGHT(ic))) {
 	debugLog ("  setting config word to %x\n", 
diff --git a/src/pic16/ralloc.h b/src/pic16/ralloc.h
index 989347bd..aecec160 100644
--- a/src/pic16/ralloc.h
+++ b/src/pic16/ralloc.h
@@ -121,7 +121,7 @@ regs *pic16_allocRegByName (char *name, int size );
 
 regs* newReg(short type, short pc_type, int rIdx, char *name, int size, int alias, operand *refop);
 
-int IS_CONFIG_ADDRESS(int address);
+int PIC16_IS_CONFIG_ADDRESS(int address);
 
 /* Define register address that are constant across PIC16 family */
 #define IDX_TMR0    0xfd6