* src/pic/gen.c (genFunction,genCall): drop "same code page"

[fw/sdcc] / src / pic / glue.c

diff --git a/src/pic/glue.c b/src/pic/glue.c
index 11a8664dd654fb13c13c80505c085cc7da64ee76..a85c11b1695333b561da4318f73113543f269b1d 100644 (file)
--- a/src/pic/glue.c
+++ b/src/pic/glue.c
@@ -55,6 +55,7 @@ extern set *tmpfileNameSet;
 extern char *iComments1;
 extern char *iComments2;
 //extern void emitStaticSeg (memmap * map);
+set *pic14_localFunctions = NULL;
 
 extern DEFSETFUNC (closeTmpFiles);
 extern DEFSETFUNC (rmTmpFiles);
@@ -81,7 +82,7 @@ int pic14_hasInterrupt = 0;           // Indicates whether to emit interrupt handler or n
 /*-----------------------------------------------------------------*/
 /* aopLiteral - string from a literal value                        */
 /*-----------------------------------------------------------------*/
-int pic14aopLiteral (value *val, int offset)
+unsigned int pic14aopLiteral (value *val, int offset)
 {
        union {
                float f;
@@ -300,6 +301,8 @@ pic14_constructAbsMap (FILE *ofile)
        if (getSize(sym->type) > size) {
          size = getSize(sym->type);
        }
+       addSet (&symbolsEmitted, (void *) sym->name);
+       addSet (&symbolsEmitted, (void *) sym->rname);
       } // for
       fprintf (ofile, "\tres\t%d\n", size);
     } // if
@@ -973,6 +976,7 @@ pic14emitMaps ()
        pic14emitRegularMap (sfrbit, FALSE, FALSE);
        pic14emitRegularMap (code, TRUE, FALSE);
        pic14emitStaticSeg (statsg);
+       pic14emitStaticSeg (c_abs);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1009,6 +1013,7 @@ pic14createInterruptVect (FILE * vFile)
        fprintf (vFile, "%s", iComments2);
        fprintf (vFile, "STARTUP\t%s\n", CODE_NAME); // Lkr file should place section STARTUP at address 0x0
        fprintf (vFile, "\tnop\n"); /* first location for used by incircuit debugger */
+       fprintf( vFile, "\tpagesel __sdcc_gsinit_startup\n");
        fprintf (vFile, "\tgoto\t__sdcc_gsinit_startup\n");
 }
 
@@ -1025,6 +1030,41 @@ pic14initialComments (FILE * afile)
        
 }
 
+int
+pic14_stringInSet(const char *str, set **world, int autoAdd)
+{
+  char *s;
+
+  if (!str) return 1;
+  assert(world);
+
+  for (s = setFirstItem(*world); s; s = setNextItem(*world))
+  {
+    /* found in set */
+    if (0 == strcmp(s, str)) return 1;
+  }
+
+  /* not found */
+  if (autoAdd) addSet(world, Safe_strdup(str));
+  return 0;
+}
+
+static int
+pic14_emitSymbolIfNew(FILE *file, const char *fmt, const char *sym, int checkLocals)
+{
+  static set *emitted = NULL;
+
+  if (!pic14_stringInSet(sym, &emitted, 1)) {
+    /* sym was not in emittedSymbols */
+    if (!checkLocals || !pic14_stringInSet(sym, &pic14_localFunctions, 0)) {
+      /* sym is not a locally defined function---avoid bug #1443651 */
+      fprintf( file, fmt, sym );
+      return 0;
+    }
+  }
+  return 1;
+}
+
 /*-----------------------------------------------------------------*/
 /* printExterns - generates extern for external variables          */
 /*-----------------------------------------------------------------*/
@@ -1037,9 +1077,8 @@ pic14printExterns (FILE * afile)
        fprintf (afile, "; extern variables in this module\n");
        fprintf (afile, "%s", iComments2);
        
-       for (sym = setFirstItem (externs); sym;
-       sym = setNextItem (externs))
-               fprintf (afile, "\textern %s\n", sym->rname);
+       for (sym = setFirstItem (externs); sym; sym = setNextItem (externs))
+               pic14_emitSymbolIfNew(afile, "\textern %s\n", sym->rname, 1);
 }
 
 /*-----------------------------------------------------------------*/
@@ -1048,25 +1087,25 @@ pic14printExterns (FILE * afile)
 static void
 pic14printPublics (FILE * afile)
 {
-       symbol *sym;
-       
-       fprintf (afile, "%s", iComments2);
-       fprintf (afile, "; publics variables in this module\n");
-       fprintf (afile, "%s", iComments2);
-       
-       for (sym = setFirstItem (publics); sym;
-       sym = setNextItem (publics)) {
-               
-               if(!IS_BITFIELD(sym->type) && ((IS_FUNC(sym->type) || sym->allocreq))) {
-                       if (!IS_BITVAR(sym->type))
-                               fprintf (afile, "\tglobal %s\n", sym->rname);
-               } else {
-                       /* Absolute variables are defines in the asm file as equates and thus can not be made global. */
-                       /* Not any longer! */
-                       //if (!SPEC_ABSA (sym->etype))
-                               fprintf (afile, "\tglobal %s\n", sym->rname);
-               }
-       }
+  symbol *sym;
+
+  fprintf (afile, "%s", iComments2);
+  fprintf (afile, "; publics variables in this module\n");
+  fprintf (afile, "%s", iComments2);
+
+  for (sym = setFirstItem (publics); sym;
+      sym = setNextItem (publics)) {
+
+    if(!IS_BITFIELD(sym->type) && ((IS_FUNC(sym->type) || sym->allocreq))) {
+      if (!IS_BITVAR(sym->type))
+       pic14_emitSymbolIfNew(afile, "\tglobal %s\n", sym->rname, 0);
+    } else {
+      /* Absolute variables are defines in the asm file as equates and thus can not be made global. */
+      /* Not any longer! */
+      //if (!SPEC_ABSA (sym->etype))
+      pic14_emitSymbolIfNew(afile, "\tglobal %s\n", sym->rname, 0);
+    }
+  }
 }
 
 /*-----------------------------------------------------------------*/
@@ -1324,12 +1363,12 @@ picglue ()
        /* Emit the __config directive */
        pic14_emitConfigWord (asmFile);
        
-       /* print the extern variables in this module */
-       pic14printExterns (asmFile);
-       
        /* print the global variables in this module */
        pic14printPublics (asmFile);
        
+       /* print the extern variables in this module */
+       pic14printExterns (asmFile);
+       
        /* copy the sfr segment */
        fprintf (asmFile, "%s", iComments2);
        fprintf (asmFile, "; special function registers\n");