* src/pic/device.c (dump_sfr): always emit symbols

* src/pic/glue.c (pic14printPublics): fixed typo

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

diff --git a/ChangeLog b/ChangeLog
index c2b6dffa8df8155f567a84e50ad55e5beef38489..f15b2df226f92cb6fd0b7bd3bc172800d9d19046 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-30 Raphael Neider <rneider AT web.de>
+
+       * src/pic/device.c (dump_sfr): always emit symbols
+       * src/pic/glue.c (pic14printPublics): fixed typo
+
 2006-11-30 Raphael Neider <rneider AT web.de>
 
        * src/pic/device.c (create_pic,ram_map): add memRange entries to PIC

diff --git a/src/pic/device.c b/src/pic/device.c
index e26ed9fdcb8e787002f89b57acecf18b586a797f..ad7a1e15d2f19ed15f3eaf836bad2676e4af268e 100644 (file)
--- a/src/pic/device.c
+++ b/src/pic/device.c
@@ -64,7 +64,6 @@ static unsigned int config_word = DEFAULT_CONFIG_WORD;
 static unsigned int config2_word = DEFAULT_CONFIG2_WORD;
 static memRange *rangeRAM = NULL;
 
-extern int pic14_is_shared (regs *reg);
 extern void emitSymbolToFile (FILE *of, const char *name, const char *section_type, int size, int addr, int useEQU, int globalize);
 
 
@@ -563,16 +562,7 @@ void dump_sfr(FILE *of)
                
                if (reg && !reg->isEmitted)
                {
-                 if (pic14_options.isLibrarySource && pic14_is_shared (reg))
-                 {
-                   /* rely on external declarations for the non-fixed stack */
-                   /* Update: We always emit the STACK symbols into a
-                    * udata_shr section, so no extern declaration is
-                    * required. */
-                   //fprintf (of, "\textern\t%s\n", reg->name);
-                 } else {
-                   emitSymbolToFile (of, reg->name, "udata", reg->size, reg->isFixed ? reg->address : -1, 0, pic14_is_shared (reg));
-                 }
+                 emitSymbolToFile (of, reg->name, "udata", reg->size, reg->isFixed ? reg->address : -1, 0, 0);
                  
                  reg->isEmitted = 1;
                }

diff --git a/src/pic/glue.c b/src/pic/glue.c
index 2267da2e2634d26311987bfd16539835e8caed2b..b075cdb99d6a92dfc38a8fee37ff88744fb4b4c4 100644 (file)
--- a/src/pic/glue.c
+++ b/src/pic/glue.c
@@ -105,22 +105,6 @@ unsigned int pic14aopLiteral (value *val, int offset)
        
 }
 
-/* Check whether the given reg is shared amongst all .o files of a project.
- * This is true for the pseudo stack and WSAVE, SSAVE and PSAVE. */
-static int
-is_shared_address (int addr)
-{
-  return ((addr > Gstack_base_addr - 18)
-       && (addr <= Gstack_base_addr));
-}
-
-int
-pic14_is_shared (regs *reg)
-{
-       if (!reg) return 0;
-       return is_shared_address (reg->address);
-}
-
 static int
 is_valid_identifier( const char *name )
 {
@@ -1104,7 +1088,7 @@ pic14printPublics (FILE * afile)
   symbol *sym;
 
   fprintf (afile, "%s", iComments2);
-  fprintf (afile, "; publics variables in this module\n");
+  fprintf (afile, "; public variables in this module\n");
   fprintf (afile, "%s", iComments2);
 
   for (sym = setFirstItem (publics); sym;